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

Fix tests

Browse source
This commit is contained in:
faahmad 2017-04-17 07:31:03 -07:00
parent 59de556b76
commit b98dccb1f7
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" /> <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks> <TargetFrameworks>net46;netcoreapp2.0</TargetFrameworks>
<RuntimeIdentifiers>win7-x86</RuntimeIdentifiers> <RuntimeIdentifiers>win7-x86</RuntimeIdentifiers>
<RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier> <RuntimeIdentifier Condition=" '$(TargetFramework)' == 'net46' ">win7-x86</RuntimeIdentifier>

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

@ -8,6 +8,7 @@ using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Cli.Utils; using Microsoft.DotNet.Cli.Utils;
using System.IO; using System.IO;
using System; using System;
using System.Runtime.CompilerServices;
namespace Microsoft.DotNet.Cli.Test.Tests namespace Microsoft.DotNet.Cli.Test.Tests
{ {
@ -89,7 +90,7 @@ namespace Microsoft.DotNet.Cli.Test.Tests
.ExecuteWithCapturedOutput("--no-build"); .ExecuteWithCapturedOutput("--no-build");
// Verify // Verify
result.StdOut.Should().Contain(expectedError); result.StdErr.Should().Contain(expectedError);
} }
[Fact] [Fact]
@ -185,11 +186,12 @@ namespace Microsoft.DotNet.Cli.Test.Tests
result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest"); result.StdOut.Should().Contain("Failed TestNamespace.VSTestTests.VSTestFailTest");
} }
private string CopyAndRestoreVSTestDotNetCoreTestApp(){ private string CopyAndRestoreVSTestDotNetCoreTestApp([CallerMemberName] string callingMethod = "")
{
// Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests // Copy VSTestDotNetCore project in output directory of project dotnet-vstest.Tests
string testAppName = "VSTestDotNetCore"; string testAppName = "VSTestDotNetCore";
var testInstance = TestAssets.Get(testAppName) var testInstance = TestAssets.Get(testAppName)
.CreateInstance() .CreateInstance(callingMethod)
.WithSourceFiles(); .WithSourceFiles();
var testProjectDirectory = testInstance.Root.FullName; var testProjectDirectory = testInstance.Root.FullName;