Skip to content

Commit cc585e2

Browse files
wumpzwumpz
committed
refactored to junit4 annotations
1 parent e76c9ff commit cc585e2

File tree

4 files changed

+34
-8
lines changed

4 files changed

+34
-8
lines changed

‎src/test/java/diffutils/DiffRowGeneratorTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,13 @@
44
import difflib.DiffRowGenerator;
55
import java.util.Arrays;
66
import java.util.List;
7-
import junit.framework.TestCase;
7+
import static org.junit.Assert.assertEquals;
8+
import static org.junit.Assert.assertTrue;
9+
import org.junit.Test;
810

9-
public class DiffRowGeneratorTest extends TestCase {
11+
public class DiffRowGeneratorTest {
1012

13+
@Test
1114
public void testGenerator_Default() {
1215
String first = "anything \n \nother";
1316
String second ="anything\n\nother";
@@ -21,6 +24,7 @@ public void testGenerator_Default() {
2124
assertEquals(3, rows.size());
2225
}
2326

27+
@Test
2428
public void testGenerator_InlineDiff() {
2529
String first = "anything \n \nother";
2630
String second ="anything\n\nother";
@@ -36,6 +40,7 @@ public void testGenerator_InlineDiff() {
3640
assertTrue(rows.get(0).getOldLine().indexOf("<span") > 0);
3741
}
3842

43+
@Test
3944
public void testGenerator_IgnoreWhitespaces() {
4045
String first = "anything \n \nother\nmore lines";
4146
String second ="anything\n\nother\nsome more lines";

‎src/test/java/diffutils/DiffTest.java‎

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
import java.util.Arrays;
66
import java.util.Collections;
77
import java.util.List;
8-
import junit.framework.TestCase;
8+
import static org.junit.Assert.assertEquals;
9+
import static org.junit.Assert.assertNotNull;
10+
import org.junit.Test;
911

10-
public class DiffTest extends TestCase {
12+
public class DiffTest {
1113

14+
@Test
1215
public void testDiff_Insert() {
1316
final Patch<String> patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk"));
1417
assertNotNull(patch);
@@ -19,6 +22,7 @@ public void testDiff_Insert() {
1922
assertEquals(new Chunk<String>(1, Arrays.asList("jjj", "kkk")), delta.getRevised());
2023
}
2124

25+
@Test
2226
public void testDiff_Delete() {
2327
final Patch<String> patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg"));
2428
assertNotNull(patch);
@@ -29,6 +33,7 @@ public void testDiff_Delete() {
2933
assertEquals(new Chunk<String>(0, Collections.<String> emptyList()), delta.getRevised());
3034
}
3135

36+
@Test
3237
public void testDiff_Change() {
3338
final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc");
3439
final List<String> changeTest_to = Arrays.asList("aaa", "zzz", "ccc");
@@ -42,12 +47,14 @@ public void testDiff_Change() {
4247
assertEquals(new Chunk<String>(1, Arrays.asList("zzz")), delta.getRevised());
4348
}
4449

50+
@Test
4551
public void testDiff_EmptyList() {
4652
final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), new ArrayList<String>());
4753
assertNotNull(patch);
4854
assertEquals(0, patch.getDeltas().size());
4955
}
5056

57+
@Test
5158
public void testDiff_EmptyListWithNonEmpty() {
5259
final Patch<String> patch = DiffUtils.diff(new ArrayList<String>(), Arrays.asList("aaa"));
5360
assertNotNull(patch);

‎src/test/java/diffutils/GenerateUnifiedDiffTest.java‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,11 @@
1010
import java.util.Arrays;
1111
import java.util.LinkedList;
1212
import java.util.List;
13-
import junit.framework.TestCase;
13+
import static org.junit.Assert.assertTrue;
14+
import static org.junit.Assert.fail;
15+
import org.junit.Test;
1416

15-
public class GenerateUnifiedDiffTest extends TestCase {
17+
public class GenerateUnifiedDiffTest {
1618

1719

1820
public List<String> fileToLines(String filename) {
@@ -40,26 +42,30 @@ public List<String> fileToLines(String filename) {
4042
return lines;
4143
}
4244

45+
@Test
4346
public void testGenerateUnified() {
4447
List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt");
4548
List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt");
4649

4750
verify(origLines, revLines, "original.txt", "revised.txt");
4851
}
4952

53+
@Test
5054
public void testGenerateUnifiedWithOneDelta() {
5155
List<String> origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt");
5256
List<String> revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt");
5357

5458
verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt");
5559
}
5660

61+
@Test
5762
public void testGenerateUnifiedDiffWithoutAnyDeltas() {
5863
List<String> test = Arrays.asList("abc");
5964
Patch<String> patch = DiffUtils.diff(test, test);
6065
DiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0);
6166
}
6267

68+
@Test
6369
public void testDiff_Issue10() {
6470
final List<String> baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt");
6571
final List<String> patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt");
@@ -74,12 +80,14 @@ public void testDiff_Issue10() {
7480
/**
7581
* Issue 12
7682
*/
83+
@Test
7784
public void testPatchWithNoDeltas() {
7885
final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt");
7986
final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt");
8087
verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt");
8188
}
8289

90+
@Test
8391
public void testDiff5() {
8492
final List<String> lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt");
8593
final List<String> lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt");
@@ -89,6 +97,7 @@ public void testDiff5() {
8997
/**
9098
* Issue 19
9199
*/
100+
@Test
92101
public void testDiffWithHeaderLineInText() {
93102
List<String> original = new ArrayList<String>();
94103
List<String> revised = new ArrayList<String>();

‎src/test/java/diffutils/PatchTest.java‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
import difflib.PatchFailedException;
66
import java.util.Arrays;
77
import java.util.List;
8-
import junit.framework.TestCase;
8+
import static org.junit.Assert.assertEquals;
9+
import static org.junit.Assert.fail;
10+
import org.junit.Test;
911

10-
public class PatchTest extends TestCase {
12+
public class PatchTest {
1113

14+
@Test
1215
public void testPatch_Insert() {
1316
final List<String> insertTest_from = Arrays.asList("hhh");
1417
final List<String> insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll");
@@ -21,6 +24,7 @@ public void testPatch_Insert() {
2124
}
2225
}
2326

27+
@Test
2428
public void testPatch_Delete() {
2529
final List<String> deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh");
2630
final List<String> deleteTest_to = Arrays.asList("ggg");
@@ -33,6 +37,7 @@ public void testPatch_Delete() {
3337
}
3438
}
3539

40+
@Test
3641
public void testPatch_Change() {
3742
final List<String> changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd");
3843
final List<String> changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");

0 commit comments

Comments
 (0)