From 25dd4ad514fd4d04b15814422420afc282c2ad0b Mon Sep 17 00:00:00 2001 From: Sanan Yuzbashiyev Date: Tue, 31 Aug 2021 18:18:22 +0200 Subject: [PATCH] Removing ordered, generic tests, update externals, resuming old tests --- scripts/build/TestPlatform.Dependencies.props | 2 +- scripts/verify-nupkgs.ps1 | 2 +- .../Constants.cs | 2 - .../nuspec/Microsoft.TestPlatform.nuspec | 2 - src/package/sign/sign.proj | 2 - .../CUITTest.cs | 1 - .../DifferentTestFrameworkSimpleTests.cs | 2 - .../ListExtensionsTests.cs | 16 +---- .../OrderedTests.cs | 60 ------------------- .../RunsettingsTests.cs | 4 -- .../TestPlatformNugetPackageTests.cs | 1 - .../MixedTestsDebug.orderedtest | 9 --- .../MixedTestsRelease.orderedtest | 9 --- .../MstestV1UnitTestProject.csproj | 5 -- .../MstestV1UnitTestProject/UnitTest1.cs | 2 - 15 files changed, 4 insertions(+), 115 deletions(-) delete mode 100644 test/Microsoft.TestPlatform.AcceptanceTests/OrderedTests.cs delete mode 100644 test/TestAssets/MstestV1UnitTestProject/MixedTestsDebug.orderedtest delete mode 100644 test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest diff --git a/scripts/build/TestPlatform.Dependencies.props b/scripts/build/TestPlatform.Dependencies.props index 6dca0de9e3..cffa3e3157 100644 --- a/scripts/build/TestPlatform.Dependencies.props +++ b/scripts/build/TestPlatform.Dependencies.props @@ -32,7 +32,7 @@ 9.0.1 4.8.3 - 17.0.0-previews-4-31622-033 + 17.0.0-previews-4-31630-230 17.0.0-previews-3-31515-332 diff --git a/scripts/verify-nupkgs.ps1 b/scripts/verify-nupkgs.ps1 index 3b70a67e04..4b887182c3 100644 --- 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 index d4e81aee32..0faf5d7f3f 100644 --- 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 DefaultAdapters = new ReadOnlyCollection(new List { "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 index 068f0b4e48..e001d5a950 100644 --- a/src/package/nuspec/Microsoft.TestPlatform.nuspec +++ b/src/package/nuspec/Microsoft.TestPlatform.nuspec @@ -228,8 +228,6 @@ - - diff --git a/src/package/sign/sign.proj b/src/package/sign/sign.proj index e04b8cf663..6d43420713 100644 --- a/src/package/sign/sign.proj +++ b/src/package/sign/sign.proj @@ -82,8 +82,6 @@ - - diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs b/test/Microsoft.TestPlatform.AcceptanceTests/CUITTest.cs index 5178aae79e..18d5882e26 100644 --- 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 index 6f1ff1332a..1663a00e4b 100644 --- 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 index 1836d23d84..65e64331bb 100644 --- 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 deleted file mode 100644 index bcb6368fac..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/OrderedTests.cs +++ /dev/null @@ -1,60 +0,0 @@ -// 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.TestPlatform.AcceptanceTests -{ - using System; - using System.IO; - - using Microsoft.TestPlatform.TestUtilities; - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class OrderedTests : AcceptanceTestBase - { - /// - /// Ordered Tests created using earlier versions of Visual Studio(i.e. before VS2017) should work fine. - /// - [TestMethod] - [TestCategory("Windows-Review")] - [Ignore("Temporary ignoring, because of incomplete interop work for legacy TP")] - [NetFullTargetFrameworkDataSource(inIsolation: true, inProcess: true)] - public void OlderOrderedTestsShouldWorkFine(RunnerInfo runnerInfo) - { - AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerInfo); - var resultsDir = GetResultsDirectory(); - - if (runnerInfo.RunnerFramework.StartsWith("netcoreapp")) - { - Assert.Inconclusive(" Ordered tests are not supported with .Netcore runner."); - return; - } - - var orderedTestFileAbsolutePath = Path.Combine(this.testEnvironment.TestAssetsPath, "MstestV1UnitTestProject"); - - if (IntegrationTestEnvironment.BuildConfiguration.Equals("release", StringComparison.OrdinalIgnoreCase)) - { - orderedTestFileAbsolutePath = Path.Combine(orderedTestFileAbsolutePath, "MixedTestsRelease.orderedtest"); - } - else - { - orderedTestFileAbsolutePath = Path.Combine(orderedTestFileAbsolutePath, "MixedTestsDebug.orderedtest"); - } - - var arguments = PrepareArguments( - orderedTestFileAbsolutePath, - this.GetTestAdapterPath(), - string.Empty, this.FrameworkArgValue, - runnerInfo.InIsolationValue, resultsDirectory: resultsDir); - - this.InvokeVsTest(arguments); - this.ValidatePassedTests("PassingTest1"); - this.ValidatePassedTests("PassingTest2"); - this.ValidateFailedTests("FailingTest1"); - this.ValidateSkippedTests("FailingTest2"); - // Parent test result should fail as inner results contain failing test. - this.ValidateSummaryStatus(2, 1, 1); - TryRemoveDirectory(resultsDir); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs index 3baef74b2a..93ce21ae97 100644 --- 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 index 80e715b56e..1df78a08d0 100644 --- 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 deleted file mode 100644 index 7b0e4cd1fc..0000000000 --- a/test/TestAssets/MstestV1UnitTestProject/MixedTestsDebug.orderedtest +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest b/test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest deleted file mode 100644 index af00ec2423..0000000000 --- a/test/TestAssets/MstestV1UnitTestProject/MixedTestsRelease.orderedtest +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj index 8c7c96fa7a..9b6ad1e304 100644 --- a/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj +++ b/test/TestAssets/MstestV1UnitTestProject/MstestV1UnitTestProject.csproj @@ -30,11 +30,6 @@ PreserveNewest - - - Always - - diff --git a/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs b/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs index 96167b68ea..877ea916b3 100644 --- a/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs +++ b/test/TestAssets/MstestV1UnitTestProject/UnitTest1.cs @@ -17,7 +17,6 @@ public class UnitTest1 /// /// The passing test. /// - [Priority(2)] [TestMethod] public void PassingTest1() { @@ -34,7 +33,6 @@ public void PassingTest2() /// The failing test. /// [TestCategory("CategoryA")] - [Priority(3)] [TestMethod] public void FailingTest1() {