From 373464d30d87bd8702fe27b920ed1406a0833ef3 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Fri, 27 Mar 2020 16:39:52 -0400 Subject: Refactor test structure Tests are now in a 'test' sub-package, so it is clear that they are indeed test code, not just disjoint parts of the main code --- .../bjc/utils/funcutils/IteratorUtilsTest.java | 23 ------------- .../java/bjc/utils/funcutils/StringUtilsTest.java | 39 ---------------------- 2 files changed, 62 deletions(-) delete mode 100644 base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java delete mode 100644 base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java (limited to 'base/src/test/java/bjc/utils/funcutils') diff --git a/base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java b/base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java deleted file mode 100644 index bf88038..0000000 --- a/base/src/test/java/bjc/utils/funcutils/IteratorUtilsTest.java +++ /dev/null @@ -1,23 +0,0 @@ -package bjc.utils.funcutils; - -import org.junit.Test; - -import static bjc.utils.funcutils.IteratorUtils.*; -import static bjc.utils.funcutils.TestUtils.assertIteratorEquals; - -import static java.util.Arrays.asList; - -/** - * Test IteratorUtils functionality. - * - * @author Ben Culkin - */ -public class IteratorUtilsTest { - /** - * Test the chain() method works correctly. - */ - @Test - public void testChain() { - assertIteratorEquals(chain(I(asList("a b", "b c")), (arg) -> I(asList(arg.split(" ")))), "a", "b", "b", "c"); - } -} diff --git a/base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java b/base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java deleted file mode 100644 index 434912c..0000000 --- a/base/src/test/java/bjc/utils/funcutils/StringUtilsTest.java +++ /dev/null @@ -1,39 +0,0 @@ -package bjc.utils.funcutils; - -import java.io.StringReader; - -import java.util.Scanner; - -import org.junit.Test; - -import static bjc.utils.funcutils.StringUtils.readLines; -import static bjc.utils.funcutils.TestUtils.assertIteratorEquals; - -/** - * Tests of stuff in StringUtils. - * - * @author Ben Culkin - */ -public class StringUtilsTest { - @SuppressWarnings("javadoc") - @Test - public void testReadLines() { - assertReadLines("", ""); - - assertReadLines("hallo there", "hallo there"); - - assertReadLines("hallo there\na second line", "hallo there", "a second line"); - - assertReadLines("hallo there \\\na continued line", "hallo there a continued line"); - - assertReadLines("hallo there\\\\\na second line", "hallo there\\", "a second line"); - - assertReadLines("a\n\nb", "a", "", "b"); - } - - private static void assertReadLines(String inp, String... outp) { - StringReader sr = new StringReader(inp); - Scanner scn = new Scanner(sr); - assertIteratorEquals(readLines(scn), outp); - } -} -- cgit v1.2.3