Skip to content

Commit 1267291

Browse files
committed
Big renaming
1 parent 5e51a03 commit 1267291

54 files changed

Lines changed: 687 additions & 686 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs renamed to src/Microsoft.TestPlatform.Client/AttachmentsProcessing/TestRunAttachmentsProcessingEventsHandler.cs

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
// Copyright (c) Microsoft Corporation. All rights reserved.
22
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
33

4-
namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization
4+
namespace Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing
55
{
66
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
77
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
@@ -11,47 +11,48 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization
1111
using System.Collections.Generic;
1212

1313
/// <summary>
14-
/// The multi test finalization events handler.
14+
/// The test run attachments processing events handler.
1515
/// </summary>
16-
public class MultiTestRunFinalizationEventsHandler : IMultiTestRunFinalizationEventsHandler
16+
///
17+
public class TestRunAttachmentsProcessingEventsHandler : ITestRunAttachmentsProcessingEventsHandler
1718
{
1819
private readonly ICommunicationManager communicationManager;
1920

2021
/// <summary>
21-
/// Initializes a new instance of the <see cref="MultiTestRunFinalizationEventsHandler"/> class.
22+
/// Initializes a new instance of the <see cref="TestRunAttachmentsProcessingEventsHandler"/> class.
2223
/// </summary>
2324
/// <param name="communicationManager"> The communication manager. </param>
24-
public MultiTestRunFinalizationEventsHandler(ICommunicationManager communicationManager)
25+
public TestRunAttachmentsProcessingEventsHandler(ICommunicationManager communicationManager)
2526
{
2627
this.communicationManager = communicationManager;
2728
}
2829

2930
/// <inheritdoc/>
30-
public void HandleMultiTestRunFinalizationComplete(MultiTestRunFinalizationCompleteEventArgs finalizationCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk)
31+
public void HandleTestRunAttachmentsProcessingComplete(TestRunAttachmentsProcessingCompleteEventArgs attachmentsProcessingCompleteEventArgs, IEnumerable<AttachmentSet> lastChunk)
3132
{
3233
if (EqtTrace.IsInfoEnabled)
3334
{
34-
EqtTrace.Info("Multi test run finalization completed.");
35+
EqtTrace.Info("Test run attachments processing completed.");
3536
}
3637

37-
var payload = new MultiTestRunFinalizationCompletePayload()
38+
var payload = new TestRunAttachmentsProcessingCompletePayload()
3839
{
39-
FinalizationCompleteEventArgs = finalizationCompleteEventArgs,
40+
AttachmentsProcessingCompleteEventArgs = attachmentsProcessingCompleteEventArgs,
4041
Attachments = lastChunk
4142
};
4243

43-
this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationComplete, payload);
44+
this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
4445
}
4546

4647
/// <inheritdoc/>
47-
public void HandleMultiTestRunFinalizationProgress(MultiTestRunFinalizationProgressEventArgs finalizationProgressEventArgs)
48+
public void HandleTestRunAttachmentsProcessingProgress(TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs)
4849
{
49-
var payload = new MultiTestRunFinalizationProgressPayload()
50+
var payload = new TestRunAttachmentsProcessingProgressPayload()
5051
{
51-
FinalizationProgressEventArgs = finalizationProgressEventArgs,
52+
AttachmentsProcessingProgressEventArgs = AttachmentsProcessingProgressEventArgs,
5253
};
5354

54-
this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationProgress, payload);
55+
this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingProgress, payload);
5556
}
5657

5758
/// <inheritdoc/>

src/Microsoft.TestPlatform.Client/DesignMode/DesignModeClient.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.DesignMode
99
using System.Net;
1010
using System.Threading;
1111
using System.Threading.Tasks;
12-
using Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization;
12+
using Microsoft.VisualStudio.TestPlatform.Client.TestRunAttachmentsProcessing;
1313
using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
1414
using Microsoft.VisualStudio.TestPlatform.Common.Logging;
1515
using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
@@ -199,11 +199,11 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
199199
break;
200200
}
201201

202-
case MessageType.MultiTestRunFinalizationStart:
202+
case MessageType.TestRunAttachmentsProcessingStart:
203203
{
204-
var multiTestRunFinalizationPayload =
205-
this.communicationManager.DeserializePayload<MultiTestRunFinalizationPayload>(message);
206-
this.StartMultiTestRunFinalization(multiTestRunFinalizationPayload, testRequestManager);
204+
var testRunAttachmentsProcessingPayload =
205+
this.communicationManager.DeserializePayload<TestRunAttachmentsProcessingPayload>(message);
206+
this.StartTestRunAttachmentsProcessing(testRunAttachmentsProcessingPayload, testRequestManager);
207207
break;
208208
}
209209

@@ -225,9 +225,9 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
225225
break;
226226
}
227227

228-
case MessageType.MultiTestRunFinalizationCancel:
228+
case MessageType.TestRunAttachmentsProcessingCancel:
229229
{
230-
testRequestManager.CancelMultiTestRunFinalization();
230+
testRequestManager.CancelTestRunAttachmentsProcessing();
231231
break;
232232
}
233233

@@ -472,29 +472,29 @@ private void StartDiscovery(DiscoveryRequestPayload discoveryRequestPayload, ITe
472472
});
473473
}
474474

475-
private void StartMultiTestRunFinalization(MultiTestRunFinalizationPayload finalizationPayload, ITestRequestManager testRequestManager)
475+
private void StartTestRunAttachmentsProcessing(TestRunAttachmentsProcessingPayload attachmentsProcessingPayload, ITestRequestManager testRequestManager)
476476
{
477477
Task.Run(
478478
delegate
479479
{
480480
try
481481
{
482-
testRequestManager.FinalizeMultiTestRun(finalizationPayload, new MultiTestRunFinalizationEventsHandler(this.communicationManager), this.protocolConfig);
482+
testRequestManager.ProcessTestRunAttachments(attachmentsProcessingPayload, new TestRunAttachmentsProcessingEventsHandler(this.communicationManager), this.protocolConfig);
483483
}
484484
catch (Exception ex)
485485
{
486-
EqtTrace.Error("DesignModeClient: Exception in StartMultiTestRunFinalization: " + ex);
486+
EqtTrace.Error("DesignModeClient: Exception in StartTestRunAttachmentsProcessing: " + ex);
487487

488488
var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
489489
this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
490490

491-
var payload = new MultiTestRunFinalizationCompletePayload()
491+
var payload = new TestRunAttachmentsProcessingCompletePayload()
492492
{
493493
Attachments = null
494494
};
495495

496496
// Send run complete to translation layer
497-
this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationComplete, payload);
497+
this.communicationManager.SendMessage(MessageType.TestRunAttachmentsProcessingComplete, payload);
498498
}
499499
});
500500
}

src/Microsoft.TestPlatform.Client/RequestHelper/ITestRequestManager.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,11 +45,11 @@ public interface ITestRequestManager : IDisposable
4545
void RunTests(TestRunRequestPayload testRunRequestPayLoad, ITestHostLauncher customTestHostLauncher, ITestRunEventsRegistrar testRunEventsRegistrar, ProtocolConfig protocolConfig);
4646

4747
/// <summary>
48-
/// Finalize multi test run
48+
/// Processes test run attachments
4949
/// </summary>
50-
/// <param name="multiTestRunFinalizationPayload">Multi test run finalization payload</param>
51-
/// <param name="multiTestRunFinalizationEventsHandler">Multi test run finalization events handler</param>
52-
void FinalizeMultiTestRun(MultiTestRunFinalizationPayload multiTestRunFinalizationPayload, IMultiTestRunFinalizationEventsHandler multiTestRunFinalizationEventsHandler, ProtocolConfig protocolConfig);
50+
/// <param name="testRunAttachmentsProcessingPayload">Test run attachments processing payload</param>
51+
/// <param name="testRunAttachmentsProcessingEventsHandler">Test run attachments processing events handler</param>
52+
void ProcessTestRunAttachments(TestRunAttachmentsProcessingPayload testRunAttachmentsProcessingPayload, ITestRunAttachmentsProcessingEventsHandler testRunAttachmentsProcessingEventsHandler, ProtocolConfig protocolConfig);
5353

5454
/// <summary>
5555
/// Cancel the current TestRun request
@@ -67,8 +67,8 @@ public interface ITestRequestManager : IDisposable
6767
void CancelDiscovery();
6868

6969
/// <summary>
70-
/// Cancels the current multi test run finalization request
70+
/// Cancels the current test run attachments processing request
7171
/// </summary>
72-
void CancelMultiTestRunFinalization();
72+
void CancelTestRunAttachmentsProcessing();
7373
}
7474
}

src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunFinalizationManager.cs renamed to src/Microsoft.TestPlatform.Common/Interfaces/Engine/ITestRunAttachmentsProcessingManager.cs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,24 +10,24 @@
1010
namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
1111
{
1212
/// <summary>
13-
/// Orchestrates multi test run finalization operations.
13+
/// Orchestrates test run attachments processing operations.
1414
/// </summary>
15-
internal interface IMultiTestRunFinalizationManager
15+
internal interface ITestRunAttachmentsProcessingManager
1616
{
1717
/// <summary>
18-
/// Finalizes multi test run and provides results through handler
18+
/// Processes attachments and provides results through handler
1919
/// </summary>
2020
/// <param name="attachments">Collection of attachments</param>
21-
/// <param name="eventHandler">EventHandler for handling multi test run finalization event</param>
21+
/// <param name="eventHandler">EventHandler for handling test run attachments processing event</param>
2222
/// <param name="cancellationToken">Cancellation token</param>
23-
Task FinalizeMultiTestRunAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler eventHandler, CancellationToken cancellationToken);
23+
Task ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, ITestRunAttachmentsProcessingEventsHandler eventHandler, CancellationToken cancellationToken);
2424

2525
/// <summary>
26-
/// Finalizes multi test run
26+
/// Processes attachments
2727
/// </summary>
2828
/// <param name="attachments">Collection of attachments</param>
2929
/// <param name="cancellationToken">Cancellation token</param>
3030
/// <returns>Collection of attachments.</returns>
31-
Task<Collection<AttachmentSet>> FinalizeMultiTestRunAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, CancellationToken cancellationToken);
31+
Task<Collection<AttachmentSet>> ProcessTestRunAttachmentsAsync(IRequestData requestData, IEnumerable<AttachmentSet> attachments, CancellationToken cancellationToken);
3232
}
3333
}

src/Microsoft.TestPlatform.Common/Telemetry/TelemetryDataConstants.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -90,19 +90,19 @@ public static class TelemetryDataConstants
9090

9191
public static string NumberOfAdapterUsedToDiscoverTests = "VS.TestDiscovery.AdaptersUsedCount";
9292

93-
// *********************Finalization****************************
94-
public static string NumberOfAttachmentsSentForFinalization = "VS.TestFinalization.InitialAttachmentsCount";
93+
// *********************Attachments Processing****************************
94+
public static string NumberOfAttachmentsSentForProcessing = "VS.AttachmentsProcessing.InitialAttachmentsCount";
9595

96-
public static string NumberOfAttachmentsAfterFinalization = "VS.TestFinalization.FinalAttachmentsCount";
96+
public static string NumberOfAttachmentsAfterProcessing = "VS.AttachmentsProcessing.FinalAttachmentsCount";
9797

98-
public static string TimeTakenInSecForFinalization = "VS.TestFinalization.TotalTimeTakenInSec";
99-
public static string FinalizationState = "VS.TestFinalization.FinalizationState";
98+
public static string TimeTakenInSecForAttachmentsProcessing = "VS.AttachmentsProcessing.TotalTimeTakenInSec";
99+
public static string AttachmentsProcessingState = "VS.AttachmentsProcessing.State";
100100

101101
// **************Events Name **********************************
102102
public static string TestDiscoveryCompleteEvent = "vs/testplatform/testdiscoverysession";
103103

104104
public static string TestExecutionCompleteEvent = "vs/testplatform/testrunsession";
105105

106-
public static string TestFinalizationCompleteEvent = "vs/testplatform/testfinalizationsession";
106+
public static string TestAttachmentsProcessingCompleteEvent = "vs/testplatform/testattachmentsprocessingsession";
107107
}
108108
}

src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MessageType.cs

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -124,24 +124,24 @@ public static class MessageType
124124
public const string CustomTestHostLaunchCallback = "TestExecution.CustomTestHostLaunchCallback";
125125

126126
/// <summary>
127-
/// Multi test run finalization
127+
/// Test run attachments processing
128128
/// </summary>
129-
public const string MultiTestRunFinalizationStart = "MultiTestRunFinalization.Start";
129+
public const string TestRunAttachmentsProcessingStart = "TestRunAttachmentsProcessing.Start";
130130

131131
/// <summary>
132-
/// Multi test run finalization callback
132+
/// Test run attachments processing callback
133133
/// </summary>
134-
public const string MultiTestRunFinalizationComplete = "MultiTestRunFinalization.Complete";
134+
public const string TestRunAttachmentsProcessingComplete = "TestRunAttachmentsProcessing.Complete";
135135

136136
/// <summary>
137-
/// Multi test run finalization progress
137+
/// Test run attachments processing progress
138138
/// </summary>
139-
public const string MultiTestRunFinalizationProgress = "MultiTestRunFinalization.Progress";
139+
public const string TestRunAttachmentsProcessingProgress = "TestRunAttachmentsProcessing.Progress";
140140

141141
/// <summary>
142-
/// Cancel multi test run finalization
142+
/// Cancel test run attachments processing
143143
/// </summary>
144-
public const string MultiTestRunFinalizationCancel = "MultiTestRunFinalization.Cancel";
144+
public const string TestRunAttachmentsProcessingCancel = "TestRunAttachmentsProcessing.Cancel";
145145

146146
/// <summary>
147147
/// Extensions Initialization

src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MultiTestRunFinalizationCompletePayload.cs renamed to src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingCompletePayload.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
99
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
1010

1111
/// <summary>
12-
/// Multi test run finalization complete payload.
12+
/// Test run attachments processing complete payload.
1313
/// </summary>
14-
public class MultiTestRunFinalizationCompletePayload
14+
public class TestRunAttachmentsProcessingCompletePayload
1515
{
1616
/// <summary>
17-
/// Gets or sets the multi test run finalization complete args.
17+
/// Gets or sets the test run attachments processing complete args.
1818
/// </summary>
19-
public MultiTestRunFinalizationCompleteEventArgs FinalizationCompleteEventArgs { get; set; }
19+
public TestRunAttachmentsProcessingCompleteEventArgs AttachmentsProcessingCompleteEventArgs { get; set; }
2020

2121
/// <summary>
2222
/// Gets or sets the attachments.

src/Microsoft.TestPlatform.CommunicationUtilities/Messages/MultiTestRunFinalizationProgressPayload.cs renamed to src/Microsoft.TestPlatform.CommunicationUtilities/Messages/TestRunAttachmentsProcessingProgressPayload.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
66
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
77

88
/// <summary>
9-
/// Multi test run finalization complete payload.
9+
/// Test run attachments processing complete payload.
1010
/// </summary>
11-
public class MultiTestRunFinalizationProgressPayload
11+
public class TestRunAttachmentsProcessingProgressPayload
1212
{
1313
/// <summary>
14-
/// Gets or sets the multi test run finalization complete args.
14+
/// Gets or sets the test run attachments processing complete args.
1515
/// </summary>
16-
public MultiTestRunFinalizationProgressEventArgs FinalizationProgressEventArgs { get; set; }
16+
public TestRunAttachmentsProcessingProgressEventArgs AttachmentsProcessingProgressEventArgs { get; set; }
1717
}
1818
}

src/Microsoft.TestPlatform.CoreUtilities/Tracing/Interfaces/ITestPlatformEventSource.cs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -184,39 +184,39 @@ public interface ITestPlatformEventSource
184184
void MetricsDisposeStop();
185185

186186
/// <summary>
187-
/// The multi test run finalization request start.
187+
/// The test run attachments processing request start.
188188
/// </summary>
189-
void MultiTestRunFinalizationRequestStart();
189+
void TestRunAttachmentsProcessingRequestStart();
190190

191191
/// <summary>
192-
/// The multi test run finalization request stop.
192+
/// The test run attachments processing request stop.
193193
/// </summary>
194-
void MultiTestRunFinalizationRequestStop();
194+
void TestRunAttachmentsProcessingRequestStop();
195195

196196
/// <summary>
197-
/// The multi test run finalization start.
197+
/// The test run attachments processing start.
198198
/// </summary>
199199
/// <param name="numberOfAttachments">
200200
/// The number of attachments.
201201
/// </param>
202-
void MultiTestRunFinalizationStart(long numberOfAttachments);
202+
void TestRunAttachmentsProcessingStart(long numberOfAttachments);
203203

204204
/// <summary>
205-
/// The multi test run finalization stop.
205+
/// The test run attachments processing stop.
206206
/// </summary>
207207
/// <param name="numberOfAttachments">
208208
/// The number of attachments.
209209
/// </param>
210-
void MultiTestRunFinalizationStop(long numberOfAttachments);
210+
void TestRunAttachmentsProcessingStop(long numberOfAttachments);
211211

212212
/// <summary>
213-
/// Mark the start of translation layer multi test run finalization request.
213+
/// Mark the start of translation layer test run attachments processing request.
214214
/// </summary>
215-
void TranslationLayerMultiTestRunFinalizationStart();
215+
void TranslationLayerTestRunAttachmentsProcessingStart();
216216

217217
/// <summary>
218-
/// Mark the completion of translation layer multi test run finalization request.
218+
/// Mark the completion of translation layer test run attachments processing request.
219219
/// </summary>
220-
void TranslationLayerMultiTestRunFinalizationStop();
220+
void TranslationLayerTestRunAttachmentsProcessingStop();
221221
}
222222
}

0 commit comments

Comments
 (0)