updated test to use the globbing resolver

Author: arturcic

src/GitVersionExe.Tests/ArgumentParserTests.cs

@@ -1,3 +1,5 @@
+using System.IO;
+using GitTools.Testing;
 using GitVersion;
 using GitVersion.Logging;
 using GitVersion.Model;
@@ -17,11 +19,7 @@ public class ArgumentParserTests : TestBase
         [SetUp]
         public void SetUp()
         {
-            var sp = ConfigureServices(services =>
-            {
-                services.AddSingleton<IArgumentParser, ArgumentParser>();
-            });
-            argumentParser = sp.GetService<IArgumentParser>();
+            argumentParser = GetArgumentParser();
         }
 
         [Test]
@@ -257,19 +255,50 @@ public void CreateMulitpleAssemblyInfoProtected(string command)
         [Test]
         public void UpdateAssemblyInfoWithFilename()
         {
-            var arguments = argumentParser.ParseArguments("-updateAssemblyInfo CommonAssemblyInfo.cs");
+            using var repo = new EmptyRepositoryFixture();
+
+            var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+            using var file = File.Create(assemblyFile);
+
+            var arguments = argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain("CommonAssemblyInfo.cs");
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
         }
 
         [Test]
         public void UpdateAssemblyInfoWithMultipleFilenames()
         {
-            var arguments = argumentParser.ParseArguments("-updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
+            using var repo = new EmptyRepositoryFixture();
+
+            var assemblyFile1 = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+            using var file = File.Create(assemblyFile1);
+
+            var assemblyFile2 = Path.Combine(repo.RepositoryPath, "VersionAssemblyInfo.cs");
+            using var file2 = File.Create(assemblyFile2);
+
+            var arguments = argumentParser.ParseArguments($"-targetpath {repo.RepositoryPath} -updateAssemblyInfo CommonAssemblyInfo.cs VersionAssemblyInfo.cs");
             arguments.UpdateAssemblyInfo.ShouldBe(true);
             arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(2);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain("CommonAssemblyInfo.cs");
-            arguments.UpdateAssemblyInfoFileName.ShouldContain("VersionAssemblyInfo.cs");
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("VersionAssemblyInfo.cs"));
+        }
+
+        [Test]
+        public void UpdateAssemblyInfoWithRelativeFilename()
+        {
+            using var repo = new EmptyRepositoryFixture();
+
+            var assemblyFile = Path.Combine(repo.RepositoryPath, "CommonAssemblyInfo.cs");
+            using var file = File.Create(assemblyFile);
+
+            var targetPath = Path.Combine(repo.RepositoryPath, "subdir1", "subdir2");
+            Directory.CreateDirectory(targetPath);
+
+            var arguments = argumentParser.ParseArguments($"-targetpath {targetPath} -updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
+            arguments.UpdateAssemblyInfo.ShouldBe(true);
+            arguments.UpdateAssemblyInfoFileName.Count.ShouldBe(1);
+            arguments.UpdateAssemblyInfoFileName.ShouldContain(x => Path.GetFileName(x).Equals("CommonAssemblyInfo.cs"));
         }
 
         [Test]
@@ -301,14 +330,6 @@ public void OverrideconfigWithInvalidOption(string options)
             exception.Message.ShouldContain("Could not parse /overrideconfig option");
         }
 
-        [Test]
-        public void UpdateAssemblyInfoWithRelativeFilename()
-        {
-            var arguments = argumentParser.ParseArguments("-updateAssemblyInfo ..\\..\\CommonAssemblyInfo.cs");
-            arguments.UpdateAssemblyInfo.ShouldBe(true);
-            arguments.UpdateAssemblyInfoFileName.ShouldContain("..\\..\\CommonAssemblyInfo.cs");
-        }
-
         [Test]
         public void EnsureAssemblyInfoTrueWhenFound()
         {
@@ -466,5 +487,22 @@ public void CheckVerbosityParsing(string command, bool shouldThrow, Verbosity ex
                 arguments.Verbosity.ShouldBe(expectedVerbosity);
             }
         }
+
+        private static IArgumentParser GetArgumentParser(IGlobbingResolver globbingResolver = null)
+        {
+            var sp = ConfigureServices(services =>
+            {
+                services.AddSingleton<IArgumentParser, ArgumentParser>();
+                if (globbingResolver != null)
+                {
+                    services.AddSingleton(globbingResolver);
+                }
+                else
+                {
+                    services.AddSingleton<IGlobbingResolver, GlobbingResolver>();
+                }
+            });
+            return sp.GetService<IArgumentParser>();
+        }
     }
 }