removed TestFileSystem and usage

arturcic · arturcic · commit 2305b7cef270 · 2024-12-09T12:16:07.000+01:00
diff --git a/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj b/src/GitVersion.App.Tests/GitVersion.App.Tests.csproj
@@ -19,9 +19,7 @@
         <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\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
diff --git a/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs b/src/GitVersion.Configuration.Tests/Configuration/ConfigurationProviderTests.cs
@@ -285,7 +285,8 @@ public void NoWarnOnGitVersionYmlFile()
 
         this.configurationProvider.ProvideForDirectory(this.repoPath);
 
-        stringLogger.Length.ShouldBe(0);
+        var filePath = PathHelper.Combine(this.repoPath, ConfigurationFileLocator.DefaultFileName);
+        stringLogger.ShouldContain($"Found configuration file at '{filePath}'");
     }
 
     [Test]
diff --git a/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs b/src/GitVersion.Configuration.Tests/Configuration/Extensions.cs
@@ -13,6 +13,12 @@ public static IDisposable<string> SetupConfigFile(this IFileSystem fileSystem, s
         }
 
         var fullPath = PathHelper.Combine(path, fileName);
+        var directory = PathHelper.GetDirectoryName(fullPath);
+        if (!fileSystem.DirectoryExists(directory))
+        {
+            fileSystem.CreateDirectory(directory);
+        }
+
         fileSystem.WriteAllText(fullPath, text);
 
         return Disposable.Create(fullPath, () => fileSystem.Delete(fullPath));
diff --git a/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs b/src/GitVersion.Core.Tests/Core/DynamicRepositoryTests.cs
@@ -23,7 +23,7 @@ private static void ClearReadOnly(DirectoryInfo parentDirectory)
         }
     }
 
-    [OneTimeSetUp]
+    [SetUp]
     public void CreateTemporaryRepository()
     {
         // Note: we can't use guid because paths will be too long
@@ -41,15 +41,15 @@ public void CreateTemporaryRepository()
         Directory.CreateDirectory(this.workDirectory);
     }
 
-    [OneTimeTearDown]
+    [TearDown]
     public void Cleanup()
     {
     }
 
     // Note: use same name twice to see if changing commits works on same (cached) repository
     [NonParallelizable]
-    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]
     [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "2dc142a4a4df77db61a00d9fb7510b18b3c2c85a", "5.8.2-47")]
+    [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]
     public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)
     {
         var root = PathHelper.Combine(this.workDirectory, name);
diff --git a/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs b/src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs
@@ -17,7 +17,7 @@ public void RegisterTypes(IServiceCollection services)
         services.AddModule(new GitVersionConfigurationModule());
         services.AddModule(new GitVersionCoreModule());
 
-        services.AddSingleton<IFileSystem, TestFileSystem>();
+        services.AddSingleton<IFileSystem, FileSystem>();
         services.AddSingleton<IEnvironment, TestEnvironment>();
         services.AddSingleton<ILog, NullLog>();
     }
diff --git a/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs b/src/GitVersion.Core.Tests/Helpers/TestFileSystem.cs
diff --git a/src/GitVersion.Core.Tests/Helpers/TestStream.cs b/src/GitVersion.Core.Tests/Helpers/TestStream.cs
diff --git a/src/GitVersion.Core/Helpers/PathHelper.cs b/src/GitVersion.Core/Helpers/PathHelper.cs
@@ -26,6 +26,13 @@ public static string GetTempPath()
 
     public static string GetRepositoryTempPath() => Combine(GetTempPath(), "TestRepositories", Guid.NewGuid().ToString());
 
+    public static string GetDirectoryName(string? path)
+    {
+        ArgumentNullException.ThrowIfNull(path, nameof(path));
+
+        return Path.GetDirectoryName(path)!;
+    }
+
     public static string GetFullPath(string? path)
     {
         ArgumentNullException.ThrowIfNull(path, nameof(path));
diff --git a/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs b/src/GitVersion.Core/VersionCalculation/Caching/GitVersionCacheKeyFactory.cs
@@ -118,7 +118,7 @@ private List<string> CalculateDirectoryContents(string root)
                 {
                     var fi = new FileInfo(file);
                     result.Add(fi.Name);
-                    result.Add(File.ReadAllText(file));
+                    result.Add(this.fileSystem.ReadAllText(file));
                 }
                 catch (IOException e)
                 {
diff --git a/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj b/src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj
@@ -31,9 +31,7 @@
         <Compile Include="..\GitVersion.Core.Tests\Helpers\ExecutableHelper.cs" Link="Helpers\ExecutableHelper.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestEnvironment.cs" Link="Helpers\TestEnvironment.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
-        <Compile Include="..\GitVersion.Core.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitToolsTestingExtensions.cs" Link="Extensions\GitToolsTestingExtensions.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\GitVersionVariablesExtensions.cs" Link="Extensions\GitVersionVariablesExtensions.cs" />
         <Compile Include="..\GitVersion.Core.Tests\Extensions\MockCollectionExtensions.cs" Link="Extensions\MockCollectionExtensions.cs" />
diff --git a/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs b/src/GitVersion.Output.Tests/Output/AssemblyInfoFileUpdaterTests.cs
@@ -19,7 +19,7 @@ public class AssemblyInfoFileUpdaterTests : TestBase
     private string workingDir;
 
     [OneTimeSetUp]
-    public void OneTimeSetUp() => workingDir = PathHelper.Combine(PathHelper.GetTempPath(), "AssemblyInfoFileUpdaterTests");
+    public void OneTimeSetUp() => workingDir = PathHelper.Combine(PathHelper.GetTempPath(), nameof(AssemblyInfoFileUpdaterTests));
 
     [OneTimeTearDown]
     public void OneTimeTearDown() => DirectoryHelper.DeleteDirectory(workingDir);
@@ -93,7 +93,7 @@ public void ShouldCreateAssemblyInfoFilesAtPathWhenNotExistsAndEnsureAssemblyInf
     [TestCase("vb")]
     public void ShouldNotCreateAssemblyInfoFileWhenNotExistsAndNotEnsureAssemblyInfo(string fileExtension)
     {
-        var assemblyInfoFile = "VersionAssemblyInfo." + fileExtension;
+        var assemblyInfoFile = "NoVersionAssemblyInfo." + fileExtension;
         var fullPath = PathHelper.Combine(workingDir, assemblyInfoFile);
         var variables = this.variableProvider.GetVariablesFor(
             SemanticVersion.Parse("1.0.0", RegexPatterns.Configuration.DefaultTagPrefixPattern), EmptyConfigurationBuilder.New.Build(), 0
diff --git a/src/GitVersion.Output.Tests/Output/WixFileTests.cs b/src/GitVersion.Output.Tests/Output/WixFileTests.cs
@@ -95,6 +95,10 @@ public void UpdateWixVersionFileWhenFileAlreadyExists()
 
         // fake an already existing file
         var file = PathHelper.Combine(workingDir, WixVersionFileUpdater.WixVersionFileName);
+        if (!fileSystem.DirectoryExists(workingDir))
+        {
+            fileSystem.CreateDirectory(workingDir);
+        }
         fileSystem.WriteAllText(file, new('x', 1024 * 1024));
 
         wixVersionFileUpdater.Execute(versionVariables, new(workingDir));
diff --git a/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs b/src/GitVersion.Output/WixUpdater/WixVersionFileUpdater.cs
@@ -25,7 +25,15 @@ public void Execute(GitVersionVariables variables, WixVersionContext context)
         var root = doc.DocumentElement;
         doc.InsertBefore(xmlDecl, root);
 
-        this.fileSystem.Delete(this.wixVersionFile);
+        if (this.fileSystem.Exists(this.wixVersionFile))
+        {
+            this.fileSystem.Delete(this.wixVersionFile);
+        }
+
+        if (!this.fileSystem.DirectoryExists(context.WorkingDirectory))
+        {
+            this.fileSystem.CreateDirectory(context.WorkingDirectory);
+        }
         using var fs = this.fileSystem.OpenWrite(this.wixVersionFile);
         doc.Save(fs);
     }
diff --git a/src/GitVersion.sln.DotSettings b/src/GitVersion.sln.DotSettings
@@ -707,16 +707,11 @@ II.2.12 &lt;HandlesEvent /&gt;&#xD;
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsParsFormattingSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EPsi_002EJavaScript_002ECodeStyle_002ESettingsUpgrade_002EJsWrapperSettingsUpgrader/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/SettingsMigration/IsMigratorApplied/=JetBrains_002EReSharper_002EUnitTestFramework_002EMigrations_002EEnableDisabledProvidersMigration/@EntryIndexedValue">True</s:Boolean>
-
-
-	<s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
+  <s:Boolean x:Key="/Default/Environment/UnitTesting/SeparateAppDomainPerAssembly/@EntryValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/Environment/UnitTesting/ShadowCopy/@EntryValue">False</s:Boolean>
-
-
-
-
-	<s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
+  <s:String x:Key="/Default/FilterSettingsManager/AttributeFilterXml/@EntryValue">&lt;data /&gt;</s:String>
 	<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters /&gt;&lt;/data&gt;</s:String>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=asbjornu/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=gitversion/@EntryIndexedValue">True</s:Boolean>
-	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reacheable/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Reacheable/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=veyor/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Original file line number	Diff line number	Diff line change
`@@ -285,7 +285,8 @@ public void NoWarnOnGitVersionYmlFile()`
`285`	`285`
`286`	`286`	`this.configurationProvider.ProvideForDirectory(this.repoPath);`
`287`	`287`
`288`		`- stringLogger.Length.ShouldBe(0);`
	`288`	`+ var filePath = PathHelper.Combine(this.repoPath, ConfigurationFileLocator.DefaultFileName);`
	`289`	`+ stringLogger.ShouldContain($"Found configuration file at '{filePath}'");`
`289`	`290`	`}`
`290`	`291`
`291`	`292`	`[Test]`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ private static void ClearReadOnly(DirectoryInfo parentDirectory)`
`23`	`23`	`}`
`24`	`24`	`}`
`25`	`25`
`26`		`- [OneTimeSetUp]`
	`26`	`+ [SetUp]`
`27`	`27`	`public void CreateTemporaryRepository()`
`28`	`28`	`{`
`29`	`29`	`// Note: we can't use guid because paths will be too long`
`@@ -41,15 +41,15 @@ public void CreateTemporaryRepository()`
`41`	`41`	`Directory.CreateDirectory(this.workDirectory);`
`42`	`42`	`}`
`43`	`43`
`44`		`- [OneTimeTearDown]`
	`44`	`+ [TearDown]`
`45`	`45`	`public void Cleanup()`
`46`	`46`	`{`
`47`	`47`	`}`
`48`	`48`
`49`	`49`	`// Note: use same name twice to see if changing commits works on same (cached) repository`
`50`	`50`	`[NonParallelizable]`
`51`		`- [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]`
`52`	`51`	`[TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "2dc142a4a4df77db61a00d9fb7510b18b3c2c85a", "5.8.2-47")]`
	`52`	`+ [TestCase("GV_main", "https://github.com/GitTools/GitVersion", MainBranch, "efddf2f92c539a9c27f1904d952dcab8fb955f0e", "5.8.2-56")]`
`53`	`53`	`public void FindsVersionInDynamicRepo(string name, string url, string targetBranch, string commitId, string expectedFullSemVer)`
`54`	`54`	`{`
`55`	`55`	`var root = PathHelper.Combine(this.workDirectory, name);`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ public void RegisterTypes(IServiceCollection services)`
`17`	`17`	`services.AddModule(new GitVersionConfigurationModule());`
`18`	`18`	`services.AddModule(new GitVersionCoreModule());`
`19`	`19`
`20`		`- services.AddSingleton<IFileSystem, TestFileSystem>();`
	`20`	`+ services.AddSingleton<IFileSystem, FileSystem>();`
`21`	`21`	`services.AddSingleton<IEnvironment, TestEnvironment>();`
`22`	`22`	`services.AddSingleton<ILog, NullLog>();`
`23`	`23`	`}`
Original file line number	Diff line number	Diff line change
`@@ -118,7 +118,7 @@ private List<string> CalculateDirectoryContents(string root)`
`118`	`118`	`{`
`119`	`119`	`var fi = new FileInfo(file);`
`120`	`120`	`result.Add(fi.Name);`
`121`		`- result.Add(File.ReadAllText(file));`
	`121`	`+ result.Add(this.fileSystem.ReadAllText(file));`
`122`	`122`	`}`
`123`	`123`	`catch (IOException e)`
`124`	`124`	`{`