Made the VersionAndBranchFinder tests a bit more DRY

Author: asbjornu

src/GitVersionTask.Tests/VersionAndBranchFinderTests.cs

@@ -51,35 +51,18 @@ public void CacheFileExistsOnDisk()
 CommitDate: 2015-11-10
 ";
 
-        var infoBuilder = new StringBuilder();
-        Action<string> infoLogger = s => { infoBuilder.AppendLine(s); };
-
-        Logger.SetLoggers(infoLogger, null, null);
-
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        var info = RepositoryScope((fixture, vv, fs) =>
         {
-            var fileSystem = new FileSystem();
-            fixture.Repository.MakeACommit();
-            var vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fileSystem);
-
-            vv.AssemblySemVer.ShouldBe("0.1.0.0");
-
-            vv.FileName.ShouldNotBeNullOrEmpty();
-
-            fileSystem.WriteAllText(vv.FileName, versionCacheFileContent);
+            fs.WriteAllText(vv.FileName, versionCacheFileContent);
 
             // I would rather see that VersionAndBranchFinder was non-static and could be reinstantiated to
             // clear the in-memory cache, but that's not the case, so I have to perform this ugly hack. @asbjornu
             VersionAndBranchFinder.VersionCacheVersions = new ConcurrentDictionary<string, VersionVariables>();
 
-            vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fileSystem);
+            vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fs);
 
             vv.AssemblySemVer.ShouldBe("4.10.3.0");
-        }
-
-        var info = infoBuilder.ToString();
-
-        Console.WriteLine(info);
+        });
 
         info.ShouldContain("Deserializing version variables from cache file", () => info);
     }
@@ -88,29 +71,11 @@ public void CacheFileExistsOnDisk()
     [Test]
     public void CacheFileExistsInMemory()
     {
-        var infoBuilder = new StringBuilder();
-        Action<string> infoLogger = s => { infoBuilder.AppendLine(s); };
-
-        Logger.SetLoggers(infoLogger, null, null);
-
-        using (var fixture = new EmptyRepositoryFixture(new Config()))
+        var info = RepositoryScope((fixture, vv, fs) =>
         {
-            var fileSystem = new FileSystem();
-            fixture.Repository.MakeACommit();
-            var vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fileSystem);
-
+            vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fs);
             vv.AssemblySemVer.ShouldBe("0.1.0.0");
-
-            vv.FileName.ShouldNotBeNullOrEmpty();
-
-            vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fileSystem);
-
-            vv.AssemblySemVer.ShouldBe("0.1.0.0");
-        }
-
-        var info = infoBuilder.ToString();
-
-        Console.WriteLine(info);
+        });
 
         info.ShouldContain("yml not found", () => info);
         info.ShouldNotContain("Deserializing version variables from cache file", () => info);
@@ -119,6 +84,13 @@ public void CacheFileExistsInMemory()
 
     [Test]
     public void CacheFileIsMissing()
+    {
+        var info = RepositoryScope();
+        info.ShouldContain("yml not found", () => info);
+    }
+
+
+    static string RepositoryScope(Action<EmptyRepositoryFixture, VersionVariables, IFileSystem> fixtureAction = null)
     {
         var infoBuilder = new StringBuilder();
         Action<string> infoLogger = s => { infoBuilder.AppendLine(s); };
@@ -132,9 +104,14 @@ public void CacheFileIsMissing()
             var vv = VersionAndBranchFinder.GetVersion(fixture.RepositoryPath, null, false, fileSystem);
 
             vv.AssemblySemVer.ShouldBe("0.1.0.0");
+            vv.FileName.ShouldNotBeNullOrEmpty();
+
+            if (fixtureAction != null)
+            {
+                fixtureAction(fixture, vv, fileSystem);
+            }
         }
 
-        var info = infoBuilder.ToString();
-        info.ShouldContain("yml not found", () => info);
+        return infoBuilder.ToString();
     }
 }