Merge pull request #57 from 304NotModified/refactor-tests-assert

Refactor tests 2

Author: 304NotModified

Tests/PatchAssemblyTests.cs

@@ -10,7 +10,22 @@ public PatchAssemblyTests() : base("AssemblyToProcess")
         {
         }
 
-        protected override void AssertVersion(string version)
+        protected override void AssertProductionVersion(string version)
+        {
+            AssertVersionWithHeadAndSha(version);
+        }
+
+        protected override void AssertFileVersion(string version)
+        {
+            Assert.AreEqual("1.0.0.0", version);
+        }
+
+        protected override void AssertInformationalVersion(string version)
+        {
+            AssertVersionWithHeadAndSha(version);
+        }
+
+        private static void AssertVersionWithHeadAndSha(string version)
         {
             Assert.IsNotNull(version);
             Assert.IsNotEmpty(version);

Tests/PatchAssemblyTestsBase.cs

@@ -48,36 +48,40 @@ protected PatchAssemblyTestsBase(string assemblyName)
             _patchedAssembly = Assembly.LoadFile(_patchedAssemblyPath);
         }
 
+        protected abstract void AssertProductionVersion(string version);
+
+        protected abstract void AssertFileVersion(string version);
+
+        protected abstract void AssertInformationalVersion(string version);
+
         [Test]
         public void InformationalVersionSetCorrectly()
         {
             var customAttributes = GetAssemblyInformationalVersionAttribute(_patchedAssembly);
 
             // Assert
-            AssertVersion(customAttributes.InformationalVersion);
+            var version = customAttributes.InformationalVersion;
+            AssertInformationalVersion(version);
         }
-
+        
         [Test]
         public void FileVersionSetCorrectly()
         {
             var versionInfo = FileVersionInfo.GetVersionInfo(_patchedAssemblyPath);
-
-            Assert.IsNotNull(versionInfo.FileVersion);
-            Assert.IsNotEmpty(versionInfo.FileVersion);
-            Assert.AreEqual("1.0.0.0", versionInfo.FileVersion);
+            var version = versionInfo.FileVersion;
+            AssertFileVersion(version);
         }
-
+        
         [Test]
         public void ProductionVersionSetCorrectly()
         {
             var versionInfo = FileVersionInfo.GetVersionInfo(_patchedAssemblyPath);
 
             // Assert
-            AssertVersion(versionInfo.ProductVersion);
+            var version = versionInfo.ProductVersion;
+            AssertProductionVersion(version);
         }
-
-
-
+        
 #if(DEBUG)
         [Test]
         public void PeVerify()
@@ -86,10 +90,6 @@ public void PeVerify()
         }
 #endif
 
-
-        protected abstract void AssertVersion(string version);
-
-
         private static string GetAssemblyToPatchPath(string assemblyName)
         {
 

Tests/PatchExistingAssemblyTests.cs

@@ -9,7 +9,22 @@ public PatchExistingAssemblyTests() : base("AssemblyToProcessExistingAttribute")
         {
         }
 
-        protected override void AssertVersion(string version)
+        protected override void AssertProductionVersion(string version)
+        {
+            AssertVersionWithBranch(version);
+        }
+
+        protected override void AssertFileVersion(string version)
+        {
+            Assert.AreEqual("1.0.0.0", version);
+        }
+
+        protected override void AssertInformationalVersion(string version)
+        {
+            AssertVersionWithBranch(version);
+        }
+
+        private static void AssertVersionWithBranch(string version)
         {
             using (var repo = new Repository(Repository.Discover(TestContext.CurrentContext.TestDirectory)))
             {