moved all Java stuff to java/ subdir

java/com.googlecode.java-diff-utils.test/src/diffutils/ApplyPatch.java

@@ -0,0 +1,27 @@
+package diffutils;
+
+import java.io.File;
+import java.util.List;
+
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+
+public class ApplyPatch extends Example {
+    static final String FS = File.separator;
+    static final String ORIGINAL = "test" + FS + "mocks" + FS + "issue10_base.txt";
+    static final String PATCH = "test" + FS + "mocks" + FS + "issue10_patch.txt";
+
+    public static void main(String[] args) throws PatchFailedException {
+        List<String> original = fileToLines(ORIGINAL);
+        List<String> patched  = fileToLines(PATCH);
+
+     // At first, parse the unified diff file and get the patch
+        Patch<String> patch = DiffUtils.parseUnifiedDiff(patched);
+
+        // Then apply the computed patch to the given text
+        List<String> result = DiffUtils.patch(original, patch);
+        System.out.println(result);
+        /// Or we can call patch.applyTo(original). There is no difference.
+    }
+}

java/com.googlecode.java-diff-utils.test/src/diffutils/ComputeDifference.java

@@ -0,0 +1,26 @@
+package diffutils;
+
+import java.io.File;
+import java.util.List;
+
+import difflib.Delta;
+import difflib.DiffUtils;
+import difflib.Patch;
+
+public class ComputeDifference extends Example {
+    static final String FS = File.separator;
+    static final String ORIGINAL = "test" + FS + "mocks" + FS + "original.txt";
+    static final String REVISED = "test" + FS + "mocks" + FS + "revised.txt";
+
+    public static void main(String[] args) {
+        List<String> original = fileToLines(ORIGINAL);
+        List<String> revised  = fileToLines(REVISED);
+
+        // Compute diff. Get the Patch object. Patch is the container for computed deltas.
+        Patch<String> patch = DiffUtils.diff(original, revised);
+
+        for (Delta<String> delta: patch.getDeltas()) {
+            System.out.println(delta);
+        }
+    }
+}

java/com.googlecode.java-diff-utils.test/src/diffutils/DiffTest.java

@@ -0,0 +1,61 @@
+package diffutils;
+
+import difflib.*;
+import junit.framework.TestCase;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collections;
+import java.util.List;
+
+public class DiffTest extends TestCase {
+
+    public void testDiff_Insert() {
+        final Patch<String> patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));
+        assertNotNull(patch);
+        assertEquals(1, patch.getDeltas().size());
+        final Delta<String> delta = patch.getDeltas().get(0);
+        assertEquals(InsertDelta.class, delta.getClass());
+        List<String> emptyList = Collections.emptyList();
+        assertEquals(new Chunk<String>(1, emptyList), delta.getOriginal());
+        assertEquals(new Chunk<String>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
+    }
+
+    public void testDiff_Delete() {
+        final Patch<String> patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg"));
+        assertNotNull(patch);
+        assertEquals(1, patch.getDeltas().size());
+        final Delta<String> delta = patch.getDeltas().get(0);
+        assertEquals(DeleteDelta.class, delta.getClass());
+        assertEquals(new Chunk<String>(0, Arrays.asList("ddd", "fff")), delta.getOriginal());
+        List<String> emptyList = Collections.emptyList();
+        assertEquals(new Chunk<String>(0, emptyList), delta.getRevised());
+    }
+
+    public void testDiff_Change() {
+        final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
+        final List<String> changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
+
+        final Patch<String> patch = DiffUtils.diff(changeTest_from, changeTest_to);
+        assertNotNull(patch);
+        assertEquals(1, patch.getDeltas().size());
+        final Delta<String> delta = patch.getDeltas().get(0);
+        assertEquals(ChangeDelta.class, delta.getClass());
+        assertEquals(new Chunk<String>(1, Arrays.asList("bbb")), delta.getOriginal());
+        assertEquals(new Chunk<String>(1, Arrays.asList("zzz")), delta.getRevised());
+    }
+
+    public void testDiff_EmptyList() {
+        final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
+        assertNotNull(patch);
+        assertEquals(0, patch.getDeltas().size());
+    }
+
+    public void testDiff_EmptyListWithNonEmpty() {
+        final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
+        assertNotNull(patch);
+        assertEquals(1, patch.getDeltas().size());
+        final Delta<String> delta = patch.getDeltas().get(0);
+        assertEquals(InsertDelta.class, delta.getClass());
+    }
+}

java/com.googlecode.java-diff-utils.test/src/diffutils/Example.java

@@ -0,0 +1,23 @@
+package diffutils;
+
+import java.io.BufferedReader;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+public class Example {
+    public static List<String> fileToLines(String filename) {
+        List<String> lines = new LinkedList<String>();
+        String line = "";
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(filename));
+            while ((line = in.readLine()) != null) {
+                lines.add(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return lines;
+    }
+}

java/com.googlecode.java-diff-utils.test/src/diffutils/GenerateUnifiedDiffTest.java

@@ -0,0 +1,128 @@
+package diffutils;
+
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+import junit.framework.TestCase;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.LinkedList;
+import java.util.List;
+
+public class GenerateUnifiedDiffTest extends TestCase {
+    private static final String FS = File.separator;
+    private static final String MOCK_FOLDER = "test" + FS + "mocks" + FS;
+
+    public List<String> fileToLines(String filename) {
+        List<String> lines = new LinkedList<String>();
+        String line = "";
+        try {
+            BufferedReader in = new BufferedReader(new FileReader(filename));
+            while ((line = in.readLine()) != null) {
+                lines.add(line);
+            }
+        } catch (IOException e) {
+            e.printStackTrace();
+            fail(e.getMessage());
+        }
+        return lines;
+    }
+
+    public void testGenerateUnified() {
+        List<String> origLines = fileToLines(MOCK_FOLDER + "original.txt");
+        List<String> revLines = fileToLines(MOCK_FOLDER + "revised.txt");
+
+        verify(origLines, revLines, "original.txt", "revised.txt");
+    }
+
+    public void testGenerateUnifiedWithOneDelta() {
+        List<String> origLines = fileToLines(MOCK_FOLDER + "one_delta_test_original.txt");
+        List<String> revLines = fileToLines(MOCK_FOLDER + "one_delta_test_revised.txt");
+
+        verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
+    }
+
+    public void testGenerateUnifiedDiffWithoutAnyDeltas() {
+        List<String> test = Arrays.asList("abc");
+        Patch<String> patch = DiffUtils.diff(test, test);
+        DiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
+    }
+
+    public void testDiff_Issue10() {
+        final List<String> baseLines = fileToLines(MOCK_FOLDER + "issue10_base.txt");
+        final List<String> patchLines = fileToLines(MOCK_FOLDER + "issue10_patch.txt");
+        final Patch<String> p = DiffUtils.parseUnifiedDiff(patchLines);
+        try {
+            DiffUtils.patch(baseLines, p);
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    /**
+     * Issue 12
+     */
+    public void testPatchWithNoDeltas() {
+        final List<String> lines1 = fileToLines(MOCK_FOLDER + "issue11_1.txt");
+        final List<String> lines2 = fileToLines(MOCK_FOLDER + "issue11_2.txt");
+        verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
+    }
+
+    public void testDiff5() {
+        final List<String> lines1 = fileToLines(MOCK_FOLDER + "5A.txt");
+        final List<String> lines2 = fileToLines(MOCK_FOLDER + "5B.txt");
+        verify(lines1, lines2, "5A.txt", "5B.txt");
+    }
+
+    /**
+     * Issue 19
+     */
+    public void testDiffWithHeaderLineInText() {
+        List<String> original = new ArrayList<String>();
+        List<String> revised  = new ArrayList<String>();
+
+        original.add("test line1");
+        original.add("test line2");
+        original.add("test line 4");
+        original.add("test line 5");
+
+        revised.add("test line1");
+        revised.add("test line2");
+        revised.add("@@ -2,6 +2,7 @@");
+        revised.add("test line 4");
+        revised.add("test line 5");
+
+        Patch<String> patch = DiffUtils.diff(original, revised);
+        List<String> udiff = DiffUtils.generateUnifiedDiff("original", "revised",
+                original, patch, 10);
+        DiffUtils.parseUnifiedDiff(udiff);
+    }
+
+    private void verify(List<String> origLines, List<String> revLines,
+            String originalFile, String revisedFile) {
+        Patch<String> patch = DiffUtils.diff(origLines, revLines);
+        List<String> unifiedDiff = DiffUtils.generateUnifiedDiff(originalFile, revisedFile,
+                origLines, patch, 10);
+
+        Patch<String> fromUnifiedPatch = DiffUtils.parseUnifiedDiff(unifiedDiff);
+        List<String> patchedLines;
+        try {
+            patchedLines = (List<String>) fromUnifiedPatch.applyTo(origLines);
+            assertTrue(revLines.size() == patchedLines.size());
+            for (int i = 0; i < revLines.size(); i++) {
+                String l1 = revLines.get(i);
+                String l2 = patchedLines.get(i);
+                if (!l1.equals(l2)) {
+                    fail("Line " + (i + 1) + " of the patched file did not match the revised original");
+                }
+            }
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+}

java/com.googlecode.java-diff-utils.test/src/diffutils/PatchTest.java

@@ -0,0 +1,48 @@
+package diffutils;
+
+import difflib.DiffUtils;
+import difflib.Patch;
+import difflib.PatchFailedException;
+import junit.framework.TestCase;
+
+import java.util.Arrays;
+import java.util.List;
+
+public class PatchTest extends TestCase {
+
+    public void testPatch_Insert()  {
+        final List<String> insertTest_from = Arrays.asList("hhh");
+        final List<String> insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
+
+        final Patch<String> patch = DiffUtils.diff(insertTest_from, insertTest_to);
+        try {
+            assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    public void testPatch_Delete() {
+        final List<String> deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
+        final List<String> deleteTest_to = Arrays.asList("ggg");
+
+        final Patch<String> patch = DiffUtils.diff(deleteTest_from, deleteTest_to);
+        try {
+            assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+
+    public void testPatch_Change() {
+        final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
+        final List<String> changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");
+
+        final Patch<String> patch = DiffUtils.diff(changeTest_from, changeTest_to);
+        try {
+            assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
+        } catch (PatchFailedException e) {
+            fail(e.getMessage());
+        }
+    }
+}