#5 Add tests for fuzzy patching

Signed-off-by: Uilian Ries <uilianries@gmail.com>

Author: uilianries

patch_ng.py

@@ -1043,7 +1043,7 @@ def apply(self, strip=0, root=None, fuzz=False):
           # todo \ No newline at end of file
 
         # check hunks in source file
-        if lineno+1 < hunk.startsrc+len(hunkfind)-1:
+        if lineno+1 < hunk.startsrc+len(hunkfind):
           if line.rstrip(b"\r\n") == hunkfind[hunklineno]:
             hunklineno += 1
           else:

tests/10fuzzyafter/10fuzzyafter.patch

@@ -0,0 +1,9 @@
+diff --git a/Jamroot b/Jamroot
+index a6981dd..0c08f09 100644
+--- a/Jamroot
++++ b/Jamroot
+@@ -1,3 +1,4 @@
+ X
+ Y
++V
+ W

tests/10fuzzyafter/Jamroot

@@ -0,0 +1,3 @@
+X
+Y
+Z

tests/10fuzzyafter/[result]/Jamroot

@@ -0,0 +1,4 @@
+X
+Y
+V
+Z

tests/10fuzzybefore/10fuzzybefore.patch

@@ -0,0 +1,9 @@
+diff --git a/Jamroot b/Jamroot
+index a6981dd..0c08f09 100644
+--- a/Jamroot
++++ b/Jamroot
+@@ -1,3 +1,4 @@
+ T
+ YYYY
++V
+ Z

tests/10fuzzybefore/Jamroot

@@ -0,0 +1,3 @@
+X
+Y
+Z

tests/10fuzzybefore/[result]/Jamroot

@@ -0,0 +1,4 @@
+X
+Y
+V
+Z

tests/run_tests.py

@@ -151,7 +151,7 @@ def _run_test(self, testname):
       patch_tool = join(dirname(TESTS), "patch_ng.py")
       save_cwd = getcwdu()
       os.chdir(tmpdir)
-      extra = "-f" if testname == "10fuzzy" else ""
+      extra = "-f" if "10fuzzy" in testname else ""
       if verbose:
         cmd = '%s %s %s "%s"' % (sys.executable, patch_tool, extra, patch_file)
         print("\n"+cmd)
@@ -425,13 +425,27 @@ def test_delete_file(self):
         pto.apply(strip=0, root=treeroot)
         self.assertFalse(os.path.exists(os.path.join(treeroot, 'deleted')))
 
-    def test_fuzzy_patch(self):
+    def test_fuzzy_patch_both(self):
         treeroot = join(self.tmpdir, 'rootparent')
         shutil.copytree(join(TESTS, '10fuzzy'), treeroot)
         pto = patch_ng.fromfile(join(TESTS, '10fuzzy/10fuzzy.patch'))
         self.assertTrue(pto.apply(root=treeroot, fuzz=True))
         self.assertFalse(pto.apply(root=treeroot, fuzz=False))
 
+    def test_fuzzy_patch_before(self):
+        treeroot = join(self.tmpdir, 'rootparent')
+        shutil.copytree(join(TESTS, '10fuzzybefore'), treeroot)
+        pto = patch_ng.fromfile(join(TESTS, '10fuzzybefore/10fuzzybefore.patch'))
+        self.assertTrue(pto.apply(root=treeroot, fuzz=True))
+        self.assertFalse(pto.apply(root=treeroot, fuzz=False))
+
+    def test_fuzzy_patch_after(self):
+        treeroot = join(self.tmpdir, 'rootparent')
+        shutil.copytree(join(TESTS, '10fuzzyafter'), treeroot)
+        pto = patch_ng.fromfile(join(TESTS, '10fuzzyafter/10fuzzyafter.patch'))
+        self.assertTrue(pto.apply(root=treeroot, fuzz=True))
+        self.assertFalse(pto.apply(root=treeroot, fuzz=False))
+
 
 class TestHelpers(unittest.TestCase):
     # unittest setting