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

Fix tests for cache => store rename.

Browse source
This commit is contained in:
Eric Erhardt 2017-04-07 14:15:38 -05:00
parent 07b25e268c
commit 95ff3f9bf8
9 changed files with 313 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

10
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/PublishCommand.cs
View file

@ -12,7 +12,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private string _framework;
private string _output;
private string _runtime;
private List<string> _profileFilterProject = new List<string>();
private List<string> _targetManifests = new List<string>();
private bool? _selfContained;
public PublishCommand WithFramework(string framework)
@ -38,9 +38,9 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return this;
}
public PublishCommand WithProfileProject(string profileproj)
public PublishCommand WithTargetManifest(string target)
{
_profileFilterProject.Add( $" --filter {profileproj}");
_targetManifests.Add( $"--target {target}");
return this;
}
@ -67,7 +67,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
return string.Join(" ",
FrameworkOption,
OutputOption,
ProfileProjOption,
TargetOption,
RuntimeOption,
SelfContainedOption);
}
@ -78,7 +78,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private string RuntimeOption => string.IsNullOrEmpty(_runtime) ? "" : $"-r {_runtime}";
private string ProfileProjOption => string.Join(" ", _profileFilterProject);
private string TargetOption => string.Join(" ", _targetManifests);
private string SelfContainedOption => _selfContained.HasValue ? $"--self-contained:{_selfContained.Value}" : "";
}

22
test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/CacheCommand.cs → test/Microsoft.DotNet.Tools.Tests.Utilities/Commands/StoreCommand.cs
View file

@ -7,7 +7,7 @@ using System.Collections.Generic;
namespace Microsoft.DotNet.Tools.Test.Utilities
{
public sealed class CacheCommand : DotnetCommand
public sealed class StoreCommand : DotnetCommand
{
private List<string> _profileProject = new List<string>();
private string _framework;
@ -16,42 +16,42 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
private string _frameworkVersion;
private string _intermediateWorkingDirectory;
public CacheCommand WithEntries(string profileProject)
public StoreCommand WithManifest(string profileProject)
{
_profileProject.Add($"--entries {profileProject}");
_profileProject.Add($"--manifest {profileProject}");
return this;
}
public CacheCommand WithFramework(string framework)
public StoreCommand WithFramework(string framework)
{
_framework = framework;
return this;
}
public CacheCommand WithFramework(NuGetFramework framework)
public StoreCommand WithFramework(NuGetFramework framework)
{
return WithFramework(framework.GetShortFolderName());
}
public CacheCommand WithOutput(string output)
public StoreCommand WithOutput(string output)
{
_output = output;
return this;
}
public CacheCommand WithRuntime(string runtime)
public StoreCommand WithRuntime(string runtime)
{
_runtime = runtime;
return this;
}
public CacheCommand WithRuntimeFrameworkVersion(string frameworkVersion)
public StoreCommand WithRuntimeFrameworkVersion(string frameworkVersion)
{
_frameworkVersion = frameworkVersion;
return this;
}
public CacheCommand WithIntermediateWorkingDirectory(string intermediateWorkingDirectory)
public StoreCommand WithIntermediateWorkingDirectory(string intermediateWorkingDirectory)
{
_intermediateWorkingDirectory = intermediateWorkingDirectory;
return this;
@ -59,13 +59,13 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
public override CommandResult Execute(string args = "")
{
args = $"cache {BuildArgs()} {args}";
args = $"store {BuildArgs()} {args}";
return base.Execute(args);
}
public override CommandResult ExecuteWithCapturedOutput(string args = "")
{
args = $"cache {BuildArgs()} {args}";
args = $"store {BuildArgs()} {args}";
return base.ExecuteWithCapturedOutput(args);
}