Fix test

Author: Evangelink

test/E2ETests/Automation.CLI/CLITestBase.common.cs

@@ -79,7 +79,7 @@ protected string GetTestAdapterPath()
     /// <param name="settingsXml">RunSettings provided for discovery/execution</param>
     /// <param name="testAdapterPath">Full path to TestAdapter.</param>
     /// <returns>RunSettingXml as string</returns>
-    protected string GetRunSettingXml(string settingsXml, string testAdapterPath)
+    protected string GetRunSettingXml(string settingsXml, string testAdapterPath, string targetFramework = "")
     {
         if (string.IsNullOrEmpty(settingsXml))
         {
@@ -93,7 +93,7 @@ protected string GetRunSettingXml(string settingsXml, string testAdapterPath)
         }
 
         XmlElement root = doc.DocumentElement;
-        RunConfiguration runConfiguration = new(testAdapterPath);
+        RunConfiguration runConfiguration = new(Path.Combine(testAdapterPath, targetFramework));
         XmlElement runConfigElement = runConfiguration.ToXml();
         if (root[runConfiguration.SettingsName] == null)
         {

test/E2ETests/Automation.CLI/CLITestBase.e2e.cs

@@ -22,7 +22,6 @@ public partial class CLITestBase : TestContainer
 
     public CLITestBase()
     {
-        Environment.CurrentDirectory = @"C:\Users\enjieid\source\repos\testfx";
         s_vsTestConsoleWrapper = new VsTestConsoleWrapper(GetConsoleRunnerPath());
         s_vsTestConsoleWrapper.StartSession();
     }
@@ -48,12 +47,12 @@ public void InvokeVsTestForDiscovery(string[] sources, string runSettings = "")
     /// <param name="sources">List of test assemblies.</param>
     /// <param name="runSettings">Run settings for execution.</param>
     /// <param name="testCaseFilter">Test Case filter for execution.</param>
-    public void InvokeVsTestForExecution(string[] sources, string runSettings = "", string testCaseFilter = null)
+    public void InvokeVsTestForExecution(string[] sources, string runSettings = "", string testCaseFilter = null, string targetFramework = "")
     {
         ExpandTestSourcePaths(sources);
 
         _runEventsHandler = new RunEventsHandler();
-        string runSettingXml = GetRunSettingXml(runSettings, GetTestAdapterPath());
+        string runSettingXml = GetRunSettingXml(runSettings, GetTestAdapterPath(), targetFramework);
 
         s_vsTestConsoleWrapper.RunTests(sources, runSettingXml, new TestPlatformOptions { TestCaseFilter = testCaseFilter }, _runEventsHandler);
         if (_runEventsHandler.Errors.Any())

test/E2ETests/Smoke.E2E.Tests/SuiteLifeCycleTests.cs

@@ -1,11 +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 System;
-using System.Collections.Generic;
 using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 using Microsoft.MSTestV2.CLIAutomation;
 
@@ -16,12 +12,12 @@ public class SuiteLifeCycleTests : CLITestBase
 
     public void ValidateTestRunLifecycle_net6()
     {
-        ValidateTestRunLifecycle("net462");
+        ValidateTestRunLifecycle("net6.0");
     }
 
     private void ValidateTestRunLifecycle(string targetFramework)
     {
-        InvokeVsTestForExecution(new[] { targetFramework + "\\" + Assembly });
+        InvokeVsTestForExecution(new[] { targetFramework + "\\" + Assembly }, targetFramework: targetFramework);
         Verify(_runEventsHandler.PassedTests.Count == 1);
 
         var testMethod = _runEventsHandler.PassedTests.Single();
@@ -30,28 +26,28 @@ private void ValidateTestRunLifecycle(string targetFramework)
         {
             Verify(testMethod.Messages.Single().Text.Contains(
                 """
-            ClassInitialize was called
-            Ctor was called
-            TestInitialize was called
-            TestMethod was called
-            TestCleanup was called
-            Dispose was called
-            ClassCleanup was called
-            """));
+                ClassInitialize was called
+                Ctor was called
+                TestInitialize was called
+                TestMethod was called
+                TestCleanup was called
+                Dispose was called
+                ClassCleanup was called
+                """));
         }
         else
         {
             Verify(testMethod.Messages.Single().Text.Contains(
                 """
-            ClassInitialize was called
-            Ctor was called
-            TestInitialize was called
-            TestMethod was called
-            TestCleanup was called
-            DisposeAsync was called
-            Dispose was called
-            ClassCleanup was called
-            """));
+                ClassInitialize was called
+                Ctor was called
+                TestInitialize was called
+                TestMethod was called
+                TestCleanup was called
+                DisposeAsync was called
+                Dispose was called
+                ClassCleanup was called
+                """));
         }
     }
 }

test/E2ETests/TestAssets/SuiteLifeCycleTestProject/SuiteLifeCycleTestClass.cs

@@ -3,8 +3,9 @@
 
 using System;
 using System.Diagnostics;
-using System.Threading;
-using System.Threading.Tasks;
+#if NET6_0_OR_GREATER
+using System.Threading.Tasks; 
+#endif
 
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -41,8 +42,6 @@ public void TestInitialize()
     [TestMethod]
     public void TestMethod()
     {
-        Debugger.Launch();
-        Debugger.Break();
         TestContext.WriteLine("TestMethod was called");
     }
 
@@ -62,13 +61,12 @@ public ValueTask DisposeAsync()
     {
         TestContext.WriteLine("DisposeAsync was called");
         return ValueTask.CompletedTask;
-
     }
 #endif
 
     [ClassCleanup]
-    public void ClassCleanup()
+    public static void ClassCleanup()
     {
-        TestContext.WriteLine("ClassCleanup was called");
+        s_testContext.WriteLine("ClassCleanup was called");
     }
 }

test/E2ETests/TestAssets/SuiteLifeCycleTestProject/SuiteLifeCycleTestProject.csproj

@@ -11,8 +11,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework.Extensions\TestFramework.Extensions.csproj" />
-    <ProjectReference Include="$(RepoRoot)\src\TestFramework\TestFramework\TestFramework.csproj" />
+    <ProjectReference Include="$(RepoRoot)src\Adapter\MSTest.TestAdapter\MSTest.TestAdapter.csproj" />
   </ItemGroup>
 
 </Project>