Skip to content

Commit 6aa2912

Browse files
jakubch1jakubch1
committed
compiled
1 parent e7b839f commit 6aa2912

18 files changed

Lines changed: 220 additions & 323 deletions

File tree

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

Lines changed: 2 additions & 2 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-
12+
using Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunsFinalization;
1313
using Microsoft.VisualStudio.TestPlatform.Client.RequestHelper;
1414
using Microsoft.VisualStudio.TestPlatform.Common.Logging;
1515
using Microsoft.VisualStudio.TestPlatform.Common.Utilities;
@@ -476,7 +476,7 @@ private void StartMultiTestRunsFinalization(MultiTestRunsFinalizationPayload fin
476476
try
477477
{
478478
testRequestManager.ResetOptions();
479-
testRequestManager.FinalizeMultiTestRuns(finalizationPayload);
479+
testRequestManager.FinalizeMultiTestRuns(finalizationPayload, new MultiTestRunsFinalizationEventsHandler(this.communicationManager));
480480
}
481481
catch (Exception ex)
482482
{

src/Microsoft.TestPlatform.CommunicationUtilities/EventHandlers/MultiTestRunsFinalizationEventsHandler.cs renamed to src/Microsoft.TestPlatform.Client/MultiTestRunsFinalization/MultiTestRunsFinalizationEventsHandler.cs

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
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.CommunicationUtilities.EventHandlers
4+
namespace Microsoft.VisualStudio.TestPlatform.Client.MultiTestRunsFinalization
55
{
6-
using System.Collections.Generic;
7-
86
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
7+
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.ObjectModel;
98
using Microsoft.VisualStudio.TestPlatform.ObjectModel;
109
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
1110
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
11+
using System.Collections.Generic;
1212

1313
/// <summary>
1414
/// The multi test finalization event handler.
1515
/// </summary>
1616
public class MultiTestRunsFinalizationEventsHandler : IMultiTestRunsFinalizationEventsHandler
1717
{
18-
private ITestRequestHandler requestHandler;
18+
private ICommunicationManager communicationManager;
1919

2020
/// <summary>
2121
/// Initializes a new instance of the <see cref="MultiTestRunsFinalizationEventsHandler"/> class.
2222
/// </summary>
2323
/// <param name="requestHandler"> The Request Handler. </param>
24-
public MultiTestRunsFinalizationEventsHandler(ITestRequestHandler requestHandler)
24+
public MultiTestRunsFinalizationEventsHandler(ICommunicationManager communicationManager)
2525
{
26-
this.requestHandler = requestHandler;
26+
this.communicationManager = communicationManager;
2727
}
2828

2929
/// <summary>
@@ -33,26 +33,8 @@ public MultiTestRunsFinalizationEventsHandler(ITestRequestHandler requestHandler
3333
/// <param name="message"> Logging message. </param>
3434
public void HandleLogMessage(TestMessageLevel level, string message)
3535
{
36-
switch ((TestMessageLevel)level)
37-
{
38-
case TestMessageLevel.Informational:
39-
EqtTrace.Info(message);
40-
break;
41-
42-
case TestMessageLevel.Warning:
43-
EqtTrace.Warning(message);
44-
break;
45-
46-
case TestMessageLevel.Error:
47-
EqtTrace.Error(message);
48-
break;
49-
50-
default:
51-
EqtTrace.Info(message);
52-
break;
53-
}
54-
55-
this.requestHandler.SendLog(level, message);
36+
var testMessagePayload = new TestMessagePayload { MessageLevel = level, Message = message };
37+
this.communicationManager.SendMessage(MessageType.TestMessage, testMessagePayload);
5638
}
5739

5840
public void HandleMultiTestRunsFinalizationComplete(ICollection<AttachmentSet> attachments)
@@ -62,13 +44,18 @@ public void HandleMultiTestRunsFinalizationComplete(ICollection<AttachmentSet> a
6244
EqtTrace.Info("Multi test runs finalization completed.");
6345
}
6446

65-
this.requestHandler.MultiTestRunsFinalizationComplete(attachments);
47+
var payload = new MultiTestRunsFinalizationCompletePayload()
48+
{
49+
Attachments = null
50+
};
51+
52+
// Send run complete to translation layer
53+
this.communicationManager.SendMessage(MessageType.MultiTestRunsFinalizationComplete, payload);
6654
}
6755

6856
public void HandleRawMessage(string rawMessage)
6957
{
7058
// No-Op
71-
// TestHost at this point has no functionality where it requires rawmessage
7259
}
7360
}
7461
}

‎src/Microsoft.TestPlatform.Client/MultiTestRunsFinalization/MultiTestRunsFinalizationRequest.cs‎

Lines changed: 0 additions & 159 deletions
This file was deleted.

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,8 @@ public interface ITestRequestManager : IDisposable
4848
/// Finalize multi test runs
4949
/// </summary>
5050
/// <param name="multiTestRunsFinalizationPayload">Multi test runs finalization payload</param>
51-
void FinalizeMultiTestRuns(MultiTestRunsFinalizationPayload multiTestRunsFinalizationPayload);
51+
/// <param name="multiTestRunsFinalizationEventsHandler">Multi test runs finalization events handler</param>
52+
void FinalizeMultiTestRuns(MultiTestRunsFinalizationPayload multiTestRunsFinalizationPayload, IMultiTestRunsFinalizationEventsHandler multiTestRunsFinalizationEventsHandler);
5253

5354
/// <summary>
5455
/// Cancel the current TestRun request
@@ -68,6 +69,6 @@ public interface ITestRequestManager : IDisposable
6869
/// <summary>
6970
/// Cancels the current multi test runs finalization request
7071
/// </summary>
71-
void CancelMultiTestRunsFinalizaiton();
72+
void CancelMultiTestRunsFinalization();
7273
}
7374
}

‎src/Microsoft.TestPlatform.Common/Interfaces/Engine/IMultiTestRunsFinalizationManager.cs‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33

44
using Microsoft.VisualStudio.TestPlatform.ObjectModel.Client;
55
using System.Collections.Generic;
6+
using System.Threading;
7+
using System.Threading.Tasks;
68

79
namespace Microsoft.VisualStudio.TestPlatform.ObjectModel.Engine
810
{
@@ -16,11 +18,7 @@ public interface IMultiTestRunsFinalizationManager
1618
/// </summary>
1719
/// <param name="attachments">Attachments</param>
1820
/// <param name="eventHandler">EventHandler for handling multi test runs finalization events from Engine</param>
19-
void FinalizeMultiTestRuns(ICollection<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler eventHandler);
20-
21-
/// <summary>
22-
/// Aborts multi test runs finalization
23-
/// </summary>
24-
void Abort();
21+
/// <param name="cancellationToken">Cancellation token</param>
22+
Task FinalizeMultiTestRunsAsync(ICollection<AttachmentSet> attachments, IMultiTestRunsFinalizationEventsHandler eventHandler, CancellationToken cancellationToken);
2523
}
2624
}

‎src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/MultiTestRunsDataCollectorAttachmentsHandler.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
using System.Collections.Generic;
88
using System.Collections.ObjectModel;
99
using System.Linq;
10+
using System.Threading;
1011

1112
namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
1213
{
@@ -19,7 +20,7 @@ public MultiTestRunsDataCollectorAttachmentsHandler(IDataCollectorAttachments da
1920
this.dataCollectorAttachmentsHandler = dataCollectorAttachmentsHandler;
2021
}
2122

22-
public void HandleAttachements(ICollection<AttachmentSet> attachments)
23+
public void HandleAttachements(ICollection<AttachmentSet> attachments, CancellationToken cancellationToken)
2324
{
2425
Uri attachementUri = dataCollectorAttachmentsHandler.GetExtensionUri();
2526
if (attachementUri != null)
@@ -31,7 +32,7 @@ public void HandleAttachements(ICollection<AttachmentSet> attachments)
3132
attachments.Remove(coverageAttachment);
3233
}
3334

34-
ICollection<AttachmentSet> mergedAttachments = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(coverageAttachments));
35+
ICollection<AttachmentSet> mergedAttachments = dataCollectorAttachmentsHandler.HandleDataCollectionAttachmentSets(new Collection<AttachmentSet>(coverageAttachments), cancellationToken);
3536
foreach (var attachment in mergedAttachments)
3637
{
3738
attachments.Add(attachment);

‎src/Microsoft.TestPlatform.CrossPlatEngine/DataCollection/ParallelDataCollectionEventsHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
namespace Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.DataCollection
55
{
66
using System.Collections.Generic;
7-
7+
using System.Threading;
88
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities;
99
using Microsoft.VisualStudio.TestPlatform.CommunicationUtilities.Interfaces;
1010
using Microsoft.VisualStudio.TestPlatform.CrossPlatEngine.Client.Parallel;
@@ -53,7 +53,7 @@ public override void HandleTestRunComplete(
5353

5454
if (parallelRunComplete)
5555
{
56-
attachmentsHandler.HandleAttachements(runDataAggregator.RunContextAttachments);
56+
attachmentsHandler.HandleAttachements(runDataAggregator.RunContextAttachments, CancellationToken.None);
5757

5858
var completedArgs = new TestRunCompleteEventArgs(this.runDataAggregator.GetAggregatedRunStats(),
5959
this.runDataAggregator.IsCanceled,

0 commit comments

Comments
 (0)