Skip to content

Commit 39f3f84

Browse files
jakubch1jakubch1
committed
Review comments #1 
1 parent 44c5fdc commit 39f3f84

46 files changed

Lines changed: 257 additions & 247 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/DesignMode/DesignModeClient.cs‎

Lines changed: 12 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,21 +9,19 @@ 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.MultiTestRunsFinalization;
12+
using Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization;
1313
using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
1414
using Microsoft.VisualStudio.TestPlatform.Common.Logging;
1515
using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
1616
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
1717
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
1818
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
1919
using Microsoft.VisualStudio.TestPlatform.CoreUtilities.Helpers;
20-
using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection;
2120
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
2221
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
2322
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
2423
using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions;
2524
using Microsoft.VisualStudio.TestPlatform.PlatformAbstractions.Interfaces;
26-
using Microsoft.VisualStudio.TestPlatform.Utilities;
2725
using CommunicationUtilitiesResources = Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Resources.Resources;
2826
using CoreUtilitiesConstants = Microsoft.VisualStudio.TestPlatform.CoreUtilities.Constants;
2927
using ObjectModelConstants = Microsoft.VisualStudio.TestPlatform.ObjectModel.Constants;
@@ -201,11 +199,11 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
201199
break;
202200
}
203201

204-
case MessageType.MultiTestRunsFinalizationStart:
202+
case MessageType.MultiTestRunFinalizationStart:
205203
{
206-
var multiTestRunsFinalizationPayload =
207-
this.communicationManager.DeserializePayload<MultiTestRunsFinalizationPayload>(message);
208-
this.StartMultiTestRunsFinalization(multiTestRunsFinalizationPayload, testRequestManager);
204+
var multiTestRunFinalizationPayload =
205+
this.communicationManager.DeserializePayload<MultiTestRunFinalizationPayload>(message);
206+
this.StartMultiTestRunFinalization(multiTestRunFinalizationPayload, testRequestManager);
209207
break;
210208
}
211209

@@ -227,9 +225,9 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
227225
break;
228226
}
229227

230-
case MessageType.MultiTestRunsFinalizationCancel:
228+
case MessageType.MultiTestRunFinalizationCancel:
231229
{
232-
testRequestManager.CancelMultiTestRunsFinalization();
230+
testRequestManager.CancelMultiTestRunFinalization();
233231
break;
234232
}
235233

@@ -474,30 +472,29 @@ private void StartDiscovery(DiscoveryRequestPayload discoveryRequestPayload, ITe
474472
});
475473
}
476474

477-
private void StartMultiTestRunsFinalization(MultiTestRunsFinalizationPayload finalizationPayload, ITestRequestManager testRequestManager)
475+
private void StartMultiTestRunFinalization(MultiTestRunFinalizationPayload finalizationPayload, ITestRequestManager testRequestManager)
478476
{
479477
Task.Run(
480478
delegate
481479
{
482480
try
483481
{
484-
testRequestManager.ResetOptions();
485-
testRequestManager.FinalizeMultiTestRuns(finalizationPayload, new MultiTestRunsFinalizationEventsHandler(this.communicationManager));
482+
testRequestManager.FinalizeMultiTestRun(finalizationPayload, new MultiTestRunFinalizationEventsHandler(this.communicationManager));
486483
}
487484
catch (Exception ex)
488485
{
489-
EqtTrace.Error("DesignModeClient: Exception in StartMultiTestRunsFinalization: " + ex);
486+
EqtTrace.Error("DesignModeClient: Exception in StartMultiTestRunFinalization: " + ex);
490487

491488
var testMessagePayload = new TestMessagePayload { MessageLevel = TestMessageLevel.Error, Message = ex.ToString() };
492489
this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
493490

494-
var payload = new MultiTestRunsFinalizationCompletePayload()
491+
var payload = new MultiTestRunFinalizationCompletePayload()
495492
{
496493
Attachments = null
497494
};
498495

499496
// Send run complete to translation layer
500-
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalizationComplete, payload);
497+
this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationComplete, payload);
501498
}
502499
});
503500
}

src/Microsoft.TestPlatform.Client/MultiTestRunsFinalization/MultiTestRunsFinalizationEventsHandler.cs renamed to src/Microsoft.TestPlatform.Client/MultiTestRunFinalization/MultiTestRunFinalizationEventsHandler.cs

Lines changed: 25 additions & 15 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.MultiTestRunsFinalization
4+
namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunFinalization
55
{
66
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
77
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
@@ -13,15 +13,17 @@ namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunsFinalization
1313
/// <summary>
1414
/// The multi test finalization event handler.
1515
/// </summary>
16-
public class MultiTestRunsFinalizationEventsHandler : IMultiTestRunsFinalizationEventsHandler
16+
public class MultiTestRunFinalizationEventsHandler : IMultiTestRunFinalizationEventsHandler
1717
{
18-
private ICommunicationManager communicationManager;
18+
private readonly ICommunicationManager communicationManager;
19+
private bool finalizationCompleteSent;
20+
private readonly object syncObject = new object();
1921

2022
/// <summary>
21-
/// Initializes a new instance of the <see cref="MultiTestRunsFinalizationEventsHandler"/> class.
23+
/// Initializes a new instance of the <see cref="MultiTestRunFinalizationEventsHandler"/> class.
2224
/// </summary>
2325
/// <param name="requestHandler"> The Request Handler. </param>
24-
public MultiTestRunsFinalizationEventsHandler(ICommunicationManager communicationManager)
26+
public MultiTestRunFinalizationEventsHandler(ICommunicationManager communicationManager)
2527
{
2628
this.communicationManager = communicationManager;
2729
}
@@ -37,20 +39,28 @@ public void HandleLogMessage(TestMessageLevel level, string message)
3739
this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
3840
}
3941

40-
public void HandleMultiTestRunsFinalizationComplete(ICollection<AttachmentSet> attachments)
42+
public void HandleMultiTestRunFinalizationComplete(ICollection<AttachmentSet> attachments)
4143
{
42-
if (EqtTrace.IsInfoEnabled)
44+
lock(this.syncObject)
4345
{
44-
EqtTrace.Info("Multi test runs finalization completed.");
45-
}
46+
if(!finalizationCompleteSent)
47+
{
48+
if (EqtTrace.IsInfoEnabled)
49+
{
50+
EqtTrace.Info("Multi test run finalization completed.");
51+
}
4652

47-
var payload = new MultiTestRunsFinalizationCompletePayload()
48-
{
49-
Attachments = attachments
50-
};
53+
var payload = new MultiTestRunFinalizationCompletePayload()
54+
{
55+
Attachments = attachments
56+
};
5157

52-
// Send run complete to translation layer
53-
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalizationComplete, payload);
58+
// Send run complete to translation layer
59+
this.communicationManager.SendMessage(MessageType.MultiTestRunFinalizationComplete, payload);
60+
61+
finalizationCompleteSent = true;
62+
}
63+
}
5464
}
5565

5666
public void HandleRawMessage(string rawMessage)

‎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 runs
48+
/// Finalize multi test run
4949
/// </summary>
50-
/// <param name="multiTestRunsFinalizationPayload">Multi test runs finalization payload</param>
51-
/// <param name="multiTestRunsFinalizationEventsHandler">Multi test runs finalization events handler</param>
52-
void FinalizeMultiTestRuns(MultiTestRunsFinalizationPayload multiTestRunsFinalizationPayload, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationEventsHandler);
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);
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 runs finalization request
70+
/// Cancels the current multi test run finalization request
7171
/// </summary>
72-
void CancelMultiTestRunsFinalization();
72+
void CancelMultiTestRunFinalization();
7373
}
7474
}

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,16 +9,16 @@
99
namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
1010
{
1111
/// <summary>
12-
/// Orchestrates multi test runs finalization operations.
12+
/// Orchestrates multi test run finalization operations.
1313
/// </summary>
14-
public interface IMultiTestRunsFinalizationManager
14+
public interface IMultiTestRunFinalizationManager
1515
{
1616
/// <summary>
17-
/// Finalizes multi test runs
17+
/// Finalizes multi test run
1818
/// </summary>
1919
/// <param name="attachments">Attachments</param>
20-
/// <param name="eventHandler">EventHandler for handling multi test runs finalization events from Engine</param>
20+
/// <param name="eventHandler">EventHandler for handling multi test run finalization events from Engine</param>
2121
/// <param name="cancellationToken">Cancellation token</param>
22-
Task FinalizeMultiTestRunsAsync(ICollection<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler eventHandler, CancellationToken cancellationToken);
22+
Task FinalizeMultiTestRunAsync(ICollection<AttachmentSet> attachments, IMultiTestRunFinalizationEventsHandler eventHandler, CancellationToken cancellationToken);
2323
}
2424
}

‎src/Microsoft.TestPlatform.CommunicationUtilities/JsonDataSerializer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ private JsonDataSerializer()
4747
// MemoryTraceWriter can help diagnose serialization issues. Enable it for
4848
// debug builds only.
4949
// Note that MemoryTraceWriter is not thread safe, please don't use it in parallel
50-
// test runs. See https://github.com/JamesNK/Newtonsoft.Json/issues/1279
50+
// test run. See https://github.com/JamesNK/Newtonsoft.Json/issues/1279
5151
payloadSerializer.TraceWriter = new MemoryTraceWriter();
5252
payloadSerializer2.TraceWriter = new MemoryTraceWriter();
5353
#endif

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

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

126126
/// <summary>
127-
/// Multi test runs finalization
127+
/// Multi test run finalization
128128
/// </summary>
129-
public const string MultiTestRunsFinalizationStart = "MultiTestRunsFinalization.Start";
129+
public const string MultiTestRunFinalizationStart = "MultiTestRunFinalization.Start";
130130

131131
/// <summary>
132-
/// Multi test runs finalization callback
132+
/// Multi test run finalization callback
133133
/// </summary>
134-
public const string MultiTestRunsFinalizationComplete = "MultiTestRunsFinalization.Complete";
134+
public const string MultiTestRunFinalizationComplete = "MultiTestRunFinalization.Complete";
135135

136136
/// <summary>
137-
/// Cancel multi test runs finalization
137+
/// Cancel multi test run finalization
138138
/// </summary>
139-
public const string MultiTestRunsFinalizationCancel = "MultiTestRunsFinalization.Cancel";
139+
public const string MultiTestRunFinalizationCancel = "MultiTestRunFinalization.Cancel";
140140

141141
/// <summary>
142142
/// Extensions Initialization

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) Microsoft Corporation. All rights reserved.
1+
// 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

44
namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
@@ -8,9 +8,9 @@ namespace Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel
88
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
99

1010
/// <summary>
11-
/// Multi test runs finalization complete payload.
11+
/// Multi test run finalization complete payload.
1212
/// </summary>
13-
public class MultiTestRunsFinalizationCompletePayload
13+
public class MultiTestRunFinalizationCompletePayload
1414
{
1515
/// <summary>
1616
/// Gets or sets the attachments.

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

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

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

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

196196
/// <summary>
197-
/// The adapter multi test runs finalization start.
197+
/// The adapter multi test run finalization start.
198198
/// </summary>
199199
/// <param name="numberOfAttachements">
200200
/// The number of attachements.
201201
/// </param>
202-
void AdapterMultiTestRunsFinalizationStart(long numberOfAttachements);
202+
void AdapterMultiTestRunFinalizationStart(long numberOfAttachements);
203203

204204
/// <summary>
205-
/// The adapter multi test runs finalization stop.
205+
/// The adapter multi test run finalization stop.
206206
/// </summary>
207207
/// <param name="numberOfAttachements">
208208
/// The number of attachements.
209209
/// </param>
210-
void AdapterMultiTestRunsFinalizationStop(long numberOfAttachements);
210+
void AdapterMultiTestRunFinalizationStop(long numberOfAttachements);
211211

212212
/// <summary>
213-
/// The multi test runs finalization start.
213+
/// The multi test run finalization start.
214214
/// </summary>
215-
void MultiTestRunsFinalizationStart();
215+
void MultiTestRunFinalizationStart();
216216

217217
/// <summary>
218-
/// The multi test runs finalization stop.
218+
/// The multi test run finalization stop.
219219
/// </summary>
220220
/// <param name="numberOfAttachements">
221221
/// The number of attachements.
222222
/// </param>
223-
void MultiTestRunsFinalizationStop(long numberOfAttachements);
223+
void MultiTestRunFinalizationStop(long numberOfAttachements);
224224

225225
/// <summary>
226-
/// Mark the start of translation layer multi test runs finalization request.
226+
/// Mark the start of translation layer multi test run finalization request.
227227
/// </summary>
228-
void TranslationLayerMultiTestRunsFinalizationStart();
228+
void TranslationLayerMultiTestRunFinalizationStart();
229229

230230
/// <summary>
231-
/// Mark the completion of translation layer multi test runs finalization request.
231+
/// Mark the completion of translation layer multi test run finalization request.
232232
/// </summary>
233-
void TranslationLayerMultiTestRunsFinalizationStop();
233+
void TranslationLayerMultiTestRunFinalizationStop();
234234
}
235235
}

0 commit comments

Comments
 (0)