Make testing patches simple

Author: yorah

LibGit2Sharp.Tests/DiffTreeToTreeFixture.cs

@@ -323,77 +323,8 @@ public void CanCompareTwoVersionsOfAFileWithADiffOfTwoHunks()
                 Assert.Equal(1, treeEntryChanges.LinesDeleted);
 
                 Assert.Equal(Mode.Nonexistent, changes["my-name-does-not-feel-right.txt"].Mode);
-
-                var expected = new StringBuilder()
-                    .Append("diff --git a/numbers.txt b/numbers.txt\n")
-                    .Append("index 7909961..4e935b7 100644\n")
-                    .Append("--- a/numbers.txt\n")
-                    .Append("+++ b/numbers.txt\n")
-                    .Append("@@ -1,4 +1,5 @@\n")
-                    .Append(" 1\n")
-                    .Append("+2\n")
-                    .Append(" 3\n")
-                    .Append(" 4\n")
-                    .Append(" 5\n")
-                    .Append("@@ -8,8 +9,9 @@\n")
-                    .Append(" 8\n")
-                    .Append(" 9\n")
-                    .Append(" 10\n")
-                    .Append("-12\n")
-                    .Append("+11\n")
-                    .Append(" 12\n")
-                    .Append(" 13\n")
-                    .Append(" 14\n")
-                    .Append(" 15\n")
-                    .Append("+16\n");
-
-                Assert.Equal(expected.ToString(), treeEntryChanges.Patch);
-
-                expected = new StringBuilder()
-                    .Append("diff --git a/my-name-does-not-feel-right.txt b/my-name-does-not-feel-right.txt\n")
-                    .Append("deleted file mode 100644\n")
-                    .Append("index e8953ab..0000000\n")
-                    .Append("--- a/my-name-does-not-feel-right.txt\n")
-                    .Append("+++ /dev/null\n")
-                    .Append("@@ -1,4 +0,0 @@\n")
-                    .Append("-That's a terrible name!\n")
-                    .Append("-I don't like it.\n")
-                    .Append("-People look down at me and laugh. :-(\n")
-                    .Append("-Really!!!!\n")
-                    .Append("diff --git a/numbers.txt b/numbers.txt\n")
-                    .Append("index 7909961..4e935b7 100644\n")
-                    .Append("--- a/numbers.txt\n")
-                    .Append("+++ b/numbers.txt\n")
-                    .Append("@@ -1,4 +1,5 @@\n")
-                    .Append(" 1\n")
-                    .Append("+2\n")
-                    .Append(" 3\n")
-                    .Append(" 4\n")
-                    .Append(" 5\n")
-                    .Append("@@ -8,8 +9,9 @@\n")
-                    .Append(" 8\n")
-                    .Append(" 9\n")
-                    .Append(" 10\n")
-                    .Append("-12\n")
-                    .Append("+11\n")
-                    .Append(" 12\n")
-                    .Append(" 13\n")
-                    .Append(" 14\n")
-                    .Append(" 15\n")
-                    .Append("+16\n")
-                    .Append("diff --git a/super-file.txt b/super-file.txt\n")
-                    .Append("new file mode 100644\n")
-                    .Append("index 0000000..16bdf1d\n")
-                    .Append("--- /dev/null\n")
-                    .Append("+++ b/super-file.txt\n")
-                    .Append("@@ -0,0 +1,5 @@\n")
-                    .Append("+That's a terrible name!\n")
-                    .Append("+I don't like it.\n")
-                    .Append("+People look down at me and laugh. :-(\n")
-                    .Append("+Really!!!!\n")
-                    .Append("+Yeah! Better!\n");
-
-                Assert.Equal(expected.ToString(), changes.Patch);
+                Assert.Equal(GetExpectedPatch("f8d44d7...7252fe2-numbers.txt.patch"), treeEntryChanges.Patch);
+                Assert.Equal(GetExpectedPatch("f8d44d7...7252fe2.patch"), changes.Patch);
             }
         }
 

LibGit2Sharp.Tests/Resources/expected_patches/f8d44d7...7252fe2-numbers.txt.patch

@@ -0,0 +1,21 @@
+diff --git a/numbers.txt b/numbers.txt
+index 7909961..4e935b7 100644
+--- a/numbers.txt
++++ b/numbers.txt
+@@ -1,4 +1,5 @@
+ 1
++2
+ 3
+ 4
+ 5
+@@ -8,8 +9,9 @@
+ 8
+ 9
+ 10
+-12
++11
+ 12
+ 13
+ 14
+ 15
++16

LibGit2Sharp.Tests/Resources/expected_patches/f8d44d7...7252fe2.patch

@@ -0,0 +1,42 @@
+diff --git a/my-name-does-not-feel-right.txt b/my-name-does-not-feel-right.txt
+deleted file mode 100644
+index e8953ab..0000000
+--- a/my-name-does-not-feel-right.txt
++++ /dev/null
+@@ -1,4 +0,0 @@
+-That's a terrible name!
+-I don't like it.
+-People look down at me and laugh. :-(
+-Really!!!!
+diff --git a/numbers.txt b/numbers.txt
+index 7909961..4e935b7 100644
+--- a/numbers.txt
++++ b/numbers.txt
+@@ -1,4 +1,5 @@
+ 1
++2
+ 3
+ 4
+ 5
+@@ -8,8 +9,9 @@
+ 8
+ 9
+ 10
+-12
++11
+ 12
+ 13
+ 14
+ 15
++16
+diff --git a/super-file.txt b/super-file.txt
+new file mode 100644
+index 0000000..16bdf1d
+--- /dev/null
++++ b/super-file.txt
+@@ -0,0 +1,5 @@
++That's a terrible name!
++I don't like it.
++People look down at me and laugh. :-(
++Really!!!!
++Yeah! Better!

LibGit2Sharp.Tests/TestHelpers/BaseFixture.cs

@@ -221,5 +221,10 @@ protected string Touch(string parent, string file, string content = null)
 
             return file;
         }
+
+        protected string GetExpectedPatch(string patchFilename)
+        {
+            return File.ReadAllText(Path.Combine(ResourcesDirectory.FullName, "expected_patches/" + patchFilename));
+        }
     }
 }