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

Addressed PR comment

Browse source
This commit is contained in:
Faizan Ahmad 2016-10-26 16:53:34 +05:30
parent 763e6bc946
commit aea25b1fc5
4 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
TestAssets/TestProjects/VSTestDesktopAndNetCoreApp/VSTestDesktopAndNetCoreApp.csproj
View file

@ -5,11 +5,6 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks> <TargetFrameworks>net46;netcoreapp1.0</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp1.0'">
<DefineConstants>NETCOREAPP;$(DefineConstants)</DefineConstants>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net46'"> <PropertyGroup Condition="'$(TargetFramework)' == 'net46'">

1
TestAssets/TestProjects/VSTestDotNetCoreProject/VSTestDotNetCoreProject.csproj
View file

@ -5,7 +5,6 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFrameworks>netcoreapp1.0</TargetFrameworks> <TargetFrameworks>netcoreapp1.0</TargetFrameworks>
<OutputPath>bin\$(Configuration)</OutputPath>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

4
test/dotnet-test3.Tests/GivenDotnetTest3BuildsAndRunsTestFromCsprojForMultipleTFM.cs
View file

@ -32,7 +32,9 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
.Pass(); .Pass();
// Call test3 // Call test3
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput(""); CommandResult result = new Test3Command()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("");
// Verify // Verify
// for target framework net46 // for target framework net46

15
test/dotnet-test3.Tests/GivenDotnetTest3BuildsAndRunsTestfromCsproj.cs
View file

@ -30,7 +30,9 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
.Pass(); .Pass();
// Call test3 // Call test3
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput("--framework netcoreapp1.0"); CommandResult result = new Test3Command()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--framework netcoreapp1.0");
// Verify // Verify
result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0."); result.StdOut.Should().Contain("Total tests: 2. Passed: 1. Failed: 1. Skipped: 0.");
@ -55,14 +57,17 @@ namespace Microsoft.DotNet.Cli.Test3.Tests
.Pass(); .Pass();
string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug"; string configuration = Environment.GetEnvironmentVariable("CONFIGURATION") ?? "Debug";
string expectedError = Path.Combine(testProjectDirectory, "bin", configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll"); string expectedError = Path.Combine(testProjectDirectory, "bin",
expectedError = "The test source file " + "\""+ expectedError + "\"" + " provided was not found."; configuration, "netcoreapp1.0", "VSTestDotNetCoreProject.dll");
expectedError = "The test source file " + "\"" + expectedError + "\"" + " provided was not found.";
// Call test3 // Call test3
CommandResult result = new Test3Command().WithWorkingDirectory(testProjectDirectory).ExecuteWithCapturedOutput("--noBuild"); CommandResult result = new Test3Command()
.WithWorkingDirectory(testProjectDirectory)
.ExecuteWithCapturedOutput("--noBuild");
// Verify // Verify
result.StdOut.Should().Contain(expectedError); result.StdOut.Should().Contain(expectedError);
} }
} }
} }