Move all test commands to DotNetCommand base

This commit is contained in:
Piotr Puszkiewicz 2017-03-14 14:07:51 -07:00
parent cb52224272
commit fac34c7b3b
18 changed files with 19 additions and 107 deletions

View file

@ -5,15 +5,10 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class AddReferenceCommand : TestCommand public sealed class AddReferenceCommand : DotnetCommand
{ {
private string _projectName = null; private string _projectName = null;
public AddReferenceCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"add {_projectName} reference {args}"; args = $"add {_projectName} reference {args}";

View file

@ -7,7 +7,7 @@ using NuGet.Frameworks;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class BuildCommand : TestCommand public sealed class BuildCommand : DotnetCommand
{ {
private bool _captureOutput; private bool _captureOutput;
@ -26,11 +26,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private DirectoryInfo _workingDirectory; private DirectoryInfo _workingDirectory;
public BuildCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"build {GetNoDependencies()} {GetProjectFile()} {GetOutputPath()} {GetConfiguration()} {GetFramework()} {GetRuntime()} {args}"; args = $"build {GetNoDependencies()} {GetProjectFile()} {GetOutputPath()} {GetConfiguration()} {GetFramework()} {GetRuntime()} {args}";

View file

@ -7,7 +7,7 @@ using System.Collections.Generic;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class CacheCommand : TestCommand public sealed class CacheCommand : DotnetCommand
{ {
private List<string> _profileProject = new List<string>(); private List<string> _profileProject = new List<string>();
private string _framework; private string _framework;
@ -16,11 +16,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private string _frameworkVersion; private string _frameworkVersion;
private string _intermediateWorkingDirectory; private string _intermediateWorkingDirectory;
public CacheCommand()
: base("dotnet")
{
}
public CacheCommand WithEntries(string profileProject) public CacheCommand WithEntries(string profileProject)
{ {
_profileProject.Add($"--entries {profileProject}"); _profileProject.Add($"--entries {profileProject}");

View file

@ -7,13 +7,8 @@ using System.Runtime.InteropServices;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class CleanCommand : TestCommand public sealed class CleanCommand : DotnetCommand
{ {
public CleanCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"clean {args}"; args = $"clean {args}";

View file

@ -7,13 +7,8 @@ using System.Runtime.InteropServices;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public class DependencyToolInvokerCommand : TestCommand public class DependencyToolInvokerCommand : DotnetCommand
{ {
public DependencyToolInvokerCommand()
: base("dotnet")
{
}
public CommandResult Execute(string commandName, string framework, string additionalArgs) public CommandResult Execute(string commandName, string framework, string additionalArgs)
{ {
var args = $"dependency-tool-invoker {commandName} --framework {framework} {additionalArgs}"; var args = $"dependency-tool-invoker {commandName} --framework {framework} {additionalArgs}";

View file

@ -5,14 +5,10 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public class DotnetTestCommand : TestCommand public class DotnetTestCommand : DotnetCommand
{ {
private string _runtime; private string _runtime;
public DotnetTestCommand() : base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"test {GetRuntime()} {args}"; args = $"test {GetRuntime()} {args}";

View file

@ -5,13 +5,8 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class HelpCommand : TestCommand public sealed class HelpCommand : DotnetCommand
{ {
public HelpCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"help {args}"; args = $"help {args}";

View file

@ -5,15 +5,10 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class ListReferenceCommand : TestCommand public sealed class ListReferenceCommand : DotnetCommand
{ {
private string _projectName = null; private string _projectName = null;
public ListReferenceCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"list {_projectName} reference {args}"; args = $"list {_projectName} reference {args}";

View file

@ -5,13 +5,8 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class MSBuildCommand : TestCommand public sealed class MSBuildCommand : DotnetCommand
{ {
public MSBuildCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"msbuild {args}"; args = $"msbuild {args}";

View file

@ -5,14 +5,8 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class MigrateCommand : TestCommand public sealed class MigrateCommand : DotnetCommand
{ {
public MigrateCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args="") public override CommandResult Execute(string args="")
{ {
args = $"migrate {args}"; args = $"migrate {args}";

View file

@ -5,14 +5,8 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class NewCommand : TestCommand public sealed class NewCommand : DotnetCommand
{ {
public NewCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"new {args}"; args = $"new {args}";

View file

@ -6,14 +6,8 @@ using Xunit;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class NewCommandShim : TestCommand public sealed class NewCommandShim : DotnetCommand
{ {
public NewCommandShim()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"new {args} --debug:ephemeral-hive"; args = $"new {args} --debug:ephemeral-hive";

View file

@ -6,7 +6,7 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class PackCommand : TestCommand public sealed class PackCommand : DotnetCommand
{ {
private string _projectPath; private string _projectPath;
private string _outputDirectory; private string _outputDirectory;
@ -90,7 +90,6 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
string configuration="", string configuration="",
string versionSuffix="", string versionSuffix="",
bool serviceable = false) bool serviceable = false)
: base("dotnet")
{ {
_projectPath = projectPath; _projectPath = projectPath;
_outputDirectory = output; _outputDirectory = output;

View file

@ -7,18 +7,13 @@ using System.Collections.Generic;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class PublishCommand : TestCommand public sealed class PublishCommand : DotnetCommand
{ {
private string _framework; private string _framework;
private string _output; private string _output;
private string _runtime; private string _runtime;
private List<string> _profileFilterProject = new List<string>(); private List<string> _profileFilterProject = new List<string>();
public PublishCommand()
: base("dotnet")
{
}
public PublishCommand WithFramework(string framework) public PublishCommand WithFramework(string framework)
{ {
_framework = framework; _framework = framework;

View file

@ -5,15 +5,10 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class RemoveReferenceCommand : TestCommand public sealed class RemoveReferenceCommand : DotnetCommand
{ {
private string _projectName = null; private string _projectName = null;
public RemoveReferenceCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"remove {_projectName} reference {args}"; args = $"remove {_projectName} reference {args}";

View file

@ -5,15 +5,10 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class RestoreCommand : TestCommand public sealed class RestoreCommand : DotnetCommand
{ {
private string _runtime; private string _runtime;
public RestoreCommand()
: base("dotnet")
{
}
public RestoreCommand WithRuntime(string runtime) public RestoreCommand WithRuntime(string runtime)
{ {
_runtime = runtime; _runtime = runtime;

View file

@ -7,13 +7,8 @@ using System.Runtime.InteropServices;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class RunCommand : TestCommand public sealed class RunCommand : DotnetCommand
{ {
public RunCommand()
: base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"run {args}"; args = $"run {args}";

View file

@ -5,13 +5,8 @@ using Microsoft.DotNet.Cli.Utils;
namespace Microsoft.DotNet.Tools.Test.Utilities namespace Microsoft.DotNet.Tools.Test.Utilities
{ {
public sealed class VSTestCommand: TestCommand public sealed class VSTestCommand: DotnetCommand
{ {
public VSTestCommand()
:base("dotnet")
{
}
public override CommandResult Execute(string args = "") public override CommandResult Execute(string args = "")
{ {
args = $"vstest {args}"; args = $"vstest {args}";