bug 199846: [Patch] Misuse of the Fuzz Factor (tests)

61 files changed, 1327 insertions, 18 deletions

diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java
index 68780919f..a3d27f103 100644
--- a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/PatchTest.java
@@ -52,7 +52,6 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.FileLocator;
 import org.eclipse.core.runtime.IPath;
 import org.eclipse.core.runtime.IStatus;
-import org.eclipse.core.runtime.NullProgressMonitor;
 import org.eclipse.core.runtime.Path;
 import org.eclipse.core.runtime.Platform;
 import org.eclipse.core.runtime.Status;
@@ -187,37 +186,37 @@ public class PatchTest extends TestCase {
 	//Test creation of new workspace patch 
 	public void testWorkspacePatch_Create(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{"addition.txt", "addition.txt"}, "patch_workspacePatchAddition.txt", new String[] { "exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, false, false);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		patchWorkspace(new String[]{"addition.txt", "addition.txt"}, "patch_workspacePatchAddition.txt", new String[] { "exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, false, 0);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	}
 	
 	//Test applying the reverse of workspace creation patch 
 	public void testWorkspacePatch_Create_Reverse(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, "patch_workspacePatchAddition.txt", new String[] {"addition.txt", "addition.txt"}, true, false);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
+		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt"}, "patch_workspacePatchAddition.txt", new String[] {"addition.txt", "addition.txt"}, true, 0);   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$
 	}
 	
 	//Test the patching of an already existing file, the creation of a new one and the deletion of elements in a file
 	public void testWorkspacePatch_Modify(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, "patch_workspacePatchMod.txt", new String[] { "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, false, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+		patchWorkspace(new String[]{"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, "patch_workspacePatchMod.txt", new String[] { "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, false, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 	}
 	
 	//Test applying the reverse of a workspace modify patch
 	public void testWorkspacePatch_Modify_Reverse(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{ "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, "patch_workspacePatchMod.txt", new String[] {"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, true, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
+		patchWorkspace(new String[]{ "exp_workspacePatchMod1.txt","exp_workspacePatchMod2.txt", "exp_workspacePatchMod3.txt"}, "patch_workspacePatchMod.txt", new String[] {"exp_workspacePatchAddition2.txt","exp_workspacePatchAddition.txt", "addition.txt"}, true, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$
 	}
 	
 	//Tests the deletion of an already existing file, and the modification of another file
 	public void testWorkspacePatch_Delete(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, "patch_workspacePatchDelete.txt", new String[] { "addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt"}, false, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+		patchWorkspace(new String[]{"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, "patch_workspacePatchDelete.txt", new String[] { "addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt"}, false, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
 	}
 	
 	//Test applying the reverse of a workspace deletion patch
 	public void testWorkspacePatch_Delete_Reverse(){
 		//Note the order that exists in the array of expected results is based purely on the order of the files in the patch 
-		patchWorkspace(new String[]{"addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt" }, "patch_workspacePatchDelete.txt", new String[] {"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, true, false );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
+		patchWorkspace(new String[]{"addition.txt","exp_workspacePatchDelete2.txt", "addition.txt", "exp_workspacePatchDelete1.txt" }, "patch_workspacePatchDelete.txt", new String[] {"exp_workspacePatchMod2.txt","addition.txt", "exp_workspacePatchMod1.txt","addition.txt"}, true, 0 );   //$NON-NLS-1$//$NON-NLS-2$//$NON-NLS-3$ //$NON-NLS-4$ //$NON-NLS-5$ //$NON-NLS-6$ //$NON-NLS-7$ //$NON-NLS-8$ //$NON-NLS-9$
 	}
 	
 	// Keeps track of the failures
@@ -250,11 +249,24 @@ public class PatchTest extends TestCase {
 			String msg = "Test for subfolder [patchdata/" + subfolder
 					+ "] failed.";
 
+			// get the fuzz factor for the patch if provided
+			// TODO: what if fuzz > 3
+			String patch = filenames[1].substring(subfolder.length());
+			int fuzz = -1;
+			if (patch.indexOf("fuzz3") > -1 || patch.indexOf("f3") > -1)
+				fuzz = 3;
+			if (patch.indexOf("fuzz2") > -1 || patch.indexOf("f2") > -1)
+				fuzz = 2;
+			if (patch.indexOf("fuzz1") > -1 || patch.indexOf("f1") > -1)
+				fuzz = 1;
+			if (patch.indexOf("fuzz0") > -1 || patch.indexOf("f0") > -1)
+				fuzz = 0;
+			
 			try {
 				// test with expected result
 				patchWorkspace(msg, new String[] { filenames[0] },
 						filenames[1], new String[] { filenames[2] }, false,
-						true);
+						fuzz);
 			} catch (AssertionFailedError e) {
 				failures.add(e);
 			}
@@ -264,7 +276,7 @@ public class PatchTest extends TestCase {
 				try {
 					patchWorkspace(msg, new String[] { filenames[0] },
 							filenames[1], new String[] { filenames[3] }, false,
-							true);
+							fuzz);
 				} catch (AssertionFailedError e) {
 					// a failure is expected
 					continue; // continue with a next subfolder
@@ -520,30 +532,33 @@ public class PatchTest extends TestCase {
 	
 	private void patchWorkspace(String[] originalFiles, String patch,
 			String[] expectedOutcomeFiles, boolean reverse,
-			boolean guessFuzzFactor) {
+			int fuzzFactor) {
 		patchWorkspace(null, originalFiles, patch, expectedOutcomeFiles,
-				reverse, guessFuzzFactor);
+				reverse, fuzzFactor);
 	}
 	
 	/**
 	 * Parses a workspace patch and applies the diffs to the appropriate files
+	 * 
 	 * @param msg
 	 * @param originalFiles
 	 * @param patch
 	 * @param expectedOutcomeFiles
 	 * @param reverse
-	 * @param guessFuzzFactor TODO
+	 * @param fuzzFactor
+	 *            The fuzz factor to use, ranging from 0 (all context must
+	 *            match) to 2 (the default maximum fuzz factor). <code>-1</code>
+	 *            means that the fuzz factor should be calculated automatically.
 	 */
-	private void patchWorkspace(String msg, String[] originalFiles, String patch, String[] expectedOutcomeFiles, boolean reverse, boolean guessFuzzFactor) {
+	private void patchWorkspace(String msg, String[] originalFiles, String patch, String[] expectedOutcomeFiles, boolean reverse, int fuzzFactor) {
 		
 		//ensure that we have the same number of input files as we have expected files
 		Assert.assertEquals(originalFiles.length, expectedOutcomeFiles.length);
 		
-		//Parse the passed in patch and extract all the Diffs
-		WorkspacePatcher patcher= new WorkspacePatcher();
+		// Parse the passed in patch and extract all the Diffs
+		WorkspacePatcher patcher = new WorkspacePatcher();
 		try {
-			if (guessFuzzFactor)
-				patcher.getConfiguration().setFuzz(patcher.guessFuzzFactor(new NullProgressMonitor()));
+			patcher.getConfiguration().setFuzz(fuzzFactor);
 			patcher.parse(getReader(patch));
 			patcher.setReversed(reverse);
 		} catch (IOException e) {
@@ -558,7 +573,6 @@ public class PatchTest extends TestCase {
 		for (int i = 0; i < originalFiles.length; i++) {	
 			LineReader lr= new LineReader(getReader(originalFiles[i]));
 			List inLines= lr.readLines();
-			
 		
 			FileDiffResult diffResult = patcher.getDiffResult(diffs[i]);
 			diffResult.patch(inLines, null);
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt
new file mode 100644
index 000000000..b2ee727be
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q]
+[R]
+[S]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt
new file mode 100644
index 000000000..81677b1cd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D1]
+[E1]
+[F1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q1]
+[R1]
+[S1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
new file mode 100644
index 000000000..3ba685e04
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f1/patch.txt
@@ -0,0 +1,30 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [a]
+ [b]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [g]
+ [h]
+ [i]
+@@ -14,3 +14,3 @@
+ [Xn]
+ [o]
+ [p]
+-[Q]
+-[R]
+-[S]
++[Q1]
++[R1]
++[S1]
+ [t]
+ [u]
+ [Xv]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt
new file mode 100644
index 000000000..b2ee727be
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q]
+[R]
+[S]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt
new file mode 100644
index 000000000..cef20d893
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/exp_context.txt
@@ -0,0 +1,22 @@
+[a]
+[b]
+[c]
+[D1]
+[E1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q1]
+[R1]
+[S1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
new file mode 100644
index 000000000..34607db08
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f0-f2/patch.txt
@@ -0,0 +1,29 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,2 @@
+ [a]
+ [b]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
+ [g]
+ [h]
+ [i]
+@@ -14,3 +14,3 @@
+ [Xn]
+ [o]
+ [p]
+-[Q]
+-[R]
+-[S]
++[Q1]
++[R1]
++[S1]
+ [t]
+ [Xu]
+ [Xv]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt
new file mode 100644
index 000000000..b2ee727be
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q]
+[R]
+[S]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt
new file mode 100644
index 000000000..81677b1cd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D1]
+[E1]
+[F1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q1]
+[R1]
+[S1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
new file mode 100644
index 000000000..3d76d2f03
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_autofuzz-f1-f0/patch.txt
@@ -0,0 +1,30 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [Xa]
+ [b]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [g]
+ [h]
+ [Xi]
+@@ -14,3 +14,3 @@
+ [n]
+ [o]
+ [p]
+-[Q]
+-[R]
+-[S]
++[Q1]
++[R1]
++[S1]
+ [t]
+ [u]
+ [v]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt
new file mode 100644
index 000000000..5e32be6d2
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q]
+[R]
+[S]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt
new file mode 100644
index 000000000..b56e62266
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/exp_context.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[d]
+[E1]
+[F1]
+[F2]
+[F3]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q1]
+[R1]
+[S1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
new file mode 100644
index 000000000..835f8a9d2
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_shift_autofuzz-1/patch.txt
@@ -0,0 +1,30 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,2 +1,4 @@
+ [b]
+ [c]
+ [d]
+-[E]
+-[F]
++[E1]
++[F1]
++[F2]
++[F3]
+ [g]
+ [h]
+ [Xi]
+@@ -10,3 +10,3 @@
+ [n]
+ [o]
+ [p]
+-[Q]
+-[R]
+-[S]
++[Q1]
++[R1]
++[S1]
+ [t]
+ [Xu]
+ [Xv]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt
new file mode 100644
index 000000000..b2ee727be
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q]
+[R]
+[S]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt
new file mode 100644
index 000000000..81677b1cd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D1]
+[E1]
+[F1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[Q1]
+[R1]
+[S1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt
new file mode 100644
index 000000000..61c9dd7ed
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch/patch.txt
@@ -0,0 +1,30 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -2,3 +2,3 @@
+ [n]
+ [o]
+ [p]
+-[Q]
+-[R]
+-[S]
++[Q1]
++[R1]
++[S1]
+ [t]
+ [u]
+ [v]
+@@ -10,3 +10,3 @@
+ [a]
+ [b]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [g]
+ [h]
+ [i]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt
new file mode 100644
index 000000000..13e0a711f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[U]
+[V]
+[W]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt
new file mode 100644
index 000000000..874cff7c7
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[U1]
+[V1]
+[W1]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt
new file mode 100644
index 000000000..c1cf70552
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/2hunks_switch_fail/patch.txt
@@ -0,0 +1,27 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [r]
+ [s]
+ [t]
+-[U]
+-[V]
+-[W]
++[U1]
++[V1]
++[W1]
+@@ -20,3 +20,3 @@
+ [a]
+ [b]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [g]
+ [h]
+ [i]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt
new file mode 100644
index 000000000..797069b6d
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt
new file mode 100644
index 000000000..4a9f7fac9
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/exp_context.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[M1]
+[M2]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt
new file mode 100644
index 000000000..5dfe64562
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_autofuzz-f2/patch.txt
@@ -0,0 +1,13 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -11,6 +11,8 @@
+ [Xk]
+ [l]
+ [M]
++[M1]
++[M2]
+ [n]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt
new file mode 100644
index 000000000..797069b6d
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt
new file mode 100644
index 000000000..10d8b7ee4
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/exp_context.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[M1]
+[M2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt
new file mode 100644
index 000000000..dcaab1a9f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/addition_shift_f3_misplaced/patch_f3.txt
@@ -0,0 +1,13 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,6 +1,8 @@
+ [Xk]
+ [Xl]
+ [XM]
++[M1]
++[M2]
+ [Xn]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt
new file mode 100644
index 000000000..d37d4944f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d1]
+[e1]
+[f1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt
new file mode 100644
index 000000000..7cfd84546
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f1/patch.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [X]
+ [b]
+ [c]
+-[d]
+-[e]
+-[f]
++[d1]
++[e1]
++[f1]
+ [g]
+ [h]
+ [X]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt
new file mode 100644
index 000000000..79b778f08
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[K]
+[L]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt
new file mode 100644
index 000000000..c4c771149
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[K1]
+[L1]
+[M1]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt
new file mode 100644
index 000000000..d88d1bbd7
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autofuzz-f2/patch.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -8,3 +8,3 @@
+ [Xh]
+ [i]
+ [j]
+-[K]
+-[L]
+-[M]
++[K1]
++[L1]
++[M1]
+ [n]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt
new file mode 100644
index 000000000..002737a90
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/context.txt
@@ -0,0 +1,23 @@
+[A]
+[B]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt
new file mode 100644
index 000000000..b521f7b36
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/exp_context.txt
@@ -0,0 +1,23 @@
+[A1]
+[B1]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt
new file mode 100644
index 000000000..888cfb4a5
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_begin/patch_f1.txt
@@ -0,0 +1,12 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -10,5 +10,5 @@
+-[A]
+-[B]
++[A1]
++[B1]
+ [c]
+ [d]
+ [Xe]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt
new file mode 100644
index 000000000..38fe86b1b
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[V]
+[W]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt
new file mode 100644
index 000000000..05bc337e0
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[V1]
+[W1]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt
new file mode 100644
index 000000000..88e9ab77a
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/autoshift_fuzz1_end/patch_f1.txt
@@ -0,0 +1,12 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -10,5 +10,5 @@
+ [Xs]
+ [t]
+ [u]
+-[V]
+-[W]
++[V1]
++[W1]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt
new file mode 100644
index 000000000..797069b6d
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt
new file mode 100644
index 000000000..e9fc546fd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/exp_context.txt
@@ -0,0 +1,22 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt
new file mode 100644
index 000000000..f28499baa
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_autofuzz/patch.txt
@@ -0,0 +1,12 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,7 +1,6 @@
+ [Xj]
+ [Xk]
+ [l]
+-[M]
+ [n]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt
new file mode 100644
index 000000000..797069b6d
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt
new file mode 100644
index 000000000..e9fc546fd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/exp_context.txt
@@ -0,0 +1,22 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt
new file mode 100644
index 000000000..df3b4e25e
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f2/patch_f2.txt
@@ -0,0 +1,12 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -9,7 +9,6 @@
+ [Xj]
+ [k]
+ [l]
+-[M]
+ [n]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt
new file mode 100644
index 000000000..7a2ba8960
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[M]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt
new file mode 100644
index 000000000..75e0e7f5a
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/exp_context.txt
@@ -0,0 +1,22 @@
+[a]
+[b]
+[c]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[M]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt
new file mode 100644
index 000000000..42e9b37fd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/deletion_shift_f3_missplaced/patch_f3.txt
@@ -0,0 +1,12 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -9,7 +9,6 @@
+ [Xj]
+ [Xk]
+ [Xl]
+-[M]
+ [Xn]
+ [Xo]
+ [Xp]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt
new file mode 100644
index 000000000..d37d4944f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[d1]
+[e1]
+[f1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt
new file mode 100644
index 000000000..7cfd84546
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz1/patch_f1.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [X]
+ [b]
+ [c]
+-[d]
+-[e]
+-[f]
++[d1]
++[e1]
++[f1]
+ [g]
+ [h]
+ [X]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt
new file mode 100644
index 000000000..fa9d686d2
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt
new file mode 100644
index 000000000..594a6e64e
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D1]
+[E1]
+[F1]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt
new file mode 100644
index 000000000..42b3051c8
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/fuzz2/patch_f2.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -1,3 +1,3 @@
+ [Xa]
+ [Xb]
+ [c]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [g]
+ [Xh]
+ [Xi]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt
new file mode 100644
index 000000000..f9cf77541
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[e]
+[f]
+[g]
+[h]
+[i]
+[c]
+[D]
+[e]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[c]
+[D]
+[e]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt
new file mode 100644
index 000000000..f7efc5a97
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[e]
+[f]
+[g]
+[h]
+[i]
+[c]
+[D1]
+[e]
+[m]
+[n]
+[o]
+[p]
+[q]
+[r]
+[s]
+[t]
+[c]
+[D]
+[e]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt
new file mode 100644
index 000000000..84a23fc8f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shift_correct/patch_f0.txt
@@ -0,0 +1,9 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -13,3 +13,3 @@
+ [c]
+-[D]
++[D1]
+ [e]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt
new file mode 100644
index 000000000..4c4c9e80e
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[D]
+[E]
+[F]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt
new file mode 100644
index 000000000..de760d87a
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[D1]
+[E1]
+[F1]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt
new file mode 100644
index 000000000..cc49c04ee
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f0/patch_f0.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -2,3 +2,3 @@
+ [l]
+ [m]
+ [n]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [r]
+ [s]
+ [t]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt
new file mode 100644
index 000000000..4c4c9e80e
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[D]
+[E]
+[F]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt
new file mode 100644
index 000000000..de760d87a
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/exp_context.txt
@@ -0,0 +1,23 @@
+[a]
+[b]
+[c]
+[D]
+[E]
+[F]
+[g]
+[h]
+[i]
+[j]
+[k]
+[l]
+[m]
+[n]
+[D1]
+[E1]
+[F1]
+[r]
+[s]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt
new file mode 100644
index 000000000..416d30b4b
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/src/org/eclipse/compare/tests/patchdata/shiftdown_f2/patch_f2.txt
@@ -0,0 +1,17 @@
+#
+diff -u -N context.txt context.txt
+--- context.txt	2007-06-27 08:50:46.000000603 -0400
++++ context.txt	2007-07-11 17:24:45.000000000 -0400
+@@ -5,3 +5,3 @@
+ [Xl]
+ [Xm]
+ [n]
+-[D]
+-[E]
+-[F]
++[D1]
++[E1]
++[F1]
+ [r]
+ [Xs]
+ [Xt]