moves executable helper to app tests

moves the executable helper from core tests to app tests to improve project structure and dependencies.
This change also refactors the test environment to use the TestEnvironment class instead of the interface.
It also adds an IsEmpty property to IIgnoreConfiguration and IgnoreConfiguration.

Author: arturcic

src/GitVersion.App.Tests/ExecCmdLineArgumentTest.cs

@@ -1,4 +1,4 @@
-using GitVersion.Core.Tests.Helpers;
+using GitVersion.App.Tests.Helpers;
 using GitVersion.Helpers;
 
 namespace GitVersion.App.Tests;

src/GitVersion.App.Tests/GitVersion.App.Tests.csproj

@@ -16,7 +16,6 @@
         <Content Include="Approved\**\*.approved.txt" />
     </ItemGroup>
     <ItemGroup>
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\ExecutableHelper.cs" Link="Helpers\ExecutableHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestConsoleAdapter.cs" Link="Helpers\TestConsoleAdapter.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />

src/GitVersion.Core.Tests/Helpers/ExecutableHelper.cs renamed to src/GitVersion.App.Tests/Helpers/ExecutableHelper.cs

@@ -1,6 +1,6 @@
 using GitVersion.Helpers;
 
-namespace GitVersion.Core.Tests.Helpers;
+namespace GitVersion.App.Tests.Helpers;
 
 public static class ExecutableHelper
 {

src/GitVersion.App.Tests/Helpers/GitVersionHelper.cs

@@ -1,5 +1,5 @@
 using GitVersion.Agents;
-using GitVersion.Core.Tests.Helpers;
+using GitVersion.App.Tests.Helpers;
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -7,7 +7,7 @@ namespace GitVersion.App.Tests;
 
 public sealed class ProgramFixture
 {
-    private readonly IEnvironment environment;
+    private readonly TestEnvironment environment;
     private List<Action<IServiceCollection>> Overrides { get; } = [];
     private readonly Lazy<string> logger;
     private readonly Lazy<string?> output;
@@ -30,7 +30,7 @@ public ProgramFixture(string workingDirectory = "")
         {
             services.AddSingleton(log);
             services.AddSingleton<IConsole>(consoleAdapter);
-            services.AddSingleton(this.environment);
+            services.AddSingleton<IEnvironment>(this.environment);
         });
 
         this.logger = new(() => logBuilder.ToString());

src/GitVersion.Configuration.Tests/Configuration/IgnoreConfigurationTests.cs

@@ -75,7 +75,7 @@ public void WhenBadDateFormatShouldFail()
     [Test]
     public void NewInstanceShouldBeEmpty()
     {
-        IIgnoreConfiguration ignoreConfig = new IgnoreConfiguration();
+        var ignoreConfig = new IgnoreConfiguration();
 
         ignoreConfig.IsEmpty.ShouldBeTrue();
     }

src/GitVersion.Configuration/IgnoreConfiguration.cs

@@ -22,4 +22,7 @@ public string? BeforeString
     [JsonPropertyName("sha")]
     [JsonPropertyDescription("A sequence of SHAs to be excluded from the version calculations.")]
     public HashSet<string> Shas { get; init; } = [];
+
+    [JsonIgnore]
+    public bool IsEmpty => Before == null && Shas.Count == 0;
 }

src/GitVersion.Core.Tests/Extensions/StringFormatWithExtensionTests.cs

@@ -6,7 +6,7 @@ namespace GitVersion.Core.Tests;
 [TestFixture]
 public class StringFormatWithExtensionTests
 {
-    private IEnvironment environment;
+    private TestEnvironment environment;
 
     [SetUp]
     public void Setup() => this.environment = new TestEnvironment();

src/GitVersion.Core/Configuration/IIgnoreConfiguration.cs

@@ -6,5 +6,5 @@ public interface IIgnoreConfiguration
 
     IReadOnlySet<string> Shas { get; }
 
-    bool IsEmpty => Before == null && Shas.Count == 0;
+    bool IsEmpty { get; }
 }

src/GitVersion.Output.Tests/Output/FormatArgumentTests.cs

@@ -46,7 +46,7 @@ public void ShouldOutputFormatWithEnvironmentVariablesTests(string format, strin
         var fixture = CreateTestRepository();
         var consoleBuilder = new StringBuilder();
         IConsole console = new TestConsoleAdapter(consoleBuilder);
-        IEnvironment environment = new TestEnvironment();
+        var environment = new TestEnvironment();
         environment.SetEnvironmentVariable("CustomVar", "foo");
 
         var sp = ConfigureServices(services =>
@@ -57,7 +57,7 @@ public void ShouldOutputFormatWithEnvironmentVariablesTests(string format, strin
             services.AddSingleton(options);
             services.AddSingleton(repository);
             services.AddSingleton(console);
-            services.AddSingleton(environment);
+            services.AddSingleton<IEnvironment>(environment);
         });
 
         var versionVariables = sp.GetRequiredService<IGitVersionCalculateTool>().CalculateVersionVariables();