diff --git a/TestPlatform.sln b/TestPlatform.sln index e871e4f5e9..76ab1ea65e 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.26008.9 +VisualStudioVersion = 15.0.26009.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{ED0C35EB-7F31-4841-A24F-8EB708FFA959}" EndProject @@ -632,8 +632,8 @@ Global {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x64.Build.0 = Release|x64 {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.ActiveCfg = Release|x86 {57B182B8-9014-4C6D-B966-B464DE3127D5}.Release|x86.Build.0 = Release|x86 - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.ActiveCfg = Release|Any CPU - {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.Build.0 = Release|Any CPU + {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|Any CPU.Build.0 = Debug|Any CPU {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x64.ActiveCfg = Release|Any CPU {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x64.Build.0 = Release|Any CPU {D62D754C-8F0A-406F-8BA7-E96C6FFA7C7C}.Debug|x86.ActiveCfg = Release|Any CPU diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs index afb5311fde..ef3837f583 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/AcceptanceTestBase.cs @@ -9,48 +9,26 @@ namespace Microsoft.TestPlatform.AcceptanceTests public class AcceptanceTestBase : IntegrationTestBase { - private const string DesktopRunnerFramework = "net46"; - private const string CoreRunnerFramework = "netcoreapp1.0"; - private const string DesktopTargetFramework = "net46"; - private const string CoreTargetFramework = "netcoreapp1.0"; + public const string DesktopRunnerFramework = "net46"; + public const string CoreRunnerFramework = "netcoreapp1.0"; + public const string DesktopTargetFramework = "net46"; + public const string CoreTargetFramework = "netcoreapp1.0"; + public const string Core11TargetFramework = "netcoreapp1.1"; - private const string CoreFrameworkArgValue = ".NETCoreApp,Version=v1.0"; - private const string DesktopFrameworkArgValue = ".NETFramework,Version=v4.6"; - private const string DesktopRunnerTargetRuntime = "win7-x64"; - private const string CoreRunnerTargetRuntime = ""; + public const string CoreFrameworkArgValue = ".NETCoreApp,Version=v1.0"; + public const string Core11FrameworkArgValue = ".NETCoreApp,Version=v1.1"; + public const string DesktopFrameworkArgValue = ".NETFramework,Version=v4.6"; + public const string DesktopRunnerTargetRuntime = "win7-x64"; + public const string CoreRunnerTargetRuntime = ""; protected string FrameworkArgValue => DeriveFrameworkArgValue(this.testEnvironment); - protected static void SetupRunnerCoreTargetDesktopEnvironment( - IntegrationTestEnvironment testEnvironment) + protected static void SetTestEnvironment(IntegrationTestEnvironment testEnvironment, + string runnerFramework, string targetFramework, string targetRuntime) { - testEnvironment.RunnerFramework = CoreRunnerFramework; - testEnvironment.TargetFramework = DesktopTargetFramework; - testEnvironment.TargetRuntime = CoreRunnerTargetRuntime; - } - - protected static void SetupRunnerDesktopTargetDesktopEnvironment( - IntegrationTestEnvironment testEnvironment) - { - testEnvironment.RunnerFramework = DesktopRunnerFramework; - testEnvironment.TargetFramework = DesktopTargetFramework; - testEnvironment.TargetRuntime = DesktopRunnerTargetRuntime; - } - - protected static void SetupRunnerCoreTargetCoreEnvironment( - IntegrationTestEnvironment testEnvironment) - { - testEnvironment.RunnerFramework = CoreRunnerFramework; - testEnvironment.TargetFramework = CoreTargetFramework; - testEnvironment.TargetRuntime = CoreRunnerTargetRuntime; - } - - protected static void SetupRunnerDesktopTargetCoreEnvironment( - IntegrationTestEnvironment testEnvironment) - { - testEnvironment.RunnerFramework = DesktopRunnerFramework; - testEnvironment.TargetFramework = CoreTargetFramework; - testEnvironment.TargetRuntime = DesktopRunnerTargetRuntime; + testEnvironment.RunnerFramework = runnerFramework; + testEnvironment.TargetFramework = targetFramework; + testEnvironment.TargetRuntime = targetRuntime; } protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testEnvironment) @@ -60,6 +38,10 @@ protected static string DeriveFrameworkArgValue(IntegrationTestEnvironment testE { framworkArgValue = CoreFrameworkArgValue; } + else if (string.Equals(testEnvironment.TargetFramework, Core11TargetFramework, StringComparison.Ordinal)) + { + framworkArgValue = Core11FrameworkArgValue; + } else if (string.Equals(testEnvironment.TargetFramework, DesktopTargetFramework, StringComparison.Ordinal)) { framworkArgValue = DesktopFrameworkArgValue; @@ -80,7 +62,7 @@ protected bool IsDesktopRunner() protected string GetTargetFramworkForRunsettings() { - string targetFramework = string.Empty; + var targetFramework = string.Empty; if(this.testEnvironment.TargetFramework == DesktopTargetFramework) { targetFramework = "Framework45"; diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs index 4bb82946f2..621e67bed3 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/AppDomainTests.cs @@ -8,11 +8,15 @@ namespace Microsoft.TestPlatform.AcceptanceTests using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class AppDomainTests : AcceptanceTestBase + [TestClass] + public class AppDomainTests : AcceptanceTestBase { - [TestMethod] - public virtual void RunTestExecutionWithDisableAppDomain() + [CustomDataTestMethod] + [NET46TargetFramework] + public void RunTestExecutionWithDisableAppDomain(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var testAppDomainDetailFileName = Path.Combine(Path.GetTempPath(), "appdomain_test.txt"); var dataCollectorAppDomainDetailFileName = Path.Combine(Path.GetTempPath(), "appdomain_datacollector.txt"); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs index 296c878e4c..d1f971e18a 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DifferentTestFrameworkSimpleTests.cs @@ -7,11 +7,15 @@ namespace Microsoft.TestPlatform.AcceptanceTests using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class DifferentTestFrameworkSimpleTests : AcceptanceTestBase + [TestClass] + public class DifferentTestFrameworkSimpleTests : AcceptanceTestBase { - [TestMethod] - public virtual void ChutzpahRunAllTestExecution() + [CustomDataTestMethod] + [NET46TargetFramework] + public void ChutzpahRunAllTestExecution(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var testJSFileAbsolutePath = Path.Combine(this.testEnvironment.TestAssetsPath, "test.js"); var arguments = PrepareArguments( testJSFileAbsolutePath, @@ -23,9 +27,12 @@ public virtual void ChutzpahRunAllTestExecution() } [Ignore] - [TestMethod] - public virtual void CPPRunAllTestExecution() + [CustomDataTestMethod] + [NET46TargetFramework] + public void CPPRunAllTestExecution(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var assemblyRelativePath = @"microsoft.testplatform.testasset.nativecpp\1.0.0\contentFiles\any\any\Microsoft.TestPlatform.TestAsset.NativeCPP.dll"; var assemblyAbsolutePath = Path.Combine(this.testEnvironment.PackageDirectory, assemblyRelativePath); @@ -38,9 +45,12 @@ public virtual void CPPRunAllTestExecution() this.ValidateSummaryStatus(1, 0, 0); } - [TestMethod] - public virtual void NUnitRunAllTestExecution() + [CustomDataTestMethod] + [NET46TargetFramework] + public void NUnitRunAllTestExecution(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetAssetFullPath("NUTestProject.dll"), this.GetTestAdapterPath(UnitTestFramework.NUnit), @@ -50,9 +60,12 @@ public virtual void NUnitRunAllTestExecution() this.ValidateSummaryStatus(1, 1, 0); } - [TestMethod] - public void XUnitRunAllTestExecution() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void XUnitRunAllTestExecution(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); var arguments = PrepareArguments( this.GetAssetFullPath("XUTestProject.dll"), this.GetTestAdapterPath(UnitTestFramework.XUnit), diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs index f7becd31cf..3096dd662b 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/DiscoveryTests.cs @@ -5,11 +5,16 @@ namespace Microsoft.TestPlatform.AcceptanceTests { using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class DiscoveryTests : AcceptanceTestBase + [TestClass] + public class DiscoveryTests : AcceptanceTestBase { - [TestMethod] - public void DiscoverAllTests() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void DiscoverAllTests(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + this.InvokeVsTestForDiscovery(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue); var listOfTests = new string[] { "SampleUnitTestProject.UnitTest1.PassingTest", "SampleUnitTestProject.UnitTest1.FailingTest", "SampleUnitTestProject.UnitTest1.SkippingTest" }; this.ValidateDiscoveredTests(listOfTests); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs index 8da22f7a67..2bef45604e 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs @@ -9,20 +9,29 @@ namespace Microsoft.TestPlatform.AcceptanceTests using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class ExecutionTests : AcceptanceTestBase + [TestClass] + public class ExecutionTests : AcceptanceTestBase { - [TestMethod] - public void RunMultipleTestAssemblies() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunMultipleTestAssemblies(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); this.InvokeVsTestForExecution(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue); this.ValidateSummaryStatus(2, 2, 2); } - [TestMethod] - public void RunMultipleTestAssembliesInParallel() + [Ignore] + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunMultipleTestAssembliesInParallel(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); var assemblyPaths = this.BuildMultipleAssemblyPath("SimpleTestProject.dll", "SimpleTestProject2.dll").Trim('\"'); var arguments = PrepareArguments(assemblyPaths, this.GetTestAdapterPath(), string.Empty, this.FrameworkArgValue); diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CustomDataTestMethodAttribute.cs b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CustomDataTestMethodAttribute.cs new file mode 100644 index 0000000000..512faadb77 --- /dev/null +++ b/test/Microsoft.TestPlatform.AcceptanceTests/Extension/CustomDataTestMethodAttribute.cs @@ -0,0 +1,124 @@ +// 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.Collections.Generic; + using System.Globalization; + using System.Text; + + using Microsoft.VisualStudio.TestTools.UnitTesting; + + /// + /// The custom data test method attribute. + /// + public class CustomDataTestMethodAttribute : TestMethodAttribute + { + /// + /// Find all data rows and execute. + /// + /// + /// The test Method. + /// + /// + /// The . + /// + public override TestResult[] Execute(ITestMethod testMethod) + { + List dataRows = new List(); + + var net46Rows = testMethod.GetAttributes(false); + if (net46Rows != null && net46Rows.Length > 0 && net46Rows[0].DataRows.Count > 0) + { + dataRows.AddRange(net46Rows[0].DataRows); + } + + var netcoreappRows = testMethod.GetAttributes(false); + if (netcoreappRows != null && netcoreappRows.Length > 0 && netcoreappRows[0].DataRows.Count > 0) + { + dataRows.AddRange(netcoreappRows[0].DataRows); + } + + if (dataRows.Count == 0) + { + return new TestResult[] { new TestResult() { Outcome = UnitTestOutcome.Failed, TestFailureException = new Exception(FrameworkMessages.NoDataRow) } }; + } + + return RunDataDrivenTest(testMethod, dataRows.ToArray()); + } + + /// + /// Run data driven test method. + /// + /// Test method to execute. + /// Data Row. + /// Results of execution. + internal static TestResult[] RunDataDrivenTest(ITestMethod testMethod, DataRowAttribute[] dataRows) + { + List results = new List(); + + foreach (var dataRow in dataRows) + { + TestResult result = testMethod.Invoke(dataRow.Data); + + if (!string.IsNullOrEmpty(dataRow.DisplayName)) + { + result.DisplayName = dataRow.DisplayName; + } + else + { + result.DisplayName = string.Format(CultureInfo.CurrentCulture, FrameworkMessages.DataDrivenResultDisplayName, testMethod.TestMethodName, string.Join(",", dataRow.Data)); + } + + results.Add(result); + } + + return results.ToArray(); + } + } + + /// + /// The attribute defining runner framework, target framework and target runtime for net46. + /// + public class NET46TargetFramework : Attribute + { + /// + /// Initializes a new instance of the class. + /// + public NET46TargetFramework() + { + this.DataRows = new List(2); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.CoreRunnerFramework, AcceptanceTestBase.DesktopTargetFramework, AcceptanceTestBase.CoreRunnerTargetRuntime)); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.DesktopRunnerFramework, AcceptanceTestBase.DesktopTargetFramework, AcceptanceTestBase.DesktopRunnerTargetRuntime)); + } + + /// + /// Gets or sets the data rows. + /// + public List DataRows { get; set; } + } + + /// + /// The attribute defining runner framework, target framework and target runtime for netcoreapp1.* + /// + public class NETCORETargetFramework : Attribute + { + /// + /// Initializes a new instance of the class. + /// + public NETCORETargetFramework() + { + this.DataRows = new List(4); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.CoreRunnerFramework, AcceptanceTestBase.CoreTargetFramework, AcceptanceTestBase.CoreRunnerTargetRuntime)); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.DesktopRunnerFramework, AcceptanceTestBase.CoreTargetFramework, AcceptanceTestBase.DesktopRunnerTargetRuntime)); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.CoreRunnerFramework, AcceptanceTestBase.Core11TargetFramework, AcceptanceTestBase.CoreRunnerTargetRuntime)); + this.DataRows.Add(new DataRowAttribute(AcceptanceTestBase.DesktopRunnerFramework, AcceptanceTestBase.Core11TargetFramework, AcceptanceTestBase.DesktopRunnerTargetRuntime)); + } + + /// + /// Gets or sets the data rows. + /// + public List DataRows { get; set; } + } +} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs index ad28f7c5c5..7aa352e932 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/PlatformTests.cs @@ -9,14 +9,19 @@ namespace Microsoft.TestPlatform.AcceptanceTests using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class PlatformTests : AcceptanceTestBase + [TestClass] + public class PlatformTests : AcceptanceTestBase { /// /// The run test execution with platform x64. /// - [TestMethod] - public void RunTestExecutionWithPlatformx64() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunTestExecutionWithPlatformx64(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var platformArg = " /Platform:x64"; string testhostProcessName = string.Empty; int expectedNumOfProcessCreated = 0; @@ -29,9 +34,13 @@ public void RunTestExecutionWithPlatformx64() /// /// The run test execution with platform x86. /// - [TestMethod] - public void RunTestExecutionWithPlatformx86() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunTestExecutionWithPlatformx86(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var platformArg = " /Platform:x86"; string testhostProcessName = string.Empty; int expectedNumOfProcessCreated = 0; diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/AppDomainTests.cs deleted file mode 100644 index 72dca8f188..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/AppDomainTests.cs +++ /dev/null @@ -1,25 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class AppDomainTests : AcceptanceTests.AppDomainTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - - // Disable app domain doesn't support in dotnet core - [Ignore] - [TestMethod] - public override void RunTestExecutionWithDisableAppDomain() - { - - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DifferentTestFrameworkSimpleTests.cs deleted file mode 100644 index 247e8d7f38..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DifferentTestFrameworkSimpleTests.cs +++ /dev/null @@ -1,41 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DifferentTestFrameworkSimpleTests : AcceptanceTests.DifferentTestFrameworkSimpleTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void ChutzpahRunAllTestExecution() - { - - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void CPPRunAllTestExecution() - { - - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void NUnitRunAllTestExecution() - { - - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DiscoveryTests.cs deleted file mode 100644 index c02a40b5ec..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/DiscoveryTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DiscoveryTests : AcceptanceTests.DiscoveryTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/ExecutionTests.cs deleted file mode 100644 index 1c66b4311b..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/ExecutionTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class ExecutionTests : AcceptanceTests.ExecutionTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - } -} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/PlatformTests.cs deleted file mode 100644 index bea9b6c38c..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/PlatformTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class PlatformTests : AcceptanceTests.PlatformTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/RunsettingsTests.cs deleted file mode 100644 index b5b3b32926..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/RunsettingsTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class RunsettingsTests : AcceptanceTests.RunsettingsTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/TestCaseFilterTests.cs deleted file mode 100644 index 42cb62710c..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetCore/TestCaseFilterTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class TestCaseFilterTests : AcceptanceTests.TestCaseFilterTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs deleted file mode 100644 index 060a789b49..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/AppDomainTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class AppDomainTests : AcceptanceTests.AppDomainTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs deleted file mode 100644 index 8f3d27a468..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DifferentTestFrameworkSimpleTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DifferentTestFrameworkSimpleTests : AcceptanceTests.DifferentTestFrameworkSimpleTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs deleted file mode 100644 index 3307d240a0..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/DiscoveryTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DiscoveryTests : AcceptanceTests.DiscoveryTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs deleted file mode 100644 index f103a7fff0..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/ExecutionTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class ExecutionTests : AcceptanceTests.ExecutionTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs deleted file mode 100644 index 99228fb6f7..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/PlatformTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class PlatformTests : AcceptanceTests.PlatformTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs deleted file mode 100644 index 9cc564494a..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/RunsettingsTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class RunsettingsTests : AcceptanceTests.RunsettingsTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs deleted file mode 100644 index 0adcb01f37..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerCoreTargetDesktop/TestCaseFilterTests.cs +++ /dev/null @@ -1,17 +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.RunnerCoreTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class TestCaseFilterTests : AcceptanceTests.TestCaseFilterTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerCoreTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/AppDomainTests.cs deleted file mode 100644 index 1a3ec95f91..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/AppDomainTests.cs +++ /dev/null @@ -1,25 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class AppDomainTests : AcceptanceTests.AppDomainTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - - // Disable app domain doesn't support in dotnet core - [Ignore] - [TestMethod] - public override void RunTestExecutionWithDisableAppDomain() - { - - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DifferentTestFrameworkSimpleTests.cs deleted file mode 100644 index 75aab9542c..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DifferentTestFrameworkSimpleTests.cs +++ /dev/null @@ -1,41 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DifferentTestFrameworkSimpleTests : AcceptanceTests.DifferentTestFrameworkSimpleTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void ChutzpahRunAllTestExecution() - { - - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void CPPRunAllTestExecution() - { - - } - - // Not supported in dotnet core - [Ignore] - [TestMethod] - public override void NUnitRunAllTestExecution() - { - - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DiscoveryTests.cs deleted file mode 100644 index b749ba0f03..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/DiscoveryTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DiscoveryTests : AcceptanceTests.DiscoveryTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/ExecutionTests.cs deleted file mode 100644 index b0a567c570..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/ExecutionTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class ExecutionTests : AcceptanceTests.ExecutionTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - } -} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/PlatformTests.cs deleted file mode 100644 index c93aee1286..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/PlatformTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class PlatformTests : AcceptanceTests.PlatformTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/RunsettingsTests.cs deleted file mode 100644 index cfa72c42a2..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/RunsettingsTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class RunsettingsTests : AcceptanceTests.RunsettingsTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/TestCaseFilterTests.cs deleted file mode 100644 index 71dafc217f..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetCore/TestCaseFilterTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetCore -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class TestCaseFilterTests : AcceptanceTests.TestCaseFilterTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetCoreEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs deleted file mode 100644 index 2eabc67f36..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/AppDomainTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class AppDomainTests : AcceptanceTests.AppDomainTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs deleted file mode 100644 index 5ffcd38dc7..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DifferentTestFrameworkSimpleTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DifferentTestFrameworkSimpleTests : AcceptanceTests.DifferentTestFrameworkSimpleTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs deleted file mode 100644 index 96f539f65f..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/DiscoveryTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class DiscoveryTests : AcceptanceTests.DiscoveryTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs deleted file mode 100644 index 463bbbb6c7..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/ExecutionTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class ExecutionTests : AcceptanceTests.ExecutionTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} \ No newline at end of file diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs deleted file mode 100644 index 1f40451b9e..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/PlatformTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class PlatformTests : AcceptanceTests.PlatformTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs deleted file mode 100644 index 7e28c35d31..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/RunsettingsTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class RunsettingsTests : AcceptanceTests.RunsettingsTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs deleted file mode 100644 index 5ac0c36f24..0000000000 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunnerDesktopTargetDesktop/TestCaseFilterTests.cs +++ /dev/null @@ -1,17 +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.RunnerDesktopTargetDesktop -{ - using Microsoft.VisualStudio.TestTools.UnitTesting; - - [TestClass] - public class TestCaseFilterTests : AcceptanceTests.TestCaseFilterTests - { - [TestInitialize] - public void SetupEnvironment() - { - AcceptanceTestBase.SetupRunnerDesktopTargetDesktopEnvironment(this.testEnvironment); - } - } -} diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs index bc5f2bac81..0b5670db0c 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/RunsettingsTests.cs @@ -12,11 +12,16 @@ namespace Microsoft.TestPlatform.AcceptanceTests using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class RunsettingsTests : AcceptanceTestBase + [TestClass] + public class RunsettingsTests : AcceptanceTestBase { - [TestMethod] - public void RunTestExecutionWithRunSettingsWithoutParallelAndPlatformX86() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunTestExecutionWithRunSettingsWithoutParallelAndPlatformX86(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + string testhostProcessName; int expectedProcessCreated; if (this.IsDesktopTargetFramework()) @@ -48,9 +53,14 @@ public void RunTestExecutionWithRunSettingsWithoutParallelAndPlatformX86() this.RunTestWithRunSettings(runConfigurationDictionary, testhostProcessName, expectedProcessCreated); } - [TestMethod] - public void RunTestExecutionWithRunSettingsWithParallelAndPlatformX64() + [Ignore] + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunTestExecutionWithRunSettingsWithParallelAndPlatformX64(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + string testhostProcessName; int expectedProcessCreated = 2; if (this.IsDesktopTargetFramework()) @@ -78,9 +88,13 @@ public void RunTestExecutionWithRunSettingsWithParallelAndPlatformX64() // Known issue https://github.com/Microsoft/vstest/issues/135 [Ignore] - [TestMethod] - public void RunTestExecutionWithTestAdapterPathFromRunSettings() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunTestExecutionWithTestAdapterPathFromRunSettings(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var runConfigurationDictionary = new Dictionary { { "TestAdaptersPaths", this.GetTestAdapterPath() } diff --git a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs index 60d205dba0..964c43c640 100644 --- a/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs +++ b/test/Microsoft.TestPlatform.AcceptanceTests/TestCaseFilterTests.cs @@ -5,11 +5,16 @@ namespace Microsoft.TestPlatform.AcceptanceTests { using Microsoft.VisualStudio.TestTools.UnitTesting; - public abstract class TestCaseFilterTests : AcceptanceTestBase + [TestClass] + public class TestCaseFilterTests : AcceptanceTestBase { - [TestMethod] - public void RunSelectedTestsWithAndOperatorTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithAndOperatorTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -20,9 +25,13 @@ public void RunSelectedTestsWithAndOperatorTrait() this.ValidateSummaryStatus(0, 1, 0); } - [TestMethod] - public void RunSelectedTestsWithCategoryTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithCategoryTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -33,9 +42,13 @@ public void RunSelectedTestsWithCategoryTrait() this.ValidateSummaryStatus(0, 1, 0); } - [TestMethod] - public void RunSelectedTestsWithClassNameTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithClassNameTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -46,9 +59,13 @@ public void RunSelectedTestsWithClassNameTrait() this.ValidateSummaryStatus(1, 1, 1); } - [TestMethod] - public void RunSelectedTestsWithFullyQualifiedNameTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithFullyQualifiedNameTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -61,9 +78,13 @@ public void RunSelectedTestsWithFullyQualifiedNameTrait() this.ValidateSummaryStatus(0, 1, 0); } - [TestMethod] - public void RunSelectedTestsWithNameTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithNameTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -74,9 +95,13 @@ public void RunSelectedTestsWithNameTrait() this.ValidateSummaryStatus(1, 0, 0); } - [TestMethod] - public void RunSelectedTestsWithOrOperatorTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithOrOperatorTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), @@ -87,9 +112,13 @@ public void RunSelectedTestsWithOrOperatorTrait() this.ValidateSummaryStatus(1, 1, 0); } - [TestMethod] - public void RunSelectedTestsWithPriorityTrait() + [CustomDataTestMethod] + [NET46TargetFramework] + [NETCORETargetFramework] + public void RunSelectedTestsWithPriorityTrait(string runnerFramework, string targetFramework, string targetRuntime) { + AcceptanceTestBase.SetTestEnvironment(this.testEnvironment, runnerFramework, targetFramework, targetRuntime); + var arguments = PrepareArguments( this.GetSampleTestAssembly(), this.GetTestAdapterPath(), diff --git a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj index 76c8bf770e..2384dadc14 100644 --- a/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj +++ b/test/TestAssets/SimpleTestProject/SimpleTestProject.csproj @@ -1,10 +1,10 @@  - netcoreapp1.0;net46 + netcoreapp1.0;net46;netcoreapp1.1 SimpleTestProject - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - Exe + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + Exe @@ -34,6 +34,14 @@ 15.0.0-preview-20161123-03 + + + 1.1.0 + + + 15.0.0-preview-20161123-03 + + @@ -42,7 +50,7 @@ - + portable diff --git a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj index 0855831712..5271c72ba7 100644 --- a/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj +++ b/test/TestAssets/SimpleTestProject2/SimpleTestProject2.csproj @@ -1,9 +1,9 @@  - netcoreapp1.0;net46 + netcoreapp1.0;net46;netcoreapp1.1 SimpleTestProject2 - $(PackageTargetFallback);dnxcore50;portable-net45+win8 + $(PackageTargetFallback);dnxcore50;portable-net45+win8 Exe @@ -24,16 +24,23 @@ 1.1.6-preview + + + 15.0.0-preview-20161123-03 1.0.1 - - - 15.0.0-preview-20161123-03 + + + + + + 1.1.0 + diff --git a/test/TestAssets/XUTestProject/Class1.cs b/test/TestAssets/XUTestProject/Class1.cs index 016a90bfff..e1d33d201f 100644 --- a/test/TestAssets/XUTestProject/Class1.cs +++ b/test/TestAssets/XUTestProject/Class1.cs @@ -1,11 +1,13 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Threading.Tasks; -using Xunit; +// Copyright (c) Microsoft. All rights reserved. namespace xUnitTestProject { + using System; + using System.Collections.Generic; + using System.Linq; + using System.Threading.Tasks; + using Xunit; + public class Class1 { [Fact] diff --git a/test/TestAssets/XUTestProject/XUTestProject.csproj b/test/TestAssets/XUTestProject/XUTestProject.csproj index 87eeb3ffd4..0c6063ecdb 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.csproj +++ b/test/TestAssets/XUTestProject/XUTestProject.csproj @@ -1,10 +1,10 @@ - net46;netcoreapp1.0 + net46;netcoreapp1.0;netcoreapp1.1 XUTestProject - $(PackageTargetFallback);dnxcore50;portable-net45+win8 - Exe + $(PackageTargetFallback);dnxcore50;portable-net45+win8 + Exe @@ -30,10 +30,20 @@ 1.0.0 - + + 15.0.0-preview-20161123-03 + + + + + + 1.1.0 + + 15.0.0-preview-20161123-03 +