bug 150591: [Patch] Team -> Apply Patch and line endings

24 files changed, 320 insertions, 0 deletions

diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.patched.txt
new file mode 100644
index 000000000..78b304aa4
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.patched.txt
@@ -0,0 +1 @@
+[a]
[b]
[c]
[c1]
[c2]
[d]
[e]
[f]
[g]
[h]
[i1]
[j]
[k]
[l]
[m]
[n]
[p]
[q]
[r]
[s]
[s1]
[t]
[u]
[v]
[w]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.txt
new file mode 100644
index 000000000..4b8bce6dd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/context_cr.txt
@@ -0,0 +1 @@
+[a]
[b]
[c]
[d]
[e]
[f]
[g]
[h]
[i]
[j]
[k]
[l]
[m]
[n]
[o]
[p]
[q]
[r]
[s]
[t]
[u]
[v]
[w]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patchConfiguration.properties
new file mode 100644
index 000000000..fcdf72d5a
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patchConfiguration.properties
@@ -0,0 +1,8 @@
+# Single CR character is ignored in LineReader for the patch file 
+#(see org.eclipse.compare.internal.core.patch.PatchReader.parse(BufferedReader) 
+# line 97) This results in reading the patch as a single line and ending up with
+# an invalid patch format. Skip the test.
+skipTest=true
+patchFile=patch_cr.txt
+contextFile=context_cr.txt
+expectedResultFile=context_cr.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patch_cr.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patch_cr.txt
new file mode 100644
index 000000000..334439b9c
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_cr_cr/patch_cr.txt
@@ -0,0 +1 @@
+--- 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]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt
new file mode 100644
index 000000000..78b304aa4
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.patched.txt
@@ -0,0 +1 @@
+[a]
[b]
[c]
[c1]
[c2]
[d]
[e]
[f]
[g]
[h]
[i1]
[j]
[k]
[l]
[m]
[n]
[p]
[q]
[r]
[s]
[s1]
[t]
[u]
[v]
[w]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.txt
new file mode 100644
index 000000000..4b8bce6dd
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/context_cr.txt
@@ -0,0 +1 @@
+[a]
[b]
[c]
[d]
[e]
[f]
[g]
[h]
[i]
[j]
[k]
[l]
[m]
[n]
[o]
[p]
[q]
[r]
[s]
[t]
[u]
[v]
[w]
\ No newline at end of file
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt
new file mode 100644
index 000000000..ebe945ea1
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patch.txt
@@ -0,0 +1,20 @@
+--- 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]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties
new file mode 100644
index 000000000..e73536a48
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_cr_crlf_cr/patchConfiguration.properties
@@ -0,0 +1,3 @@
+patchFile=patch.txt
+contextFile=context_cr.txt
+expectedResultFile=context_cr.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt
new file mode 100644
index 000000000..c13853369
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.patched.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/context_crlf.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/patchdata/bug150591_crlf_crlf_crlf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt
new file mode 100644
index 000000000..ebe945ea1
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patch.txt
@@ -0,0 +1,20 @@
+--- 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]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties
new file mode 100644
index 000000000..11ffa568f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_crlf_crlf/patchConfiguration.properties
@@ -0,0 +1,3 @@
+patchFile=patch.txt
+contextFile=context_crlf.txt
+expectedResultFile=context_crlf.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt
new file mode 100644
index 000000000..c13853369
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.patched.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/context_crlf.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/patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties
new file mode 100644
index 000000000..4a78e024f
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/patchConfiguration.properties
@@ -0,0 +1,3 @@
+patchFile=patch_lf.txt
+contextFile=context_crlf.txt
+expectedResultFile=context_crlf.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/patch_lf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/patch_lf.txt
new file mode 100644
index 000000000..ebe945ea1
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_crlf_lf_crlf/patch_lf.txt
@@ -0,0 +1,20 @@
+--- 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]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt
new file mode 100644
index 000000000..c13853369
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.patched.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/context_lf.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/patchdata/bug150591_lf_crlf_lf/patch.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt
new file mode 100644
index 000000000..ebe945ea1
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patch.txt
@@ -0,0 +1,20 @@
+--- 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]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties
new file mode 100644
index 000000000..10c6fcbe0
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_crlf_lf/patchConfiguration.properties
@@ -0,0 +1,3 @@
+patchFile=patch.txt
+contextFile=context_lf.txt
+expectedResultFile=context_lf.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.patched.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.patched.txt
new file mode 100644
index 000000000..c13853369
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.patched.txt
@@ -0,0 +1,25 @@
+[a]
+[b]
+[c]
+[c1]
+[c2]
+[d]
+[e]
+[f]
+[g]
+[h]
+[i1]
+[j]
+[k]
+[l]
+[m]
+[n]
+[p]
+[q]
+[r]
+[s]
+[s1]
+[t]
+[u]
+[v]
+[w]
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.txt
new file mode 100644
index 000000000..1b8d4c7ca
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/context_lf.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/patchdata/bug150591_lf_lf_lf/patchConfiguration.properties b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/patchConfiguration.properties
new file mode 100644
index 000000000..ce3a65708
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/patchConfiguration.properties
@@ -0,0 +1,3 @@
+patchFile=patch_lf.txt
+contextFile=context_lf.txt
+expectedResultFile=context_lf.patched.txt
diff --git a/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/patch_lf.txt b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/patch_lf.txt
new file mode 100644
index 000000000..ebe945ea1
--- /dev/null
+++ b/tests/org.eclipse.compare.tests/patchdata/bug150591_lf_lf_lf/patch_lf.txt
@@ -0,0 +1,20 @@
+--- 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]