Bug 183226 - [Apply Patch] API to instantiate and apply arbitrary IHunks

12 files changed, 402 insertions, 0 deletions

diff --git a/tests/org.eclipse.compare.tests/patchdata/context_full.txt b/tests/org.eclipse.compare.tests/patchdata/context_full.txt
new file mode 100644
index 000000000..ff06fcb44
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/context_full.txt
@@ -0,0 +1,52 @@
+[a]

+[b]

+[c]

+[d]

+[e]

+[f]

+[g]

+[h]

+[i]

+[j]

+[k]

+[l]

+[m]

+[n]

+[o]

+[p]

+[q]

+[r]

+[s]

+[t]

+[u]

+[v]

+[w]

+[x]

+[y]

+[z]

+[A]

+[B]

+[C]

+[D]

+[E]

+[F]

+[G]

+[H]

+[I]

+[J]

+[K]

+[L]

+[M]

+[N]

+[O]

+[P]

+[Q]

+[R]

+[S]

+[T]

+[U]

+[V]

+[W]

+[X]

+[Y]

+[Z]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt
new file mode 100644
index 000000000..3d09ef1ad
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/exp_addHunks.txt
@@ -0,0 +1,59 @@
+[a1]

+[a2]

+[a]

+[b]

+[c]

+[d]

+[d1]

+[d2]

+[d3]

+[d4]

+[e]

+[f]

+[g]

+[h]

+[i]

+[j]

+[k]

+[l]

+[m]

+[n]

+[o]

+[p]

+[q]

+[r]

+[s]

+[t]

+[u]

+[v]

+[y]

+[z]

+[A]

+[B]

+[C]

+[D]

+[E]

+[F]

+[G]

+[H]

+[I]

+[J]

+[K]

+[L]

+[N]

+[N1]

+[N2]

+[O]

+[P]

+[Q]

+[R]

+[S]

+[T]

+[U]

+[V]

+[W]

+[W1]

+[W2]

+[W3]

+[Y]

+[Z]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt b/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt
new file mode 100644
index 000000000..7d137a8e3
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/exp_createFilePatch.txt
@@ -0,0 +1,27 @@
+[a1]

+[a2]

+[a3]

+[a]

+[b]

+[c]

+[f]

+[g]

+[h]

+[h1]

+[i]

+[j]

+[j1]

+[j2]

+[k]

+[l]

+[m]

+[n]

+[o]

+[p]

+[q]

+[r]

+[s]

+[t]

+[u]

+[v]

+[w]

diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt
new file mode 100644
index 000000000..c3e64d74b
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/exp_modifyHunks.txt
@@ -0,0 +1,28 @@
+[a]

+[b]

+[c]

+[d]

+[d1]

+[d2]

+[d3]

+[d4]

+[e]

+[f]

+[g]

+[h]

+[i1]

+[j]

+[k]

+[l]

+[m]

+[n]

+[o]

+[p]

+[q]

+[r]

+[s]

+[s1]

+[t]

+[u]

+[v]

+[w]

diff --git a/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt b/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt
new file mode 100644
index 000000000..68fc86fcd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/exp_removeHunks.txt
@@ -0,0 +1,51 @@
+[a]

+[b]

+[c]

+[d]

+[e]

+[f]

+[g]

+[h]

+[i]

+[j]

+[k]

+[l]

+[m]

+[n]

+[o]

+[p]

+[q]

+[r]

+[s]

+[t]

+[u]

+[v]

+[y]

+[z]

+[A]

+[B]

+[C]

+[D]

+[E]

+[F]

+[I]

+[J]

+[J1]

+[K]

+[L]

+[M]

+[N]

+[O]

+[P]

+[Q]

+[R]

+[S]

+[T]

+[U]

+[V]

+[W]

+[W1]

+[W2]

+[W3]

+[Y]

+[Z]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt
new file mode 100644
index 000000000..4c75b3d6e
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_addHunks.txt
@@ -0,0 +1,34 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/context_full.txt

+===================================================================

+RCS file: /TEST/Bug202944/tmp/context_full.txt,v

+retrieving revision 1.1

+diff -u -r1.1 context_full.txt

+--- tmp/context_full.txt	23 Feb 2009 09:39:56 -0000	1.1

++++ tmp/context_full.txt	23 Feb 2009 09:40:51 -0000

+@@ -1,3 +1,5 @@

++[a1]

++[a2]

+ [a]

+ [b]

+ [c]

+@@ -20,8 +22,6 @@

+ [t]

+ [u]

+ [v]

+-[w]

+-[x]

+ [y]

+ [z]

+ [A]

+@@ -47,6 +47,8 @@

+ [U]

+ [V]

+ [W]

+-[X]

++[W1]

++[W2]

++[W3]

+ [Y]

+ [Z]

diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt
new file mode 100644
index 000000000..f1de92aaf
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk0.txt
@@ -0,0 +1,19 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/list.txt

+===================================================================

+RCS file: /TEST/Bug202944/tmp/list.txt,v

+retrieving revision 1.2

+diff -u -r1.2 list.txt

+--- tmp/list.txt	20 Feb 2009 11:02:27 -0000	1.2

++++ tmp/list.txt	20 Feb 2009 11:03:29 -0000

+@@ -1,6 +1,8 @@

++[a1]

++[a2]

++[a3]

+ [a]

+ [b]

+-[c]

+ [d]

+ [e]

+ [f]

diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt
new file mode 100644
index 000000000..7b0fb2930
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk1.txt
@@ -0,0 +1,26 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/list.txt

+===================================================================

+RCS file: /TEST/Bug202944/tmp/list.txt,v

+retrieving revision 1.2

+diff -u -r1.2 list.txt

+--- tmp/list.txt	20 Feb 2009 11:02:27 -0000	1.2

++++ tmp/list.txt	20 Feb 2009 11:32:47 -0000

+@@ -1,13 +1,14 @@

+ [a]

+ [b]

+-[c]

+ [d]

+-[e]

+ [f]

+ [g]

+ [h]

++[h1]

+ [i]

+ [j]

++[j1]

++[j2]

+ [k]

+ [l]

+ [m]

diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt
new file mode 100644
index 000000000..2f64be799
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk2.txt
@@ -0,0 +1,12 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/a.txt

+===================================================================

+RCS file: tmp/a.txt

+diff -N tmp/a.txt

+--- /dev/null	1 Jan 1970 00:00:00 -0000

++++ tmp/a.txt	1 Jan 1970 00:00:00 -0000

+@@ -0,0 +1,3 @@

++[aa]

++[bb]

++[cc]

diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt
new file mode 100644
index 000000000..0bec1a205
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_createHunk3.txt
@@ -0,0 +1,14 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/a.txt

+===================================================================

+RCS file: /TEST/Bug202944/tmp/a.txt,v

+retrieving revision 1.1

+diff -u -r1.1 a.txt

+--- tmp/a.txt	20 Feb 2009 11:37:35 -0000	1.1

++++ tmp/a.txt	20 Feb 2009 11:38:40 -0000

+@@ -1,4 +0,0 @@

+-[aa]

+-[bb]

+-[cc]

+-[dd]

diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt
new file mode 100644
index 000000000..917b62b9b
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_modifyHunks.txt
@@ -0,0 +1,25 @@
+--- old.txt	2005-05-07 00:16:20.000000000 +0200

++++ new.txt	2005-05-07 00:16:32.000000000 +0200

+@@ -3,2 +3,4 @@

+ [c]

++[c1]

++[c2]

+ [d]

+@@ -8,3 +10,3 @@

+ [h]

+-[i]

++[i1]

+ [j]

+@@ -14,3 +16,2 @@

+ [n]

+-[o]

+ [p]

+@@ -19,2 +20,3 @@

+ [s]

++[s1]

+ [t]

+@@ -29,2 +31,3 @@

+ [yy]

++[xx]

+ [yy]

+ 
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt b/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt
new file mode 100644
index 000000000..860e39ad7
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/patch_removeHunks.txt
@@ -0,0 +1,55 @@
+### Eclipse Workspace Patch 1.0

+#P Bug202944

+Index: tmp/context_full.txt

+===================================================================

+RCS file: /TEST/Bug202944/tmp/context_full.txt,v

+retrieving revision 1.1

+diff -u -r1.1 context_full.txt

+--- tmp/context_full.txt	23 Feb 2009 09:39:56 -0000	1.1

++++ tmp/context_full.txt	23 Feb 2009 10:03:51 -0000

+@@ -1,3 +1,5 @@

++[a1]

++[a2]

+ [a]

+ [b]

+ [c]

+@@ -11,6 +13,8 @@

+ [k]

+ [l]

+ [m]

++[m1]

++[m2]

+ [n]

+ [o]

+ [p]

+@@ -20,8 +24,6 @@

+ [t]

+ [u]

+ [v]

+-[w]

+-[x]

+ [y]

+ [z]

+ [A]

+@@ -30,10 +32,9 @@

+ [D]

+ [E]

+ [F]

+-[G]

+-[H]

+ [I]

+ [J]

++[J1]

+ [K]

+ [L]

+ [M]

+@@ -47,6 +48,8 @@

+ [U]

+ [V]

+ [W]

+-[X]

++[W1]

++[W2]

++[W3]

+ [Y]

+ [Z]