mirrors/dotnet-installer
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Update test to point new short name test assets

Browse source
This commit is contained in:
Faizan Ahmad 2016-11-03 00:14:03 +05:30
parent 5c5f593449
commit 734afe84cf
2 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

12
test/dotnet-test.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
View file

@ -16,13 +16,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
[WindowsOnlyFact] [WindowsOnlyFact]
public void MStestMultiTFM() public void MStestMultiTFM()
{ {
// Copy VSTestDesktopAndNetCoreApp project in output directory of project dotnet-test.Tests // Copy VSTestDesktopAndNetCore project in output directory of project dotnet-test.Tests
string testAppName = "VSTestDesktopAndNetCoreApp"; string testAppName = "VSTestDesktopAndNetCore";
TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
string testProjectDirectory = testInstance.TestRoot; string testProjectDirectory = testInstance.TestRoot;
// Restore project VSTestDesktopAndNetCoreApp // Restore project VSTestDesktopAndNetCore
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.Execute() .Execute()
@ -48,13 +48,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
[WindowsOnlyFact] [WindowsOnlyFact]
public void XunitMultiTFM() public void XunitMultiTFM()
{ {
// Copy VSTestXunitDesktopAndNetCoreApp project in output directory of project dotnet-test.Tests // Copy VSTestXunitDesktopAndNetCore project in output directory of project dotnet-test.Tests
string testAppName = "VSTestXunitDesktopAndNetCoreApp"; string testAppName = "VSTestXunitDesktopAndNetCore";
TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
string testProjectDirectory = testInstance.TestRoot; string testProjectDirectory = testInstance.TestRoot;
// Restore project VSTestXunitDesktopAndNetCoreApp // Restore project VSTestXunitDesktopAndNetCore
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.Execute() .Execute()

20
test/dotnet-test.Tests/GivenDotnetTestBuildsAndRunsTestfromCsproj.cs
View file

@ -16,13 +16,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
[Fact] [Fact]
public void MSTestSingleTFM() public void MSTestSingleTFM()
{ {
// Copy VSTestDotNetCoreProject project in output directory of project dotnet-vstest.Tests // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
string testAppName = "VSTestDotNetCoreProject"; string testAppName = "VSTestDotNetCore";
TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
string testProjectDirectory = testInstance.TestRoot; string testProjectDirectory = testInstance.TestRoot;
// Restore project VSTestDotNetCoreProject // Restore project VSTestDotNetCore
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.Execute() .Execute()
@ -43,13 +43,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
[Fact] [Fact]
public void XunitSingleTFM() public void XunitSingleTFM()
{ {
// Copy VSTestXunitDotNetCoreProject project in output directory of project dotnet-vstest.Tests // Copy VSTestXunitDotNetCore project in output directory of project dotnet-vstest.Tests
string testAppName = "VSTestXunitDotNetCoreProject"; string testAppName = "VSTestXunitDotNetCore";
TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
string testProjectDirectory = testInstance.TestRoot; string testProjectDirectory = testInstance.TestRoot;
// Restore project VSTestXunitDotNetCoreProject // Restore project VSTestXunitDotNetCore
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.Execute() .Execute()
@ -70,13 +70,13 @@ namespace Microsoft.DotNet.Cli.Test.Tests
[Fact] [Fact]
public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven() public void TestWillNotBuildTheProjectIfNoBuildArgsIsGiven()
{ {
// Copy VSTestDotNetCoreProject project in output directory of project dotnet-vstest.Tests // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
string testAppName = "VSTestDotNetCoreProject"; string testAppName = "VSTestDotNetCore";
TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName); TestInstance testInstance = TestAssetsManager.CreateTestInstance(testAppName);
string testProjectDirectory = testInstance.TestRoot; string testProjectDirectory = testInstance.TestRoot;
// Restore project VSTestDotNetCoreProject // Restore project VSTestDotNetCore
new RestoreCommand() new RestoreCommand()
.WithWorkingDirectory(testProjectDirectory) .WithWorkingDirectory(testProjectDirectory)
.Execute() .Execute()
@ -85,7 +85,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
string expectedError = Path.Combine(testProjectDirectory, "bin", string expectedError = Path.Combine(testProjectDirectory, "bin",
configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll"); configuration, "netcoreapp1.0", "VSTestDotNetCore.dll");
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found."; expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
// Call test // Call test