hohn/codeql
1
0
Fork 0
mirror of https://github.com/github/codeql.git synced 2025-12-16 16:53:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

C#: Rename DotnetCommand to DotNetCliInvoker.

Browse Source
This commit is contained in:
Michael Nebel
2023-09-15 13:52:17 +02:00
parent 05c5f3e050
commit 82e56e6dae
4 changed files with 44 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNet.cs
View File

@@ -11,17 +11,17 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
/// </summary>
internal partial class DotNet : IDotNet
{
private readonly IDotnetCommand dotnet;
private readonly IDotNetCliInvoker dotnet;
private readonly ProgressMonitor progressMonitor;
internal DotNet(IDotnetCommand dotnet, ProgressMonitor progressMonitor)
internal DotNet(IDotNetCliInvoker dotnet, ProgressMonitor progressMonitor)
{
this.progressMonitor = progressMonitor;
this.dotnet = dotnet;
Info();
}
public DotNet(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotnetCommand(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { }
public DotNet(IDependencyOptions options, ProgressMonitor progressMonitor) : this(new DotNetCliInvoker(progressMonitor, Path.Combine(options.DotNetPath ?? string.Empty, "dotnet")), progressMonitor) { }
private void Info()

4
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotnetCommand.cs → csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/DotNetCliInvoker.cs
View File

@@ -7,13 +7,13 @@ namespace Semmle.Extraction.CSharp.DependencyFetching
/// <summary>
/// Low level utilities to run the "dotnet" command.
/// </summary>
internal sealed class DotnetCommand : IDotnetCommand
internal sealed class DotNetCliInvoker : IDotNetCliInvoker
{
private readonly ProgressMonitor progressMonitor;
public string Exec { get; }
public DotnetCommand(ProgressMonitor progressMonitor, string exec)
public DotNetCliInvoker(ProgressMonitor progressMonitor, string exec)
{
this.progressMonitor = progressMonitor;
this.Exec = exec;

2
csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotnetCommand.cs → csharp/extractor/Semmle.Extraction.CSharp.DependencyFetching/IDotNetCliInvoker.cs
View File

@@ -2,7 +2,7 @@ using System.Collections.Generic;
namespace Semmle.Extraction.CSharp.DependencyFetching
{
internal interface IDotnetCommand
internal interface IDotNetCliInvoker
{
/// <summary>
/// The name of the dotnet executable.

76
csharp/extractor/Semmle.Extraction.Tests/DotNet.cs
View File

@@ -6,13 +6,13 @@ using System.Linq;
namespace Semmle.Extraction.Tests
{
internal class DotnetCommandStub : IDotnetCommand
internal class DotNetCliInvokerStub : IDotNetCliInvoker
{
private readonly IList<string> output;
private string lastArgs = "";
public bool Success { get; set; } = true;
public DotnetCommandStub(IList<string> output)
public DotNetCliInvokerStub(IList<string> output)
{
this.output = output;
}
@@ -38,8 +38,8 @@ namespace Semmle.Extraction.Tests
public class DotNetTests
{
private static IDotNet MakeDotnet(IDotnetCommand dotnetCommand) =>
new DotNet(dotnetCommand, new ProgressMonitor(new LoggerStub()));
private static IDotNet MakeDotnet(IDotNetCliInvoker dotnetCliInvoker) =>
new DotNet(dotnetCliInvoker, new ProgressMonitor(new LoggerStub()));
private static IList<string> MakeDotnetRestoreOutput() =>
new List<string> {
@@ -61,13 +61,13 @@ namespace Semmle.Extraction.Tests
public void TestDotnetInfo()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
// Execute
var _ = MakeDotnet(dotnetCommand);
var _ = MakeDotnet(dotnetCliInvoker);
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("--info", lastArgs);
}
@@ -75,12 +75,12 @@ namespace Semmle.Extraction.Tests
public void TestDotnetInfoFailure()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>()) { Success = false };
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>()) { Success = false };
// Execute
try
{
var _ = MakeDotnet(dotnetCommand);
var _ = MakeDotnet(dotnetCliInvoker);
}
// Verify
@@ -96,14 +96,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetRestoreProjectToDirectory1()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", out var _);
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true", lastArgs);
}
@@ -111,14 +111,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetRestoreProjectToDirectory2()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.RestoreProjectToDirectory("myproject.csproj", "mypackages", out var _, "myconfig.config");
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("restore --no-dependencies \"myproject.csproj\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --configfile \"myconfig.config\"", lastArgs);
}
@@ -126,14 +126,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetRestoreSolutionToDirectory1()
{
// Setup
var dotnetCommand = new DotnetCommandStub(MakeDotnetRestoreOutput());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(MakeDotnetRestoreOutput());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", out var projects);
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
Assert.Equal(2, projects.Count());
Assert.Contains("/path/to/project.csproj", projects);
@@ -144,15 +144,15 @@ namespace Semmle.Extraction.Tests
public void TestDotnetRestoreSolutionToDirectory2()
{
// Setup
var dotnetCommand = new DotnetCommandStub(MakeDotnetRestoreOutput());
var dotnet = MakeDotnet(dotnetCommand);
dotnetCommand.Success = false;
var dotnetCliInvoker = new DotNetCliInvokerStub(MakeDotnetRestoreOutput());
var dotnet = MakeDotnet(dotnetCliInvoker);
dotnetCliInvoker.Success = false;
// Execute
dotnet.RestoreSolutionToDirectory("mysolution.sln", "mypackages", out var projects);
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("restore --no-dependencies \"mysolution.sln\" --packages \"mypackages\" /p:DisableImplicitNuGetFallbackFolder=true --verbosity normal", lastArgs);
Assert.Empty(projects);
}
@@ -161,14 +161,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetNew()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.New("myfolder");
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("new console --no-restore --output \"myfolder\"", lastArgs);
}
@@ -176,14 +176,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetAddPackage()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.AddPackage("myfolder", "mypackage");
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("add \"myfolder\" package \"mypackage\" --no-restore", lastArgs);
}
@@ -191,14 +191,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetGetListedRuntimes1()
{
// Setup
var dotnetCommand = new DotnetCommandStub(MakeDotnetListRuntimesOutput());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(MakeDotnetListRuntimesOutput());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
var runtimes = dotnet.GetListedRuntimes();
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("--list-runtimes", lastArgs);
Assert.Equal(2, runtimes.Count);
Assert.Contains("Microsoft.AspNetCore.App 7.0.2 [/path/dotnet/shared/Microsoft.AspNetCore.App]", runtimes);
@@ -209,15 +209,15 @@ namespace Semmle.Extraction.Tests
public void TestDotnetGetListedRuntimes2()
{
// Setup
var dotnetCommand = new DotnetCommandStub(MakeDotnetListRuntimesOutput());
var dotnet = MakeDotnet(dotnetCommand);
dotnetCommand.Success = false;
var dotnetCliInvoker = new DotNetCliInvokerStub(MakeDotnetListRuntimesOutput());
var dotnet = MakeDotnet(dotnetCliInvoker);
dotnetCliInvoker.Success = false;
// Execute
var runtimes = dotnet.GetListedRuntimes();
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("--list-runtimes", lastArgs);
Assert.Empty(runtimes);
}
@@ -226,14 +226,14 @@ namespace Semmle.Extraction.Tests
public void TestDotnetExec()
{
// Setup
var dotnetCommand = new DotnetCommandStub(new List<string>());
var dotnet = MakeDotnet(dotnetCommand);
var dotnetCliInvoker = new DotNetCliInvokerStub(new List<string>());
var dotnet = MakeDotnet(dotnetCliInvoker);
// Execute
dotnet.Exec("myarg1 myarg2");
// Verify
var lastArgs = dotnetCommand.GetLastArgs();
var lastArgs = dotnetCliInvoker.GetLastArgs();
Assert.Equal("exec myarg1 myarg2", lastArgs);
}
}