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

Refactor ScriptExecutor, add test cases for scriptexecutor.

Browse source 
Add TargetFramework and FullTargetFramework to compile and publish script
variables.

Add ProjectLocal Command Resolution Strategy.

Fixup ArgumentEscaper to not always quote things.

Fixes #1216
Fixes #1016
Fixes #982
This commit is contained in:
Bryan Thornbury 2016-02-09 15:30:04 -08:00
parent dbc9032202
commit c1e28ae921
21 changed files with 421 additions and 164 deletions
Download patch file Download diff file Expand all files Collapse all files

155
test/ScriptExecutorTests/ScriptExecutorTests.cs Normal file
View file

@ -0,0 +1,155 @@
using System;
using System.IO;
using System.Collections.Generic;
using Microsoft.DotNet.Cli.Utils;
using Microsoft.DotNet.ProjectModel;
using Microsoft.DotNet.Tools.Test.Utilities;
using System.Runtime.InteropServices;
using Xunit;
using FluentAssertions;
using NuGet.Frameworks;
namespace Microsoft.DotNet.Cli.Utils.ScriptExecutorTests
{
public class ScriptExecutorTests : TestBase
{
private static readonly string s_testProjectRoot = Path.Combine(AppContext.BaseDirectory, "TestAssets/TestProjects");
private TempDirectory _root;
public ScriptExecutorTests()
{
_root = Temp.CreateDirectory();
}
[Fact]
public void Test_Project_Local_Script_is_Resolved()
{
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
CreateTestFile("some.script", binTestProjectPath);
var scriptCommandLine = "some.script";
var command = ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
command.Should().NotBeNull();
command.ResolutionStrategy.Should().Be(CommandResolutionStrategy.ProjectLocal);
}
[Fact]
public void Test_Nonexistent_Project_Local_Script_is_not_Resolved()
{
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
var scriptCommandLine = "nonexistent.script";
Action action = () => ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
action.ShouldThrow<CommandUnknownException>();
}
[Fact]
public void Test_Extension_Inference_in_Resolution_for_Project_Local_Scripts()
{
var extensionList = new string[] {".cmd", ".sh"};
var expectedExtension = default(string);
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
expectedExtension = ".cmd";
}
else
{
expectedExtension = ".sh";
}
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
foreach (var extension in extensionList)
{
CreateTestFile("uniquescriptname" + extension, binTestProjectPath);
}
// Don't include extension
var scriptCommandLine = "uniquescriptname";
var command = ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
command.Should().NotBeNull();
command.ResolutionStrategy.Should().Be(CommandResolutionStrategy.ProjectLocal);
command.CommandArgs.Should().Contain(scriptCommandLine + expectedExtension);
}
[Fact]
public void Test_Script_Exe_Files_Dont_Use_Cmd_or_Sh()
{
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
CreateTestFile("some.exe", binTestProjectPath);
var scriptCommandLine = "some.exe";
var command = ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
command.Should().NotBeNull();
command.ResolutionStrategy.Should().Be(CommandResolutionStrategy.ProjectLocal);
Path.GetFileName(command.CommandName).Should().NotBe("cmd.exe");
Path.GetFileName(command.CommandName).Should().NotBe("sh");
}
[Fact]
public void Test_Script_Cmd_Files_Use_CmdExe()
{
if (! RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
{
return;
}
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
CreateTestFile("some.cmd", binTestProjectPath);
var scriptCommandLine = "some.cmd";
var command = ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
command.Should().NotBeNull();
command.ResolutionStrategy.Should().Be(CommandResolutionStrategy.ProjectLocal);
Path.GetFileName(command.CommandName).Should().Be("cmd.exe");
}
[Fact]
public void Test_Script_Builtins_Fail()
{
var sourceTestProjectPath = Path.Combine(s_testProjectRoot, "TestApp");
var binTestProjectPath = _root.CopyDirectory(sourceTestProjectPath).Path;
var project = ProjectContext.Create(binTestProjectPath, NuGetFramework.Parse("dnxcore50")).ProjectFile;
var scriptCommandLine = "echo";
Action action = () => ScriptExecutor.CreateCommandForScript(project, scriptCommandLine, new Dictionary<string, string>());
action.ShouldThrow<CommandUnknownException>();
}
private void CreateTestFile(string filename, string directory)
{
string path = Path.Combine(directory, filename);
File.WriteAllText(path, "echo hello");
}
}
}