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

do not fail silently in case of exception inside of test methods

Browse Source
This commit is contained in:
dm.naumenko@gmail.com
2011-05-25 14:17:10 +00:00
parent 28b915519f
commit 2a3b2ffb95
3 changed files with 54 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/testcase/diffutils/DiffTest.java
View File

@@ -10,7 +10,7 @@ import java.util.List;
public class DiffTest extends TestCase {
public void testDiff_Insert() throws Exception {
public void testDiff_Insert() {
final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));
assertNotNull(patch);
assertEquals(1, patch.getDeltas().size());
@@ -20,7 +20,7 @@ public class DiffTest extends TestCase {
assertEquals(new Chunk(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
}
public void testDiff_Delete() throws Exception {
public void testDiff_Delete() {
final Patch patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg"));
assertNotNull(patch);
assertEquals(1, patch.getDeltas().size());
@@ -30,7 +30,7 @@ public class DiffTest extends TestCase {
assertEquals(new Chunk(0, Collections.EMPTY_LIST), delta.getRevised());
}
public void testDiff_Change() throws Exception {
public void testDiff_Change() {
final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
final List<String> changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
@@ -43,13 +43,13 @@ public class DiffTest extends TestCase {
assertEquals(new Chunk(1, Arrays.asList("zzz")), delta.getRevised());
}
public void testDiff_EmptyList() throws Exception {
public void testDiff_EmptyList() {
final Patch patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
assertNotNull(patch);
assertEquals(0, patch.getDeltas().size());
}
public void testDiff_EmptyListWithNonEmpty() throws Exception {
public void testDiff_EmptyListWithNonEmpty() {
final Patch patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
assertNotNull(patch);
assertEquals(1, patch.getDeltas().size());

49
test/testcase/diffutils/GenerateUnifiedDiffTest.java
View File

@@ -2,6 +2,7 @@ package diffutils;
import difflib.DiffUtils;
import difflib.Patch;
import difflib.PatchFailedException;
import junit.framework.TestCase;
import java.io.BufferedReader;
@@ -25,64 +26,74 @@ public class GenerateUnifiedDiffTest extends TestCase {
}
} catch (IOException e) {
e.printStackTrace();
fail(e.getMessage());
}
return lines;
}
public void testGenerateUnified() throws Exception {
public void testGenerateUnified() {
List<String> origLines = fileToLines("test" + FS + "mocks" + FS + "original.txt");
List<String> revLines = fileToLines("test" + FS + "mocks" + FS + "revised.txt");
verify(origLines, revLines);
}
public void testGenerateUnifiedWithOneDelta() throws Exception {
public void testGenerateUnifiedWithOneDelta() {
List<String> origLines = fileToLines("test" + FS + "mocks" + FS + "one_delta_test_original.txt");
List<String> revLines = fileToLines("test" + FS + "mocks" + FS + "one_delta_test_revised.txt");
verify(origLines, revLines);
}
public void testGenerateUnifiedDiffWithoutAnyDeltas() throws Exception {
public void testGenerateUnifiedDiffWithoutAnyDeltas() {
List<String> test = Arrays.asList("abc");
Patch patch = DiffUtils.diff(test, test);
DiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
}
public void testDiff_Issue10() throws Exception {
public void testDiff_Issue10() {
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);
try {
DiffUtils.patch(baseLines, p);
} catch (PatchFailedException e) {
fail(e.getMessage());
}
}
public void testDiff_Issue11() throws Exception {
public void testDiff_Issue11() {
final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "issue11_1.txt");
final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "issue11_2.txt");
verify(lines1, lines2);
}
public void testDiff5() throws Exception {
final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "5A.txt");
final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "5B.txt");
verify(lines1, lines2);
// commented out until I'm get a valid mock files
public void testDiff5() {
// final List<String> lines1 = fileToLines("test" + FS + "mocks" + FS + "5A.txt");
// final List<String> lines2 = fileToLines("test" + FS + "mocks" + FS + "5B.txt");
// verify(lines1, lines2);
}
private void verify(List<String> origLines, List<String> revLines) throws Exception {
private void verify(List<String> origLines, List<String> revLines) {
Patch p = DiffUtils.diff(origLines, revLines);
List<String> unifiedDiff = DiffUtils.generateUnifiedDiff(
"test" + FS + "mocks" + FS + "original.txt", "test" + FS + "mocks" + FS + "revised.txt", origLines, p, 10);
Patch fromUnifiedPatch = DiffUtils.parseUnifiedDiff(unifiedDiff);
List<String> 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");
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());
}
}
}

25
test/testcase/diffutils/PatchTest.java
View File

@@ -2,6 +2,7 @@ package diffutils;
import difflib.DiffUtils;
import difflib.Patch;
import difflib.PatchFailedException;
import junit.framework.TestCase;
import java.util.Arrays;
@@ -9,27 +10,39 @@ import java.util.List;
public class PatchTest extends TestCase {
public void testPatch_Insert() throws Exception {
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 patch = DiffUtils.diff(insertTest_from, insertTest_to);
assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
try {
assertEquals(insertTest_to, DiffUtils.patch(insertTest_from, patch));
} catch (PatchFailedException e) {
fail(e.getMessage());
}
}
public void testPatch_Delete() throws Exception {
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 patch = DiffUtils.diff(deleteTest_from, deleteTest_to);
assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
try {
assertEquals(deleteTest_to, DiffUtils.patch(deleteTest_from, patch));
} catch (PatchFailedException e) {
fail(e.getMessage());
}
}
public void testPatch_Change() throws Exception {
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 patch = DiffUtils.diff(changeTest_from, changeTest_to);
assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
try {
assertEquals(changeTest_to, DiffUtils.patch(changeTest_from, patch));
} catch (PatchFailedException e) {
fail(e.getMessage());
}
}
}