diff --git a/TestPlatform.sln b/TestPlatform.sln index 0dcba62242..d642fb0f8b 100644 --- a/TestPlatform.sln +++ b/TestPlatform.sln @@ -90,6 +90,9 @@ EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.TestUtilities", "test\Microsoft.TestPlatform.TestUtilities\Microsoft.TestPlatform.TestUtilities.xproj", "{F52A4D48-90B3-4004-8C98-D2786CC9B965}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestAssets", "TestAssets", "{50D7D355-08F6-4DFD-AEAA-9BCE41C94C18}" + ProjectSection(SolutionItems) = preProject + test\TestAssets\test.js = test\TestAssets\test.js + EndProjectSection EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "SimpleDataCollector", "test\TestAssets\SimpleDataCollector\SimpleDataCollector.xproj", "{D7F7A9F5-5646-44E7-990C-500844E9272E}" EndProject @@ -111,9 +114,9 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "testhost.UnitTests", "test\ EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.TestPlatform.AcceptanceTests", "test\Integration\Microsoft.TestPlatform.AcceptanceTests\Microsoft.TestPlatform.AcceptanceTests.xproj", "{70A1644A-7434-48CD-A9DE-450C0DA88B3F}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XUnitTestProject", "test\TestAssets\XUnitTestProject\XUnitTestProject.xproj", "{EC4D597C-3AC6-48EA-84FF-23CFECBA5F92}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "XUTestProject", "test\TestAssets\XUTestProject\XUTestProject.xproj", "{AC28D648-6AC1-4C80-8972-B58C8935414E}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NUnitTestProject", "test\TestAssets\NUnitTestProject\NUnitTestProject.xproj", "{24EC916A-02FA-485D-B230-4E1974C99077}" +Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "NUTestProject", "test\TestAssets\NUTestProject\NUTestProject.xproj", "{CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -281,14 +284,14 @@ Global {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Debug|Any CPU.Build.0 = Debug|Any CPU {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.ActiveCfg = Release|Any CPU {70A1644A-7434-48CD-A9DE-450C0DA88B3F}.Release|Any CPU.Build.0 = Release|Any CPU - {EC4D597C-3AC6-48EA-84FF-23CFECBA5F92}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EC4D597C-3AC6-48EA-84FF-23CFECBA5F92}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EC4D597C-3AC6-48EA-84FF-23CFECBA5F92}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EC4D597C-3AC6-48EA-84FF-23CFECBA5F92}.Release|Any CPU.Build.0 = Release|Any CPU - {24EC916A-02FA-485D-B230-4E1974C99077}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {24EC916A-02FA-485D-B230-4E1974C99077}.Debug|Any CPU.Build.0 = Debug|Any CPU - {24EC916A-02FA-485D-B230-4E1974C99077}.Release|Any CPU.ActiveCfg = Release|Any CPU - {24EC916A-02FA-485D-B230-4E1974C99077}.Release|Any CPU.Build.0 = Release|Any CPU + {AC28D648-6AC1-4C80-8972-B58C8935414E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AC28D648-6AC1-4C80-8972-B58C8935414E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AC28D648-6AC1-4C80-8972-B58C8935414E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AC28D648-6AC1-4C80-8972-B58C8935414E}.Release|Any CPU.Build.0 = Release|Any CPU + {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -339,7 +342,7 @@ Global {96B93E28-A33D-48E5-8793-73F686D3B999} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} {09599F77-A1F2-4366-BB8A-B4B90E05BCBC} = {463031A2-7F16-4E38-9944-1F5161D04933} {70A1644A-7434-48CD-A9DE-450C0DA88B3F} = {6DA46479-C688-4296-A6E7-F20C20CDA3A9} - {EC4D597C-3AC6-48EA-84FF-23CFECBA5F92} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} - {24EC916A-02FA-485D-B230-4E1974C99077} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} + {AC28D648-6AC1-4C80-8972-B58C8935414E} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} + {CC8C8F75-0DE0-4AF4-BFF8-92F0362BCF46} = {50D7D355-08F6-4DFD-AEAA-9BCE41C94C18} EndGlobalSection EndGlobal diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs index 12f7f4ed2c..7ce8b37092 100644 --- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs +++ b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/ExecutionTests.cs @@ -17,18 +17,6 @@ public class ExecutionTests : IntegrationTestBase { protected string framework = ".NETFramework,Version=v4.6"; - [Ignore] - [TestMethod] - public void RunAllTestExecutionWithNETCoreApp() - { - var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.framework); - arguments = string.Concat(arguments, " /Framework:.NETCoreApp,Version=v1.0"); - this.InvokeVsTest(arguments); - this.ValidateSummaryStatus(1, 1, 1); - - // TODO validate it is running .netcore - } - [TestMethod] public void RunMultipleTestAssemblies() { @@ -93,12 +81,11 @@ public void RunSelectedTestsWithCategoryTrait() this.ValidateSummaryStatus(0, 1, 0); } - [Ignore] [TestMethod] public void RunSelectedTestsWithClassNameTrait() { var arguments = PrepareArguments(this.GetSampleTestAssembly(), this.GetTestAdapterPath(), string.Empty, this.framework); - arguments = string.Concat(arguments, " /TestCaseFilter:\"ClassName=UnitTest1\""); + arguments = string.Concat(arguments, " /TestCaseFilter:\"ClassName=SampleUnitTestProject.UnitTest1\""); this.InvokeVsTest(arguments); this.ValidateSummaryStatus(1, 1, 1); } @@ -256,19 +243,23 @@ public void NUnitRunAllTestExecution() this.ValidateSummaryStatus(1, 1, 0); } - /* [TestMethod] public void ChutzpahRunAllTestExecution() { - this.InvokeVsTestForExecution(this.GetAssetFullPath("ChutzpahTestProject.dll"), this.GetTestAdapterPath(UnitTestFramework.Chutzpah)); + var testJSFileAbsolutePath = Path.Combine(this.testEnvironment.TestAssetsPath, "test.js"); + this.InvokeVsTestForExecution(testJSFileAbsolutePath, this.GetTestAdapterPath(UnitTestFramework.Chutzpah)); this.ValidateSummaryStatus(1, 1, 0); } + [Ignore] [TestMethod] public void CPPRunAllTestExecution() { - this.InvokeVsTestForExecution(this.GetAssetFullPath("CPPUnitTestProject.dll"), this.GetTestAdapterPath(UnitTestFramework.CPP)); - this.ValidateSummaryStatus(1, 1, 0); - }*/ + 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); + this.InvokeVsTestForExecution(assemblyAbsolutePath, string.Empty); + this.ValidateSummaryStatus(1, 0, 0); + } } } \ No newline at end of file diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/NetCoreExecutionTest.cs b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/NetCoreExecutionTest.cs index cba2fe9b79..7b63a83637 100644 --- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/NetCoreExecutionTest.cs +++ b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/NetCoreExecutionTest.cs @@ -5,7 +5,11 @@ namespace Microsoft.TestPlatform.AcceptanceTests /*[TestClass]*/ //TODO enable netcore test when test asset project migrate to csproj - public class NetCoreExecutionTest:ExecutionTests + + /// + /// Acceptance tests for netcore framework + /// + public class NetCoreExecutionTest : ExecutionTests { [TestInitialize] public void SetTestFrameWork() diff --git a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json index 399bc1c7d2..7754aafebd 100644 --- a/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json +++ b/test/Integration/Microsoft.TestPlatform.AcceptanceTests/project.json @@ -13,13 +13,14 @@ "version": "1.1.3-preview", "exclude": "compile" }, - - "StyleCop.Analyzers": { - "version": "1.0.0", - "type": "build" - }, - "Microsoft.TestPlatform.TestUtilities": "15.0.0-*" + "StyleCop.Analyzers": { + "version": "1.0.0", + "type": "build" + }, + + "Microsoft.TestPlatform.TestUtilities": "15.0.0-*", + "Chutzpah": "4.2.4" }, "frameworks": { diff --git a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs index fd13901719..43e36065b1 100644 --- a/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs +++ b/test/Microsoft.TestPlatform.TestUtilities/IntegrationTestBase.cs @@ -28,6 +28,7 @@ public class IntegrationTestBase private const string TestAdapterRelativePath = @"MSTest.TestAdapter\1.1.3-preview\build\_common"; private const string NUnitTestAdapterRelativePath = @"nunittestadapter\1.2.0\lib"; private const string XUnitTestAdapterRelativePath = @"xunit.runner.visualstudio\2.1.0\build\_common"; + private const string ChutzpahTestAdapterRelativePath = @"chutzpah\4.2.4\tools"; public enum UnitTestFramework { @@ -216,6 +217,10 @@ protected string GetTestAdapterPath(UnitTestFramework testFramework = UnitTestFr { adapterRelativePath = XUnitTestAdapterRelativePath; } + else if (testFramework == UnitTestFramework.Chutzpah) + { + adapterRelativePath = ChutzpahTestAdapterRelativePath; + } return this.testEnvironment.GetNugetPackage(adapterRelativePath); } diff --git a/test/TestAssets/NUTestProject/NUTestProject.xproj b/test/TestAssets/NUTestProject/NUTestProject.xproj index 233bd8f278..2d5aa3c523 100644 --- a/test/TestAssets/NUTestProject/NUTestProject.xproj +++ b/test/TestAssets/NUTestProject/NUTestProject.xproj @@ -6,7 +6,7 @@ - 24ec916a-02fa-485d-b230-4e1974c99077 + cc8c8f75-0de0-4af4-bff8-92f0362bcf46 xUnitTestProject .\obj ..\..\..\artifacts\ diff --git a/test/TestAssets/XUTestProject/XUTestProject.nuget.props b/test/TestAssets/XUTestProject/XUTestProject.nuget.props deleted file mode 100644 index 4e1acebd35..0000000000 --- a/test/TestAssets/XUTestProject/XUTestProject.nuget.props +++ /dev/null @@ -1,9 +0,0 @@ - - - - $(UserProfile)\src\vstest\packages - - - - - \ No newline at end of file diff --git a/test/TestAssets/XUTestProject/XUTestProject.xproj b/test/TestAssets/XUTestProject/XUTestProject.xproj index 368dbafb0c..94f6b573cd 100644 --- a/test/TestAssets/XUTestProject/XUTestProject.xproj +++ b/test/TestAssets/XUTestProject/XUTestProject.xproj @@ -4,18 +4,16 @@ 14.0 $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - ec4d597c-3ac6-48ea-84ff-23cfecba5f92 + ac28d648-6ac1-4c80-8972-b58c8935414e xUnitTestProject .\obj ..\..\..\artifacts\ v4.5.2 - 2.0 - + \ No newline at end of file diff --git a/test/TestAssets/test.js b/test/TestAssets/test.js new file mode 100644 index 0000000000..f502ac9ae4 --- /dev/null +++ b/test/TestAssets/test.js @@ -0,0 +1,10 @@ +test("TestMethod1", function () { + ok(true); + +}); + +test("TestMethod2", function () { + ok(false); + +}); + \ No newline at end of file