Add tests for interdiff fuzzy diffing

Author: kerneltoast

Makefile.am

@@ -432,7 +432,14 @@ TESTS = tests/newline1/run-test \
 	tests/git-deleted-file/run-test \
 	tests/git-pure-rename/run-test \
 	tests/git-diff-edge-cases/run-test \
-	tests/malformed-diff-headers/run-test
+	tests/malformed-diff-headers/run-test \
+	tests/fuzzy1/run-test \
+	tests/fuzzy2/run-test \
+	tests/fuzzy3/run-test \
+	tests/fuzzy4/run-test \
+	tests/fuzzy5/run-test \
+	tests/fuzzy6/run-test \
+	tests/fuzzy7/run-test
 
 # Scanner tests (only when scanner-patchfilter is enabled)
 if USE_SCANNER_PATCHFILTER

tests/fuzzy1/run-test

@@ -0,0 +1,74 @@
+#!/bin/sh
+
+# This is an interdiff(1) testcase.
+# Test: Fuzzy diffing with one rejected hunk per patched file.
+
+
+. ${top_srcdir-.}/tests/common.sh
+
+cat << 'EOF' > patch1
+--- file
++++ file
+@@ -1,4 +1,4 @@
+-line 1
++LINE 1
+ line 2
+ line 3
+ line 4
+EOF
+
+cat << 'EOF' > patch2
+--- file
++++ file
+@@ -5,9 +5,6 @@
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+cat << 'EOF' > expected
+diff -u file file
+--- file
++++ file
+@@ -1,4 +1,4 @@ INTERDIFF: rejected hunk from patch1, cannot diff context
+-line 1
++LINE 1
+ line 2
+ line 3
+ line 4
+@@ -1,9 +1,4 @@
+-line 5
+-if
+-1
+-fi
+-if
+-2
+-fi
+-A
+-B
++line 1
++line 2
++line 3
++line 4
+@@ -5,9 +5,6 @@ INTERDIFF: rejected hunk from patch2, cannot diff context
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+${INTERDIFF} --fuzzy patch1 patch2 2>errors >output
+[ -s errors ] && exit 1
+
+cmp output expected || exit 1

tests/fuzzy2/run-test

@@ -0,0 +1,42 @@
+#!/bin/sh
+
+# This is an interdiff(1) testcase.
+# Test: Fuzzy diffing with line offsets successfully fuzzed.
+
+
+. ${top_srcdir-.}/tests/common.sh
+
+cat << 'EOF' > patch1
+--- file
++++ file
+@@ -5,9 +5,6 @@
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+cat << 'EOF' > patch2
+--- file
++++ file
+@@ -50,9 +50,6 @@
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+${INTERDIFF} --fuzzy patch1 patch2 2>errors >output
+[ -s errors ] && exit 1
+[ -s output ] && exit 1
+exit 0

tests/fuzzy3/run-test

@@ -0,0 +1,57 @@
+#!/bin/sh
+
+# This is an interdiff(1) testcase.
+# Test: Fuzzy diffing with differing context lines and line offsets fuzzed.
+
+
+. ${top_srcdir-.}/tests/common.sh
+
+cat << 'EOF' > patch1
+--- file
++++ file
+@@ -5,9 +5,6 @@
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+cat << 'EOF' > patch2
+--- file
++++ file
+@@ -50,9 +50,6 @@
+ line 6
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ B
+ C
+EOF
+
+cat << 'EOF' > expected
+diff -u file file
+--- file
++++ file
+@@ -2,6 +2,6 @@
+-line 6
++line 5
+ if
+ 1
+ fi
++A
+ B
+-C
+EOF
+
+${INTERDIFF} --fuzzy patch1 patch2 2>errors >output
+[ -s errors ] && exit 1
+
+cmp output expected || exit 1

tests/fuzzy4/run-test

@@ -0,0 +1,82 @@
+#!/bin/sh
+
+# This is an interdiff(1) testcase.
+# Test: Fuzzy diffing test of the optional N argument to --fuzzy. Triggers
+# rejects by setting the fuzz value to 1, when it could've been fuzzed with the
+# default fuzz value of 2 in `patch`.
+
+
+. ${top_srcdir-.}/tests/common.sh
+
+cat << 'EOF' > patch1
+--- file
++++ file
+@@ -5,9 +5,6 @@
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+EOF
+
+cat << 'EOF' > patch2
+--- file
++++ file
+@@ -50,9 +50,6 @@
+ line 6
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ B
+ C
+EOF
+
+cat << 'EOF' > expected
+diff -u file file
+--- file
++++ file
+@@ -2,9 +2,9 @@
+-line 6
++line 5
+ if
+ 1
+ fi
+ if
+ 2
+ fi
++A
+ B
+-C
+@@ -5,9 +5,6 @@ INTERDIFF: rejected hunk from patch1, cannot diff context
+ line 5
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ A
+ B
+@@ -50,9 +50,6 @@ INTERDIFF: rejected hunk from patch2, cannot diff context
+ line 6
+ if
+ 1
+-fi
+-if
+-2
+ fi
+ B
+ C
+EOF
+
+${INTERDIFF} --fuzzy=1 patch1 patch2 2>errors >output
+[ -s errors ] && exit 1
+
+cmp output expected || exit 1