java/java-diff-utils
1
0
Fork 0
mirror of https://github.com/java-diff-utils/java-diff-utils.git synced 2026-03-13 10:11:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

rename package, fix typo

Browse Source
This commit is contained in:
dm.naumenko@gmail.com
2010-12-27 21:13:24 +00:00
parent 446901dd68
commit 8de3f194c6
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

82
test/testcase/diffutils/DiffTest.java Normal file
View File

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

104
test/testcase/diffutils/GenerateUnifiedDiffTest.java Normal file
View File

@@ -0,0 +1,104 @@
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.LinkedList;
import java.util.List;
public class GenerateUnifiedDiffTest extends TestCase {
static final String FS = File.separator;
static final String originalFilename = "test" + FS + "mocks" + FS + "original.txt";
static final String revisedFilename = "test" + FS + "mocks" + FS + "revised.txt";
static final String originalFilenameOneDelta = "test" + FS + "mocks" + FS + "one_delta_test_original.txt";
static final String revisedFilenameOneDelta = "test" + FS + "mocks" + FS + "one_delta_test_revised.txt";
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();
}
return lines;
}
/**
* Tests the Unified Diff generation by creating a Patch, then
* creating the Unified Diff representation, then parsing that
* Unified Diff, and applying the patch to the original unrevised
* text, then comparing that to the original revised text.
*
* @author Bill James (tankerbay@gmail.com)
*/
public void testGenerateUnified() {
List<String> origLines = fileToLines(originalFilename);
List<String> revLines = fileToLines(revisedFilename);
testGenerateUnified(origLines, revLines);
}
/**
* Tests the Unified Diff generation for diff with one delta.
*/
public void testGenerateUnifiedWithOneDelta() {
List<String> origLines = fileToLines(originalFilenameOneDelta);
List<String> revLines = fileToLines(revisedFilenameOneDelta);
testGenerateUnified(origLines, revLines);
}
private void testGenerateUnified(List<String> origLines, List<String> revLines) {
Patch p = DiffUtils.diff(origLines, revLines);
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff(
originalFilename, revisedFilename, origLines, p, 10);
Patch fromUnifiedPatch = DiffUtils.parseUnifiedDiff(unifiedDiff);
List<String> patchedLines = new ArrayList<String>();
try {
patchedLines = (List<String>) fromUnifiedPatch.applyTo(origLines);
} catch (PatchFailedException e) {
// TODO Auto-generated catch block
fail(e.getMessage());
}
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) == false) {
fail("Line " + (i + 1) + " of the patched file did not match the revised original");
}
}
}
public void testDiff_Issue10() throws Exception {
final List<String> baseLines = fileToLines("test" + FS + "mocks" + FS + "issue10_base.txt");
final List<String> patchLines = fileToLines("test" + FS + "mocks" + FS + "issue10_patch.txt");
final Patch p = DiffUtils.parseUnifiedDiff(patchLines);
DiffUtils.patch(baseLines, p);
}
public void testDiff_Issue11() throws Exception {
final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "issue11_1.txt");
final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "issue11_2.txt");
final Patch patch = DiffUtils.diff(lines1, lines2);
final String fileName = "xxx";
final List<String> stringList = DiffUtils.generateUnifiedDiff(fileName, fileName, lines1, patch, 3);
final Patch x = DiffUtils.parseUnifiedDiff(stringList);
DiffUtils.patch(lines1, x);
}
}

46
test/testcase/diffutils/PatchTest.java Normal file
View File

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