Removing ordered, generic tests, update externals, resuming old tests (…

…#3025)
microsoft · Aug 31, 2021 · 2a4eb19 · 2a4eb19
1 parent dde3ace
commit 2a4eb19
Show file tree

Hide file tree

Showing 15 changed files with 4 additions and 115 deletions.
diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props
@@ -32,7 +32,7 @@
     <JsonNetVersion>9.0.1</JsonNetVersion>
     <MoqVersion>4.8.3</MoqVersion>
 
-    <TestPlatformExternalsVersion>17.0.0-previews-4-31622-033</TestPlatformExternalsVersion>
+    <TestPlatformExternalsVersion>17.0.0-previews-4-31630-230</TestPlatformExternalsVersion>
     <!-- <TestPlatformMSDiaVersion>$(TestPlatformExternalsVersion)</TestPlatformMSDiaVersion> -->
     <TestPlatformMSDiaVersion>17.0.0-previews-3-31515-332</TestPlatformMSDiaVersion>
 

diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1
@@ -14,7 +14,7 @@ function Verify-Nuget-Packages($packageDirectory, $version)
     $expectedNumOfFiles = @{
         "Microsoft.CodeCoverage" = 59;
         "Microsoft.NET.Test.Sdk" = 27;
-        "Microsoft.TestPlatform" = 486;
+        "Microsoft.TestPlatform" = 484;
         "Microsoft.TestPlatform.Build" = 21;
         "Microsoft.TestPlatform.CLI" = 367;
         "Microsoft.TestPlatform.Extensions.TrxLogger" = 35;

diff --git a/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs b/src/Microsoft.TestPlatform.CrossPlatEngine/Constants.cs
@@ -17,8 +17,6 @@ public class Constants
         internal static readonly IList<string> DefaultAdapters = new ReadOnlyCollection<string>(new List<string>
         {
             "executor://CodedWebTestAdapter/v1",
-            "executor://GenericTestAdapter/v1",
-            "executor://OrderedTestAdapter/v1",
             "executor://MSTestAdapter/v1",
             "executor://WebTestAdapter/v1",
             "executor://CppUnitTestExecutor/v1"

diff --git a/src/package/nuspec/Microsoft.TestPlatform.nuspec b/src/package/nuspec/Microsoft.TestPlatform.nuspec
@@ -228,8 +228,6 @@
     <file src="net451\$Runtime$\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.TestPlatform.TestHostRuntimeProvider.dll" />
     <file src="net451\$Runtime$\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\VideoRecorder\Microsoft.VisualStudio.QualityTools.VideoRecorderEngine.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll" />
-    <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Trx.TestLogger.dll" />
     <file src="net451\$Runtime$\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll"	target="tools\net451\Common7\IDE\Extensions\TestPlatform\Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.Html.TestLogger.dll" />

diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj
@@ -82,8 +82,6 @@
 
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.MediaRecorder.Model.dll" />
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestTools.DataCollection.VideoRecorderCollector.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.GenericTestAdapter.dll" />
-      <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.OrderedTestAdapter.dll" />
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.CodedWebTestAdapter.dll" />
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.WebTestAdapter.dll" />
       <AssembliesToSign Include="$(ArtifactsDirectory)Extensions\Microsoft.VisualStudio.TestPlatform.Extensions.TmiAdapter.dll" />

diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs
@@ -11,7 +11,6 @@ public class CUITTest : AcceptanceTestBase
     {
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource]
         public void CUITRunAllTests(RunnerInfo runnerInfo)
         {

diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs
@@ -51,7 +51,6 @@ public void CPPRunAllTestExecutionPlatformx64(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource]
         public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
         {
@@ -76,7 +75,6 @@ public void WebTestRunAllTestsWithRunSettings(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource]
         public void CodedWebTestRunAllTests(RunnerInfo runnerInfo)
         {

diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ListExtensionsTests.cs
@@ -21,10 +21,6 @@ public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
             if (this.IsDesktopRunner())
             {
                 this.StdOutputContains("executor://codedwebtestadapter/v1");
-                this.StdOutputContains("executor://generictestadapter/v1");
-                this.StdOutputContains(".generictest");
-                this.StdOutputContains("executor://orderedtestadapter/v1");
-                this.StdOutputContains(".orderedtest");
                 this.StdOutputContains("executor://mstestadapter/v1");
                 this.StdOutputContains("executor://webtestadapter/v1");
                 this.StdOutputContains(".Webtest");
@@ -33,11 +29,7 @@ public void ListDiscoverersShouldShowInboxDiscoverers(RunnerInfo runnerInfo)
             else
             {
                 // There are no inbox adapters for dotnet core
-                this.StdOutputDoesNotContains("executor://codedwebtestadapter/v1");
-                this.StdOutputDoesNotContains("executor://generictestadapter/v1");
-                this.StdOutputDoesNotContains(".generictest");
-                this.StdOutputDoesNotContains("executor://orderedtestadapter/v1");
-                this.StdOutputDoesNotContains(".orderedtest");
+                this.StdOutputDoesNotContains("executor://codedwebtestadapter/v1");  
                 this.StdOutputDoesNotContains("executor://mstestadapter/v1");
                 this.StdOutputDoesNotContains("executor://webtestadapter/v1");
                 this.StdOutputDoesNotContains(".Webtest");
@@ -55,9 +47,7 @@ public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
 
             if (this.IsDesktopRunner())
             {
-                this.StdOutputContains("executor://CodedWebTestAdapter/v1");
-                this.StdOutputContains("executor://GenericTestAdapter/v1");
-                this.StdOutputContains("executor://OrderedTestAdapter/v1");
+                this.StdOutputContains("executor://CodedWebTestAdapter/v1");               
                 this.StdOutputContains("executor://MSTestAdapter/v1");
                 this.StdOutputContains("executor://WebTestAdapter/v1");
                 this.StdOutputContains("executor://CppUnitTestExecutor/v1");
@@ -67,8 +57,6 @@ public void ListExecutorsShouldShowInboxExecutors(RunnerInfo runnerInfo)
             {
                 // There are no inbox adapters for dotnet core
                 this.StdOutputDoesNotContains("executor://CodedWebTestAdapter/v1");
-                this.StdOutputDoesNotContains("executor://GenericTestAdapter/v1");
-                this.StdOutputDoesNotContains("executor://OrderedTestAdapter/v1");
                 this.StdOutputDoesNotContains("executor://MSTestAdapter/v1");
                 this.StdOutputDoesNotContains("executor://WebTestAdapter/v1");
                 this.StdOutputDoesNotContains("executor://CppUnitTestExecutor/v1");

diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/OrderedTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/OrderedTests.cs
diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs
@@ -313,7 +313,6 @@ public void LegacySettingsWithPlatform(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
         public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
         {
@@ -367,7 +366,6 @@ public void LegacySettingsWithScripts(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
         public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
         {
@@ -405,7 +403,6 @@ public void LegacySettingsWithDeploymentItem(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
         public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
         {
@@ -434,7 +431,6 @@ public void LegacySettingsTestTimeout(RunnerInfo runnerInfo)
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource(inIsolation: true, useCoreRunner: false)]
         public void LegacySettingsAssemblyResolution(RunnerInfo runnerInfo)
         {

diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestPlatformNugetPackageTests.cs
@@ -56,7 +56,6 @@ public void CleanUp()
 
         [TestMethod]
         [TestCategory("Windows-Review")]
-        [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")]
         [NetFullTargetFrameworkDataSource(useCoreRunner: false)]
         [NetCoreTargetFrameworkDataSource(useCoreRunner: false)]
         public void RunMultipleTestAssembliesWithCodeCoverage(RunnerInfo runnerInfo)

diff --git a/test/TestAssets/MstestV1UnitTestProject/MixedTestsDebug.orderedtest b/test/TestAssets/MstestV1UnitTestProject/MixedTestsDebug.orderedtest
diff --git a/test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest b/test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest
diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj
@@ -30,11 +30,6 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <None Update="MixedTests.orderedtest">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-  </ItemGroup>
   <ItemGroup>
     <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
   </ItemGroup>

diff --git a/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs b/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs
@@ -17,7 +17,6 @@ public class UnitTest1
         /// <summary>
         /// The passing test.
         /// </summary>
-        [Priority(2)]
         [TestMethod]
         public void PassingTest1()
         {
@@ -34,7 +33,6 @@ public void PassingTest2()
         /// The failing test.
         /// </summary>
         [TestCategory("CategoryA")]
-        [Priority(3)]
         [TestMethod]
         public void FailingTest1()
         {