Fix

Author: Evangelink

src/Adapter/MSTest.PlatformServices/Execution/TestMethodRunner.cs

@@ -1,7 +1,6 @@
 // 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.VisualStudio.TestPlatform.MSTestAdapter;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Internal;
 

src/Adapter/MSTest.PlatformServices/Execution/UnitTestRunner.cs

@@ -3,12 +3,6 @@
 
 using System.Security;
 
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Extensions;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Interface;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;

src/Adapter/MSTest.PlatformServices/Extensions/MethodInfoExtensions.cs

@@ -1,9 +1,6 @@
 // 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.VisualStudio.TestPlatform.MSTest.TestAdapter.Helpers;
-using Microsoft.VisualStudio.TestPlatform.MSTest.TestAdapter.ObjectModel;
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter.PlatformServices.Extensions;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
 using MSTest.PlatformServices.Helpers;

src/Adapter/MSTest.PlatformServices/Services/SettingsProvider.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 #if !WINDOWS_UWP
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
+using MSTest.PlatformServices.Utilities;
 #endif
 
 using MSTest.PlatformServices.Interface;

src/Adapter/MSTest.PlatformServices/Utilities/ApplicationStateGuard.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.
 
-namespace Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
+namespace MSTest.PlatformServices.Utilities;
 
 internal static class ApplicationStateGuard
 {

src/Adapter/MSTest.PlatformServices/Utilities/DeploymentUtilityBase.cs

@@ -3,7 +3,6 @@
 
 #if !WINDOWS_UWP
 
-using Microsoft.VisualStudio.TestPlatform.MSTestAdapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Adapter;
 using Microsoft.VisualStudio.TestPlatform.ObjectModel.Logging;

test/UnitTests/MSTest.PlatformServices.UnitTests/Execution/TestAssemblyInfoTests.cs

@@ -145,10 +145,10 @@ public void RunAssemblyInitializeShouldThrowTestFailedExceptionOnAssertionFailur
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Assembly Initialization method MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException: Assert.Fail failed. Test failure. Aborting test execution.");
+            == "Assembly Initialization method MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException: Assert.Fail failed. Test failure. Aborting test execution.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.Contains(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionOnAssertionFailure>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionOnAssertionFailure>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(AssertFailedException));
     }
@@ -162,10 +162,10 @@ public void RunAssemblyInitializeShouldThrowTestFailedExceptionWithInconclusiveO
         Verify(exception.Outcome == UTF.UnitTestOutcome.Inconclusive);
         Verify(
             exception.Message
-            == "Assembly Initialization method MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException: Assert.Inconclusive failed. Test Inconclusive. Aborting test execution.");
+            == "Assembly Initialization method MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException: Assert.Inconclusive failed. Test Inconclusive. Aborting test execution.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.Contains(
-            "   at MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithInconclusiveOnAssertInconclusive>", StringComparison.Ordinal));
+            "   at MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithInconclusiveOnAssertInconclusive>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(AssertInconclusiveException));
     }
@@ -180,10 +180,10 @@ public void RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExce
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Assembly Initialization method MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.ArgumentException: Some actualErrorMessage message. Aborting test execution.");
+            == "Assembly Initialization method MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.ArgumentException: Some actualErrorMessage message. Aborting test execution.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.StartsWith(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests.<>c.<RunAssemblyInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(ArgumentException));
         Verify(exception.InnerException.InnerException!.GetType() == typeof(InvalidOperationException));
@@ -203,10 +203,10 @@ public void RunAssemblyInitializeShouldThrowTheInnerMostExceptionWhenThereAreMul
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Assembly Initialization method MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.InvalidOperationException: I fail.. Aborting test execution.");
+            == "Assembly Initialization method MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests+DummyTestClass.AssemblyInitializeMethod threw exception. System.InvalidOperationException: I fail.. Aborting test execution.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.StartsWith(
-            "   at MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal));
+            "   at MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(InvalidOperationException));
     }
@@ -304,7 +304,7 @@ public void RunAssemblyCleanupShouldThrowTheInnerMostExceptionWhenThereAreMultip
         string actualErrorMessage = _testAssemblyInfo.ExecuteAssemblyCleanup(GetTestContext())!.Message;
 
         Verify(actualErrorMessage.StartsWith("Assembly Cleanup method DummyTestClass.AssemblyCleanupMethod failed. Error Message: System.InvalidOperationException: I fail.. StackTrace:", StringComparison.Ordinal));
-        Verify(actualErrorMessage.Contains("at MSTest.TestAdapter.UnitTests.Execution.TestAssemblyInfoTests.FailingStaticHelper..cctor()"));
+        Verify(actualErrorMessage.Contains("at MSTest.PlatformServices.Execution.UnitTests.TestAssemblyInfoTests.FailingStaticHelper..cctor()"));
     }
 
     private static TestContextImplementation GetTestContext()

test/UnitTests/MSTest.PlatformServices.UnitTests/Execution/TestClassInfoTests.cs

@@ -335,10 +335,10 @@ public void RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMeth
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Class Initialization method MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.InitBaseClassMethod threw exception. System.ArgumentException: Some exception message.");
+            == "Class Initialization method MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests+DummyTestClass.InitBaseClassMethod threw exception. System.ArgumentException: Some exception message.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.StartsWith(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMethodWithNonAssertExceptions>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionOnBaseInitializeMethodWithNonAssertExceptions>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(ArgumentException));
         Verify(exception.InnerException.InnerException!.GetType() == typeof(InvalidOperationException));
@@ -355,10 +355,10 @@ public void RunClassInitializeShouldThrowTestFailedExceptionOnAssertionFailure()
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Class Initialization method MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException: Assert.Fail failed. Test failure.");
+            == "Class Initialization method MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertFailedException: Assert.Fail failed. Test failure.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.Contains(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionOnAssertionFailure>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionOnAssertionFailure>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(AssertFailedException));
     }
@@ -374,10 +374,10 @@ public void RunClassInitializeShouldThrowTestFailedExceptionWithInconclusiveOnAs
         Verify(exception.Outcome == UTF.UnitTestOutcome.Inconclusive);
         Verify(
             exception.Message
-            == "Class Initialization method MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException: Assert.Inconclusive failed. Test Inconclusive.");
+            == "Class Initialization method MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. Microsoft.VisualStudio.TestTools.UnitTesting.AssertInconclusiveException: Assert.Inconclusive failed. Test Inconclusive.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.Contains(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionWithInconclusiveOnAssertInconclusive>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionWithInconclusiveOnAssertInconclusive>", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(AssertInconclusiveException));
     }
@@ -393,10 +393,10 @@ public void RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExcepti
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Class Initialization method MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.ArgumentException: Argument exception.");
+            == "Class Initialization method MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.ArgumentException: Argument exception.");
 #if DEBUG
         Verify(exception.StackTraceInformation!.ErrorStackTrace.StartsWith(
-    "   at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
+    "   at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.<>c.<RunClassInitializeShouldThrowTestFailedExceptionWithNonAssertExceptions>", StringComparison.Ordinal));
 #endif
     }
 
@@ -435,11 +435,11 @@ public void RunClassInitializeShouldThrowTheInnerMostExceptionWhenThereAreMultip
         Verify(exception.Outcome == UTF.UnitTestOutcome.Failed);
         Verify(
             exception.Message
-            == "Class Initialization method MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.InvalidOperationException: I fail..");
+            == "Class Initialization method MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests+DummyTestClass.ClassInitializeMethod threw exception. System.InvalidOperationException: I fail..");
 #if DEBUG
         Verify(
             exception.StackTraceInformation!.ErrorStackTrace.StartsWith(
-            "   at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal));
+            "   at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.FailingStaticHelper..cctor()", StringComparison.Ordinal));
 #endif
         Verify(exception.InnerException!.GetType() == typeof(InvalidOperationException));
     }
@@ -612,7 +612,7 @@ public void RunClassCleanupShouldThrowTheInnerMostExceptionWhenThereAreMultipleN
 
         Verify(classCleanupException is not null);
         Verify(classCleanupException.Message.StartsWith("Class Cleanup method DummyTestClass.ClassCleanupMethod failed. Error Message: System.InvalidOperationException: I fail..", StringComparison.Ordinal));
-        Verify(classCleanupException.Message.Contains("at MSTest.TestAdapter.UnitTests.Execution.TestClassInfoTests.FailingStaticHelper..cctor()"));
+        Verify(classCleanupException.Message.Contains("at MSTest.PlatformServices.Execution.UnitTests.TestClassInfoTests.FailingStaticHelper..cctor()"));
     }
 
     #endregion