Skip to content

Commit 6189eb0

Browse files
jakubch1jakubch1
committed
More changes
1 parent e23d24d commit 6189eb0

9 files changed

Lines changed: 55 additions & 41 deletions

File tree

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,7 @@ private void ProcessRequests(ITestRequestManager testRequestManager)
201201
break;
202202
}
203203

204-
case MessageType.MultiTestRunsFinalization:
204+
case MessageType.MultiTestRunsFinalizationStart:
205205
{
206206
var multiTestRunsFinalizationPayload =
207207
this.communicationManager.DeserializePayload<MultiTestRunsFinalizationPayload>(message);

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -126,12 +126,17 @@ public static class MessageType
126126
/// <summary>
127127
/// Multi test runs finalization
128128
/// </summary>
129-
public const string MultiTestRunsFinalization = "TestExecution.MultiTestRunsFinalization";
129+
public const string MultiTestRunsFinalizationStart = "MultiTestRunsFinalization.Start";
130130

131131
/// <summary>
132132
/// Multi test runs finalization callback
133133
/// </summary>
134-
public const string MultiTestRunsFinalizationComplete = "TestExecution.MultiTestRunsFinalizationComplete";
134+
public const string MultiTestRunsFinalizationComplete = "MultiTestRunsFinalization.Complete";
135+
136+
/// <summary>
137+
/// Cancel multi test runs finalization
138+
/// </summary>
139+
public const string MultiTestRunsFinalizationCancel = "MultiTestRunsFinalization.Cancel";
135140

136141
/// <summary>
137142
/// Extensions Initialization

‎src/Microsoft.TestPlatform.CrossPlatEngine/EventHandlers/TestRequestHandler.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@ public void OnMessageReceived(object sender, MessageReceivedEventArgs messageRec
375375
break;
376376
}
377377

378-
case MessageType.MultiTestRunsFinalization:
378+
case MessageType.MultiTestRunsFinalizationStart:
379379
{
380380
EqtTrace.Info("Multi test runs finalization started.");
381381
var multiTestRunsFinalizationEventsHandler = new MultiTestRunsFinalizationEventsHandler(this);

‎src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/ITranslationLayerRequestSender.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,5 +117,10 @@ internal interface ITranslationLayerRequestSender : IDisposable
117117
/// <param name="attachments">List of attachements</param>
118118
/// <param name="multiTestRunsFinalizationCompleteEventsHandler"></param>
119119
void FinalizeMultiTestRuns(ICollection<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
120+
121+
/// <summary>
122+
/// Cancels multi test runs finalization
123+
/// </summary>
124+
void CancelMultiTestRunsFinalization();
120125
}
121126
}

‎src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/Interfaces/IVsTestConsoleWrapper2.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,10 @@ public interface IVsTestConsoleWrapper2 : IVsTestConsoleWrapper
1919
/// <param name="attachments">List of attachements</param>
2020
/// <param name="multiTestRunsFinalizationCompleteEventsHandler">EventHandler to receive session complete event</param>
2121
void FinalizeMultiTestRuns(ICollection<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationCompleteEventsHandler);
22+
23+
/// <summary>
24+
/// Cancel last multi test runs finalization
25+
/// </summary>
26+
void CancelMultiTestRunsFinalization();
2227
}
2328
}

‎src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleRequestSender.cs‎

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -389,6 +389,16 @@ public void FinalizeMultiTestRuns(ICollection<AttachmentSet> attachments, IMulti
389389
this.SendMessageAndListenAndReportAttachements(attachments, testSessionEventsHandler);
390390
}
391391

392+
/// <inheritdoc/>
393+
public void CancelMultiTestRunsFinalization()
394+
{
395+
if (EqtTrace.IsInfoEnabled)
396+
{
397+
EqtTrace.Info("VsTestConsoleRequestSender.CancelMultiTestRunsFinalization: Canceling multi test runs finalization.");
398+
}
399+
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalizationCancel);
400+
}
401+
392402
/// <summary>
393403
/// Closes the communication channel
394404
/// </summary>
@@ -739,7 +749,7 @@ private void SendMessageAndListenAndReportAttachements(ICollection<AttachmentSet
739749
{
740750
Attachments = attachments
741751
};
742-
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalization, payload);
752+
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalizationStart, payload);
743753
var isMultiTestRunsFinalizationComplete = false;
744754

745755
// Cycle through the messages that the vstest.console sends.

‎src/Microsoft.TestPlatform.VsTestConsole.TranslationLayer/VsTestConsoleWrapper.cs‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,12 @@ public void FinalizeMultiTestRuns(ICollection<AttachmentSet> attachments, IMulti
286286
this.requestSender.FinalizeMultiTestRuns(attachments, testSessionEventsHandler);
287287
}
288288

289+
/// <inheritdoc/>
290+
public void CancelMultiTestRunsFinalization()
291+
{
292+
throw new System.NotImplementedException();
293+
}
294+
289295
#endregion
290296

291297
private void EnsureInitialized()

‎test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/EventHandler/RunEventHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,9 @@ public void HandleTestRunComplete(
7575
this.TestResults.AddRange(lastChunkArgs.NewTestResults);
7676
}
7777

78-
if(runContextAttachments != null)
78+
if (testRunCompleteArgs.AttachmentSets != null)
7979
{
80-
this.Attachments.AddRange(runContextAttachments);
80+
this.Attachments.AddRange(testRunCompleteArgs.AttachmentSets);
8181
}
8282

8383
this.Metrics = testRunCompleteArgs.Metrics;

‎test/Microsoft.TestPlatform.AcceptanceTests/TranslationLayerTests/FinalizeMultiTestRunsTests.cs‎

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -39,47 +39,24 @@ public void Cleanup()
3939
this.vstestConsoleWrapper?.EndSession();
4040
}
4141

42-
//[TestMethod]
43-
//[NetFullTargetFrameworkDataSource]
44-
//[NetCoreTargetFrameworkDataSource]
45-
//public void RunAllTests(RunnerInfo runnerInfo)
46-
//{
47-
// AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
48-
// this.Setup();
49-
50-
// this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
51-
// this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
52-
53-
// // Assert
54-
// Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
55-
// Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
56-
// Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
57-
// Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
58-
// Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
59-
60-
// this.vstestConsoleWrapper.FinalizeMultiTestRuns(runEventHandler.Attachments, multiTestRunsFinalizationEventHandler);
61-
// Assert.AreEqual(1, this.multiTestRunsFinalizationEventHandler.Attachments.Count);
62-
//}
63-
6442
[TestMethod]
65-
public void RunAllTests()
43+
[NetFullTargetFrameworkDataSource]
44+
[NetCoreTargetFrameworkDataSource]
45+
public void FinalizeMultiTestRuns(RunnerInfo runnerInfo)
6646
{
67-
RunnerInfo runnerInfo = new RunnerInfo(AcceptanceTestBase.DesktopTargetFramework, AcceptanceTestBase.DesktopTargetFramework);
6847
AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
6948
this.Setup();
7049

7150
this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
72-
//this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
51+
this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
52+
53+
Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
54+
Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
55+
56+
this.vstestConsoleWrapper.FinalizeMultiTestRuns(runEventHandler.Attachments, multiTestRunsFinalizationEventHandler);
7357

7458
// Assert
75-
Assert.AreEqual(3, this.runEventHandler.TestResults.Count);
76-
Assert.AreEqual(1, this.runEventHandler.Attachments.Count);
77-
//Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Passed));
78-
//Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Failed));
79-
//Assert.AreEqual(2, this.runEventHandler.TestResults.Count(t => t.Outcome == TestOutcome.Skipped));
80-
81-
//this.vstestConsoleWrapper.FinalizeMultiTestRuns(runEventHandler.Attachments, multiTestRunsFinalizationEventHandler);
82-
//Assert.AreEqual(1, this.multiTestRunsFinalizationEventHandler.Attachments.Count);
59+
Assert.AreEqual(testEnvironment.RunnerFramework.Equals(IntegrationTestBase.DesktopRunnerFramework) ? 1 : 2, this.multiTestRunsFinalizationEventHandler.Attachments.Count);
8360
}
8461

8562
[TestMethod]
@@ -92,7 +69,13 @@ public void EndSessionShouldEnsureVstestConsoleProcessDies(RunnerInfo runnerInfo
9269
AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo);
9370
this.Setup();
9471

95-
this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies(), this.GetDefaultRunSettings(), this.runEventHandler);
72+
this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Take(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
73+
this.vstestConsoleWrapper.RunTests(this.GetTestAssemblies().Skip(1), this.GetCodeCoverageRunSettings(), this.runEventHandler);
74+
75+
Assert.AreEqual(6, this.runEventHandler.TestResults.Count);
76+
Assert.AreEqual(2, this.runEventHandler.Attachments.Count);
77+
78+
this.vstestConsoleWrapper.FinalizeMultiTestRuns(runEventHandler.Attachments, multiTestRunsFinalizationEventHandler);
9679
this.vstestConsoleWrapper?.EndSession();
9780

9881
// Assert

0 commit comments

Comments
 (0)