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

Merge pull request #1536 from dotnet/pakrym/fix-run-tests

Browse source 
Fix run tests
This commit is contained in:
Pavel Krymets 2016-02-24 14:03:23 -08:00
commit 334ee7829a
4 changed files with 15 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
TestAssets/TestProjects/RunTestsApps/TestAppFullClr/Program.cs
View file

@ -6,7 +6,7 @@ namespace ConsoleApplication
{ {
public static void Main(string[] args) public static void Main(string[] args)
{ {
.WriteLine("NET451"); Console.WriteLine("NET451");
} }
} }
} }

4
TestAssets/TestProjects/RunTestsApps/TestAppMultiTargetNoCoreClr/project.json
View file

@ -5,7 +5,7 @@
}, },
"frameworks": { "frameworks": {
"dummy1": { }, "net451": { },
"net451": { } "net45": { }
} }
} }

1
scripts/dotnet-cli-build/TestTargets.cs
View file

@ -29,6 +29,7 @@ namespace Microsoft.DotNet.Cli.Build
"dotnet-build.Tests", "dotnet-build.Tests",
"dotnet-pack.Tests", "dotnet-pack.Tests",
"dotnet-resgen.Tests", "dotnet-resgen.Tests",
"dotnet-run.Tests",
"Microsoft.DotNet.Cli.Utils.Tests", "Microsoft.DotNet.Cli.Utils.Tests",
"Microsoft.DotNet.Compiler.Common.Tests", "Microsoft.DotNet.Compiler.Common.Tests",
"Microsoft.DotNet.ProjectModel.Tests", "Microsoft.DotNet.ProjectModel.Tests",

19
test/dotnet-run.Tests/RunTests.cs
View file

@ -3,38 +3,41 @@
using System; using System;
using System.IO; using System.IO;
using Microsoft.DotNet.TestFramework;
using Microsoft.DotNet.Tools.Test.Utilities; using Microsoft.DotNet.Tools.Test.Utilities;
using Xunit; using Xunit;
namespace Microsoft.DotNet.Tools.Compiler.Tests namespace Microsoft.DotNet.Tools.Run.Tests
{ {
public class CompilerTests : TestBase public class RunTests : TestBase
{ {
private static const string RunTestsBase = "RunTestsApps"; private const string RunTestsBase = "RunTestsApps";
[WindowsOnlyFact] [WindowsOnlyFact]
public void RunsSingleTarget() public void RunsSingleTarget()
{ {
TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppDesktopClr")) TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppFullClr"))
.WithLockFiles() .WithLockFiles()
.WithBuildArtifacts(); .WithBuildArtifacts();
new RunCommand(testInstance.TestRoot).Execute().Should().Pass(); new RunCommand(instance.TestRoot).Execute().Should().Pass();
} }
[Fact]
public void RunsDefaultWhenPresent() public void RunsDefaultWhenPresent()
{ {
TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppMultiTarget")) TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppMultiTarget"))
.WithLockFiles() .WithLockFiles()
.WithBuildArtifacts(); .WithBuildArtifacts();
new RunCommand(testInstance.TestRoot).Execute().Should().Pass(); new RunCommand(instance.TestRoot).Execute().Should().Pass();
} }
[Fact]
public void FailsWithMultipleTargetAndNoDefault() public void FailsWithMultipleTargetAndNoDefault()
{ {
TestInstance instance = TestAssetsManager.CreateTestInstance(RunTestsBase, "TestAppMultiTargetNoCoreClr") TestInstance instance = TestAssetsManager.CreateTestInstance(Path.Combine(RunTestsBase, "TestAppMultiTargetNoCoreClr"))
.WithLockFiles() .WithLockFiles()
.WithBuildArtifacts(); .WithBuildArtifacts();
new RunCommand(testInstance.TestRoot).Execute().Should().Fail(); new RunCommand(instance.TestRoot).Execute().Should().Fail();
} }
private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir) private void CopyProjectToTempDir(string projectDir, TempDirectory tempDir)