Skip to content
This repository was archived by the owner on Apr 20, 2023. It is now read-only.

Commit 05052c0

Browse files
author
William Lee
authored
Use rich mock to test InstallCommand (#8402)
To ensure the mock has the same behavior the component has, run mock under the same tests the adapter has. It is a common problem that moq has -- "everything is mocked out, you are not test anything"
1 parent f4a0d2d commit 05052c0

File tree

25 files changed

+881
-113
lines changed

25 files changed

+881
-113
lines changed

‎Microsoft.DotNet.Cli.sln‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ShellShim.
232232
EndProject
233233
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.ToolPackage.Tests", "test\Microsoft.DotNet.ToolPackage.Tests\Microsoft.DotNet.ToolPackage.Tests.csproj", "{91BFE800-1624-4A58-A1CE-339705A8FFD0}"
234234
EndProject
235+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Tools.Tests.ComponentMocks", "test\Microsoft.DotNet.Tools.Tests.ComponentMocks\Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj", "{E442F4C1-08DB-470F-B9A6-197444CD0295}"
236+
EndProject
235237
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "tool_launcher", "src\tool_launcher\tool_launcher.csproj", "{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}"
236238
EndProject
237239
Global
@@ -1666,6 +1668,30 @@ Global
16661668
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
16671669
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
16681670
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
1671+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
1672+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|Any CPU.Build.0 = Debug|Any CPU
1673+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|x64.ActiveCfg = Debug|Any CPU
1674+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|x64.Build.0 = Debug|Any CPU
1675+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|x86.ActiveCfg = Debug|Any CPU
1676+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Debug|x86.Build.0 = Debug|Any CPU
1677+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|Any CPU.ActiveCfg = Debug|Any CPU
1678+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|Any CPU.Build.0 = Debug|Any CPU
1679+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|x64.ActiveCfg = Debug|Any CPU
1680+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|x64.Build.0 = Debug|Any CPU
1681+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|x86.ActiveCfg = Debug|Any CPU
1682+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.MinSizeRel|x86.Build.0 = Debug|Any CPU
1683+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|Any CPU.ActiveCfg = Release|Any CPU
1684+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|Any CPU.Build.0 = Release|Any CPU
1685+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|x64.ActiveCfg = Release|Any CPU
1686+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|x64.Build.0 = Release|Any CPU
1687+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|x86.ActiveCfg = Release|Any CPU
1688+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.Release|x86.Build.0 = Release|Any CPU
1689+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|Any CPU.ActiveCfg = Release|Any CPU
1690+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|Any CPU.Build.0 = Release|Any CPU
1691+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x64.ActiveCfg = Release|Any CPU
1692+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x64.Build.0 = Release|Any CPU
1693+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x86.ActiveCfg = Release|Any CPU
1694+
{E442F4C1-08DB-470F-B9A6-197444CD0295}.RelWithDebInfo|x86.Build.0 = Release|Any CPU
16691695
EndGlobalSection
16701696
GlobalSection(SolutionProperties) = preSolution
16711697
HideSolutionNode = FALSE
@@ -1740,6 +1766,7 @@ Global
17401766
{E84C08C9-70D7-48B0-9507-ADB8B9A2694C} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17411767
{91BFE800-1624-4A58-A1CE-339705A8FFD0} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17421768
{EDF19BE6-F20F-4AD0-8E3B-E837030726A5} = {ED2FE3E2-F7E7-4389-8231-B65123F2076F}
1769+
{E442F4C1-08DB-470F-B9A6-197444CD0295} = {17735A9D-BFD9-4585-A7CB-3208CA6EA8A7}
17431770
EndGlobalSection
17441771
GlobalSection(ExtensibilityGlobals) = postSolution
17451772
SolutionGuid = {B526D2CE-EE2D-4AD4-93EF-1867D90FF1F5}

‎build/test/TestProjects.targets‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
<PreTestProjectsToExclude Condition=" 'Non-test projects in test directory' != 'consider moving elsewhere' "
1616
Include="test/ArgumentsReflector/ArgumentsReflector.csproj;
1717
test/Microsoft.DotNet.Tools.Tests.Utilities/Microsoft.DotNet.Tools.Tests.Utilities.csproj;
18+
test/Microsoft.DotNet.Tools.Tests.ComponentMocks/Microsoft.DotNet.Tools.Tests.ComponentMocks.csproj;
1819
test/Msbuild.Tests.Utilities/Msbuild.Tests.Utilities.csproj;
1920
test/Performance/Performance.csproj;
2021
test/Microsoft.DotNet.TestFramework/Microsoft.DotNet.TestFramework.csproj" />

‎src/Microsoft.DotNet.InternalAbstractions/Properties/Properties.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
99
[assembly: InternalsVisibleTo("dotnet, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1010
[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.Utilities, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
11+
[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.ComponentMocks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1112
[assembly: InternalsVisibleTo("Microsoft.Extensions.DependencyModel.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1213
[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1314
[assembly: InternalsVisibleTo("Microsoft.DotNet.Configurer.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1415
[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2, PublicKey=0024000004800000940000000602000000240000525341310004000001000100c547cac37abd99c8db225ef2f6c8a3602f3b3606cc9891605d02baa56104f4cfc0734aa39b93bf7852f7d9266654753cc297e7d2edfe0bac1cdcf9f717241550e0a7b191195b7667bb4f64bcb8e2121380fd1d9d46ad2d92d2d15605093924cceaf74c4861eff62abf69b9291ed0a340e113be11e6a7d3113e92484cf7045cc7")]
1516
[assembly: InternalsVisibleTo("dotnet-test.UnitTests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100039ac461fa5c82c7dd2557400c4fd4e9dcdf7ac47e3d572548c04cd4673e004916610f4ea5cbf86f2b1ca1cb824f2a7b3976afecfcf4eb72d9a899aa6786effa10c30399e6580ed848231fec48374e41b3acf8811931343fc2f73acf72dae745adbcb7063cc4b50550618383202875223fc75401351cd89c44bf9b50e7fa3796")]
1617
[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1718
[assembly: InternalsVisibleTo("Microsoft.DotNet.ShellShim.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
19+
[assembly: InternalsVisibleTo("Microsoft.DotNet.ToolPackage.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
20+
[assembly: InternalsVisibleTo("dotnet.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

‎src/dotnet/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@
1717
[assembly: InternalsVisibleTo("dotnet-sln-remove.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1818
[assembly: InternalsVisibleTo("dotnet-msbuild.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
1919
[assembly: InternalsVisibleTo("dotnet-run.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
20+
[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.Utilities, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
21+
[assembly: InternalsVisibleTo("Microsoft.DotNet.Tools.Tests.ComponentMocks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
2022
[assembly: InternalsVisibleTo("Microsoft.DotNet.ToolPackage.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
2123
[assembly: InternalsVisibleTo("Microsoft.DotNet.ShellShim.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]

‎src/dotnet/ShellShim/IShellShimMaker.cs‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
namespace Microsoft.DotNet.ShellShim
2+
{
3+
public interface IShellShimMaker
4+
{
5+
void CreateShim(string packageExecutablePath, string shellCommandName);
6+
void EnsureCommandNameUniqueness(string shellCommandName);
7+
}
8+
}

‎src/dotnet/ShellShim/ShellShimMaker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313

1414
namespace Microsoft.DotNet.ShellShim
1515
{
16-
public class ShellShimMaker
16+
public class ShellShimMaker : IShellShimMaker
1717
{
1818
private const string LauncherExeResourceName = "Microsoft.DotNet.Tools.Launcher.Executable";
1919
private const string LauncherConfigResourceName = "Microsoft.DotNet.Tools.Launcher.Config";

‎src/dotnet/ToolPackage/IToolPackageObtainer.cs‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
// Copyright (c) .NET Foundation and contributors. All rights reserved.
2+
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
3+
4+
using Microsoft.Extensions.EnvironmentAbstractions;
5+
6+
namespace Microsoft.DotNet.ToolPackage
7+
{
8+
internal interface IToolPackageObtainer
9+
{
10+
ToolConfigurationAndExecutablePath ObtainAndReturnExecutablePath(
11+
string packageId,
12+
string packageVersion = null,
13+
FilePath? nugetconfig = null,
14+
string targetframework = null,
15+
string source = null);
16+
}
17+
}

‎src/dotnet/ToolPackage/ToolPackageObtainer.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010

1111
namespace Microsoft.DotNet.ToolPackage
1212
{
13-
internal class ToolPackageObtainer
13+
internal class ToolPackageObtainer : IToolPackageObtainer
1414
{
1515
private readonly Lazy<string> _bundledTargetFrameworkMoniker;
1616
private readonly Func<FilePath> _getTempProjectPath;

‎src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs‎

Lines changed: 45 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,27 @@
1414

1515
namespace Microsoft.DotNet.Tools.Install.Tool
1616
{
17-
public class InstallToolCommand : CommandBase
17+
internal class InstallToolCommand : CommandBase
1818
{
19-
private static string _packageId;
20-
private static string _packageVersion;
21-
private static string _configFilePath;
22-
private static string _framework;
23-
private static string _source;
24-
private static bool _global;
19+
private readonly IToolPackageObtainer _toolPackageObtainer;
20+
private readonly IEnvironmentPathInstruction _environmentPathInstruction;
21+
private readonly IShellShimMaker _shellShimMaker;
22+
private readonly IReporter _reporter;
23+
24+
private readonly string _packageId;
25+
private readonly string _packageVersion;
26+
private readonly string _configFilePath;
27+
private readonly string _framework;
28+
private readonly string _source;
29+
private readonly bool _global;
2530

2631
public InstallToolCommand(
2732
AppliedOption appliedCommand,
28-
ParseResult parseResult)
33+
ParseResult parseResult,
34+
IToolPackageObtainer toolPackageObtainer = null,
35+
IShellShimMaker shellShimMaker = null,
36+
IEnvironmentPathInstruction environmentPathInstruction = null,
37+
IReporter reporter = null)
2938
: base(parseResult)
3039
{
3140
if (appliedCommand == null)
@@ -39,6 +48,27 @@ public InstallToolCommand(
3948
_framework = appliedCommand.ValueOrDefault<string>("framework");
4049
_source = appliedCommand.ValueOrDefault<string>("source");
4150
_global = appliedCommand.ValueOrDefault<bool>("global");
51+
52+
var cliFolderPathCalculator = new CliFolderPathCalculator();
53+
var executablePackagePath = new DirectoryPath(cliFolderPathCalculator.ExecutablePackagesPath);
54+
var offlineFeedPath = new DirectoryPath(cliFolderPathCalculator.CliFallbackFolderPath);
55+
_toolPackageObtainer = toolPackageObtainer ?? new ToolPackageObtainer(
56+
executablePackagePath,
57+
offlineFeedPath,
58+
() => new DirectoryPath(Path.GetTempPath())
59+
.WithSubDirectories(Path.GetRandomFileName())
60+
.WithFile(Path.GetRandomFileName() + ".csproj"),
61+
new Lazy<string>(BundledTargetFramework.GetTargetFrameworkMoniker),
62+
new PackageToProjectFileAdder(),
63+
new ProjectRestorer());
64+
65+
_environmentPathInstruction = environmentPathInstruction
66+
?? EnvironmentPathFactory
67+
.CreateEnvironmentPathInstruction();
68+
69+
_shellShimMaker = shellShimMaker ?? new ShellShimMaker(executablePackagePath.Value);
70+
71+
_reporter = reporter ?? Reporter.Output;
4272
}
4373

4474
public override int Execute()
@@ -48,33 +78,25 @@ public override int Execute()
4878
throw new GracefulException(LocalizableStrings.InstallToolCommandOnlySupportGlobal);
4979
}
5080

51-
var cliFolderPathCalculator = new CliFolderPathCalculator();
52-
var executablePackagePath = new DirectoryPath(cliFolderPathCalculator.ExecutablePackagesPath);
53-
var offlineFeedPath = new DirectoryPath(cliFolderPathCalculator.CliFallbackFolderPath);
54-
55-
var toolConfigurationAndExecutablePath = ObtainPackage(executablePackagePath, offlineFeedPath);
81+
var toolConfigurationAndExecutablePath = ObtainPackage();
5682

57-
var shellShimMaker = new ShellShimMaker(executablePackagePath.Value);
5883
var commandName = toolConfigurationAndExecutablePath.Configuration.CommandName;
59-
shellShimMaker.EnsureCommandNameUniqueness(commandName);
84+
_shellShimMaker.EnsureCommandNameUniqueness(commandName);
6085

61-
shellShimMaker.CreateShim(
86+
_shellShimMaker.CreateShim(
6287
toolConfigurationAndExecutablePath.Executable.Value,
6388
commandName);
6489

65-
EnvironmentPathFactory
66-
.CreateEnvironmentPathInstruction()
90+
_environmentPathInstruction
6791
.PrintAddPathInstructionIfPathDoesNotExist();
6892

69-
Reporter.Output.WriteLine(
93+
_reporter.WriteLine(
7094
string.Format(LocalizableStrings.InstallationSucceeded, commandName));
7195

7296
return 0;
7397
}
7498

75-
private static ToolConfigurationAndExecutablePath ObtainPackage(
76-
DirectoryPath executablePackagePath,
77-
DirectoryPath offlineFeedPath)
99+
private ToolConfigurationAndExecutablePath ObtainPackage()
78100
{
79101
try
80102
{
@@ -84,18 +106,7 @@ private static ToolConfigurationAndExecutablePath ObtainPackage(
84106
configFile = new FilePath(_configFilePath);
85107
}
86108

87-
var toolPackageObtainer =
88-
new ToolPackageObtainer(
89-
executablePackagePath,
90-
offlineFeedPath,
91-
() => new DirectoryPath(Path.GetTempPath())
92-
.WithSubDirectories(Path.GetRandomFileName())
93-
.WithFile(Path.GetRandomFileName() + ".csproj"),
94-
new Lazy<string>(BundledTargetFramework.GetTargetFrameworkMoniker),
95-
new PackageToProjectFileAdder(),
96-
new ProjectRestorer());
97-
98-
return toolPackageObtainer.ObtainAndReturnExecutablePath(
109+
return _toolPackageObtainer.ObtainAndReturnExecutablePath(
99110
packageId: _packageId,
100111
packageVersion: _packageVersion,
101112
nugetconfig: configFile,

0 commit comments

Comments
 (0)