[rel/4.0]: Unify TestSessionContext

Youssef1313 · Youssef1313 · commit 0de95f5dd019 · 2025-08-11T21:56:11.000+02:00
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Requests/VSTestDiscoverTestExecutionRequest.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Requests/VSTestDiscoverTestExecutionRequest.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.Testing.Platform.Requests;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 
diff --git a/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Requests/VSTestRunTestExecutionRequest.cs b/src/Platform/Microsoft.Testing.Extensions.VSTestBridge/Requests/VSTestRunTestExecutionRequest.cs
@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using Microsoft.Testing.Platform.Requests;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 
 namespace Microsoft.Testing.Extensions.VSTestBridge.Requests;
diff --git a/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs b/src/Platform/Microsoft.Testing.Platform/Hosts/ConsoleTestHost.cs
@@ -52,7 +52,7 @@ protected override async Task<int> InternalRunAsync(CancellationToken cancellati
         ITestFrameworkInvoker testAdapterInvoker = ServiceProvider.GetService<ITestFrameworkInvoker>()
             ?? new TestHostTestFrameworkInvoker(ServiceProvider);
 
-        ServiceProvider.TryAddService(new Services.TestSessionContext(cancellationToken));
+        ServiceProvider.TryAddService(new TestSessionContext(new SessionUid(Guid.NewGuid().ToString()), cancellationToken));
         ITestFramework testFramework = await _buildTestFrameworkAsync(new(
             ServiceProvider,
             new ConsoleTestExecutionRequestFactory(ServiceProvider.GetCommandLineOptions(), testExecutionFilterFactory),
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/ConsoleTestExecutionRequestFactory.cs b/src/Platform/Microsoft.Testing.Platform/Requests/ConsoleTestExecutionRequestFactory.cs
@@ -4,7 +4,7 @@
 using Microsoft.Testing.Platform.CommandLine;
 using Microsoft.Testing.Platform.Helpers;
 using Microsoft.Testing.Platform.Resources;
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/DiscoverTestExecutionRequest.cs b/src/Platform/Microsoft.Testing.Platform/Requests/DiscoverTestExecutionRequest.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/IRequest.cs b/src/Platform/Microsoft.Testing.Platform/Requests/IRequest.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/ITestExecutionRequestFactory.cs b/src/Platform/Microsoft.Testing.Platform/Requests/ITestExecutionRequestFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/RunTestExecutionRequest.cs b/src/Platform/Microsoft.Testing.Platform/Requests/RunTestExecutionRequest.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/ServerTestExecutionRequestFactory.cs b/src/Platform/Microsoft.Testing.Platform/Requests/ServerTestExecutionRequestFactory.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TestExecutionRequest.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TestExecutionRequest.cs
@@ -1,7 +1,7 @@
 ﻿// Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
-using Microsoft.Testing.Platform.TestHost;
+using Microsoft.Testing.Platform.Services;
 
 namespace Microsoft.Testing.Platform.Requests;
 
diff --git a/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs b/src/Platform/Microsoft.Testing.Platform/Requests/TestHostTestFrameworkInvoker.cs
@@ -54,7 +54,7 @@ public async Task ExecuteAsync(ITestFramework testFramework, ClientInfo client,
         await HandleTestSessionResultAsync(createTestSessionResult.IsSuccess, createTestSessionResult.WarningMessage, createTestSessionResult.ErrorMessage, cancellationToken).ConfigureAwait(false);
 
         ITestExecutionRequestFactory testExecutionRequestFactory = ServiceProvider.GetTestExecutionRequestFactory();
-        TestExecutionRequest request = await testExecutionRequestFactory.CreateRequestAsync(new(sessionId)).ConfigureAwait(false);
+        TestExecutionRequest request = await testExecutionRequestFactory.CreateRequestAsync(new(sessionId, cancellationToken)).ConfigureAwait(false);
         IMessageBus messageBus = ServiceProvider.GetMessageBus();
 
         // Execute the test request
diff --git a/src/Platform/Microsoft.Testing.Platform/Services/TestSessionContext.cs b/src/Platform/Microsoft.Testing.Platform/Services/TestSessionContext.cs
@@ -5,9 +5,24 @@
 
 namespace Microsoft.Testing.Platform.Services;
 
-internal sealed class TestSessionContext(CancellationToken cancellationToken) : ITestSessionContext
+/// <summary>
+/// Represents the context of a test session.
+/// </summary>
+public sealed class TestSessionContext : ITestSessionContext
 {
-    public SessionUid SessionUid { get; } = new(Guid.NewGuid().ToString());
+    internal TestSessionContext(SessionUid sessionUid, CancellationToken cancellationToken)
+    {
+        SessionUid = sessionUid;
+        CancellationToken = cancellationToken;
+    }
 
-    public CancellationToken CancellationToken { get; } = cancellationToken;
+    /// <summary>
+    /// Gets the unique identifier of the test session.
+    /// </summary>
+    public SessionUid SessionUid { get; }
+
+    /// <summary>
+    /// Gets the cancellation token associated with the test session.
+    /// </summary>
+    public CancellationToken CancellationToken { get; }
 }
diff --git a/src/Platform/Microsoft.Testing.Platform/TestFramework/CloseTestSessionContext.cs b/src/Platform/Microsoft.Testing.Platform/TestFramework/CloseTestSessionContext.cs
@@ -8,10 +8,18 @@ namespace Microsoft.Testing.Platform.Extensions.TestFramework;
 /// <summary>
 /// Context passed to a test framework adapter when <see cref="ITestFramework.CloseTestSessionAsync(CloseTestSessionContext)"/> is called.
 /// </summary>
-public sealed class CloseTestSessionContext : TestSessionContext
+public sealed class CloseTestSessionContext
 {
     internal CloseTestSessionContext(SessionUid sessionUid, CancellationToken cancellationToken)
-        : base(sessionUid) => CancellationToken = cancellationToken;
+    {
+        SessionUid = sessionUid;
+        CancellationToken = cancellationToken;
+    }
+
+    /// <summary>
+    /// Gets the unique identifier of the test session.
+    /// </summary>
+    public SessionUid SessionUid { get; }
 
     /// <summary>
     /// Gets the cancellation token used to cancel the operation.
diff --git a/src/Platform/Microsoft.Testing.Platform/TestFramework/CreateTestSessionContext.cs b/src/Platform/Microsoft.Testing.Platform/TestFramework/CreateTestSessionContext.cs
@@ -8,10 +8,18 @@ namespace Microsoft.Testing.Platform.Extensions.TestFramework;
 /// <summary>
 /// Context passed to a test framework adapter when <see cref="ITestFramework.CreateTestSessionAsync(CreateTestSessionContext)"/> is called.
 /// </summary>
-public sealed class CreateTestSessionContext : TestSessionContext
+public sealed class CreateTestSessionContext
 {
     internal CreateTestSessionContext(SessionUid sessionUid, CancellationToken cancellationToken)
-        : base(sessionUid) => CancellationToken = cancellationToken;
+    {
+        SessionUid = sessionUid;
+        CancellationToken = cancellationToken;
+    }
+
+    /// <summary>
+    /// Gets the unique identifier of the test session.
+    /// </summary>
+    public SessionUid SessionUid { get; }
 
     /// <summary>
     /// Gets the cancellation token used to cancel the operation.
diff --git a/src/Platform/Microsoft.Testing.Platform/TestHost/TestSessionContext.cs b/src/Platform/Microsoft.Testing.Platform/TestHost/TestSessionContext.cs
