From cc585e2e97d6edd819695db1151c29b6de706092 Mon Sep 17 00:00:00 2001 From: wumpz Date: Thu, 30 Mar 2017 13:02:30 +0200 Subject: [PATCH] refactored to junit4 annotations --- src/test/java/diffutils/DiffRowGeneratorTest.java | 9 +++++++-- src/test/java/diffutils/DiffTest.java | 11 +++++++++-- .../java/diffutils/GenerateUnifiedDiffTest.java | 13 +++++++++++-- src/test/java/diffutils/PatchTest.java | 9 +++++++-- 4 files changed, 34 insertions(+), 8 deletions(-) diff --git a/src/test/java/diffutils/DiffRowGeneratorTest.java b/src/test/java/diffutils/DiffRowGeneratorTest.java index 57af39c..516b58f 100644 --- a/src/test/java/diffutils/DiffRowGeneratorTest.java +++ b/src/test/java/diffutils/DiffRowGeneratorTest.java @@ -4,10 +4,13 @@ import difflib.DiffRow; import difflib.DiffRowGenerator; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Test; -public class DiffRowGeneratorTest extends TestCase { +public class DiffRowGeneratorTest { + @Test public void testGenerator_Default() { String first = "anything \n \nother"; String second ="anything\n\nother"; @@ -21,6 +24,7 @@ public class DiffRowGeneratorTest extends TestCase { assertEquals(3, rows.size()); } + @Test public void testGenerator_InlineDiff() { String first = "anything \n \nother"; String second ="anything\n\nother"; @@ -36,6 +40,7 @@ public class DiffRowGeneratorTest extends TestCase { assertTrue(rows.get(0).getOldLine().indexOf(" 0); } + @Test public void testGenerator_IgnoreWhitespaces() { String first = "anything \n \nother\nmore lines"; String second ="anything\n\nother\nsome more lines"; diff --git a/src/test/java/diffutils/DiffTest.java b/src/test/java/diffutils/DiffTest.java index 87d9bac..28f6f9b 100644 --- a/src/test/java/diffutils/DiffTest.java +++ b/src/test/java/diffutils/DiffTest.java @@ -5,10 +5,13 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Collections; import java.util.List; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import org.junit.Test; -public class DiffTest extends TestCase { +public class DiffTest { + @Test public void testDiff_Insert() { final Patch patch = DiffUtils.diff(Arrays.asList("hhh"), Arrays.asList("hhh", "jjj", "kkk")); assertNotNull(patch); @@ -19,6 +22,7 @@ public class DiffTest extends TestCase { assertEquals(new Chunk(1, Arrays.asList("jjj", "kkk")), delta.getRevised()); } + @Test public void testDiff_Delete() { final Patch patch = DiffUtils.diff(Arrays.asList("ddd", "fff", "ggg"), Arrays.asList("ggg")); assertNotNull(patch); @@ -29,6 +33,7 @@ public class DiffTest extends TestCase { assertEquals(new Chunk(0, Collections. emptyList()), delta.getRevised()); } + @Test public void testDiff_Change() { final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc"); final List changeTest_to = Arrays.asList("aaa", "zzz", "ccc"); @@ -42,12 +47,14 @@ public class DiffTest extends TestCase { assertEquals(new Chunk(1, Arrays.asList("zzz")), delta.getRevised()); } + @Test public void testDiff_EmptyList() { final Patch patch = DiffUtils.diff(new ArrayList(), new ArrayList()); assertNotNull(patch); assertEquals(0, patch.getDeltas().size()); } + @Test public void testDiff_EmptyListWithNonEmpty() { final Patch patch = DiffUtils.diff(new ArrayList(), Arrays.asList("aaa")); assertNotNull(patch); diff --git a/src/test/java/diffutils/GenerateUnifiedDiffTest.java b/src/test/java/diffutils/GenerateUnifiedDiffTest.java index 3b93cb0..917ad29 100644 --- a/src/test/java/diffutils/GenerateUnifiedDiffTest.java +++ b/src/test/java/diffutils/GenerateUnifiedDiffTest.java @@ -10,9 +10,11 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.LinkedList; import java.util.List; -import junit.framework.TestCase; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; +import org.junit.Test; -public class GenerateUnifiedDiffTest extends TestCase { +public class GenerateUnifiedDiffTest { public List fileToLines(String filename) { @@ -40,6 +42,7 @@ public class GenerateUnifiedDiffTest extends TestCase { return lines; } + @Test public void testGenerateUnified() { List origLines = fileToLines(TestConstants.MOCK_FOLDER + "original.txt"); List revLines = fileToLines(TestConstants.MOCK_FOLDER + "revised.txt"); @@ -47,6 +50,7 @@ public class GenerateUnifiedDiffTest extends TestCase { verify(origLines, revLines, "original.txt", "revised.txt"); } + @Test public void testGenerateUnifiedWithOneDelta() { List origLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_original.txt"); List revLines = fileToLines(TestConstants.MOCK_FOLDER + "one_delta_test_revised.txt"); @@ -54,12 +58,14 @@ public class GenerateUnifiedDiffTest extends TestCase { verify(origLines, revLines, "one_delta_test_original.txt", "one_delta_test_revised.txt"); } + @Test public void testGenerateUnifiedDiffWithoutAnyDeltas() { List test = Arrays.asList("abc"); Patch patch = DiffUtils.diff(test, test); DiffUtils.generateUnifiedDiff("abc", "abc", test, patch, 0); } + @Test public void testDiff_Issue10() { final List baseLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_base.txt"); final List patchLines = fileToLines(TestConstants.MOCK_FOLDER + "issue10_patch.txt"); @@ -74,12 +80,14 @@ public class GenerateUnifiedDiffTest extends TestCase { /** * Issue 12 */ + @Test public void testPatchWithNoDeltas() { final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_1.txt"); final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "issue11_2.txt"); verify(lines1, lines2, "issue11_1.txt", "issue11_2.txt"); } + @Test public void testDiff5() { final List lines1 = fileToLines(TestConstants.MOCK_FOLDER + "5A.txt"); final List lines2 = fileToLines(TestConstants.MOCK_FOLDER + "5B.txt"); @@ -89,6 +97,7 @@ public class GenerateUnifiedDiffTest extends TestCase { /** * Issue 19 */ + @Test public void testDiffWithHeaderLineInText() { List original = new ArrayList(); List revised = new ArrayList(); diff --git a/src/test/java/diffutils/PatchTest.java b/src/test/java/diffutils/PatchTest.java index 5c03f7e..561f214 100644 --- a/src/test/java/diffutils/PatchTest.java +++ b/src/test/java/diffutils/PatchTest.java @@ -5,10 +5,13 @@ import difflib.Patch; import difflib.PatchFailedException; import java.util.Arrays; import java.util.List; -import junit.framework.TestCase; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.fail; +import org.junit.Test; -public class PatchTest extends TestCase { +public class PatchTest { + @Test public void testPatch_Insert() { final List insertTest_from = Arrays.asList("hhh"); final List insertTest_to = Arrays.asList("hhh", "jjj", "kkk", "lll"); @@ -21,6 +24,7 @@ public class PatchTest extends TestCase { } } + @Test public void testPatch_Delete() { final List deleteTest_from = Arrays.asList("ddd", "fff", "ggg", "hhh"); final List deleteTest_to = Arrays.asList("ggg"); @@ -33,6 +37,7 @@ public class PatchTest extends TestCase { } } + @Test public void testPatch_Change() { final List changeTest_from = Arrays.asList("aaa", "bbb", "ccc", "ddd"); final List changeTest_to = Arrays.asList("aaa", "bxb", "cxc", "ddd");