From d5eaaa14adc980e9b0588a3caf7ee7d81df1183e Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Sat, 31 Oct 2020 12:45:15 -0400 Subject: General cleanup This does a bunch of structural cleanups to make the code better --- src/test/java/bjc/everge/ReplPairTest.java | 4 +++- src/test/java/bjc/everge/TestUtils.java | 12 +++++++----- 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'src/test/java/bjc/everge') diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java index f88279b..860a420 100644 --- a/src/test/java/bjc/everge/ReplPairTest.java +++ b/src/test/java/bjc/everge/ReplPairTest.java @@ -26,7 +26,9 @@ public class ReplPairTest { try (FileInputStream fis = new FileInputStream(fName); Scanner scn = new Scanner(fis)) { - lrp = ReplPair.readList(scn); + ReplPairParser parser = new ReplPairParser(); + + lrp = parser.readList(scn); assertTrue(lrp.size() == 0); } catch (IOException ioex) { diff --git a/src/test/java/bjc/everge/TestUtils.java b/src/test/java/bjc/everge/TestUtils.java index f3898c7..80d009c 100644 --- a/src/test/java/bjc/everge/TestUtils.java +++ b/src/test/java/bjc/everge/TestUtils.java @@ -1,7 +1,7 @@ package bjc.everge; import bjc.everge.ControlledString.Control; -import bjc.everge.ControlledString.ParseStrings; +import bjc.everge.ControlledString.ControlledStringParseOptions; import java.io.FileInputStream; @@ -25,7 +25,8 @@ public class TestUtils { public static void assertThrownMessage(boolean logMsg, String msg, String fle) { try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) { - ReplPair.readList(new ArrayList<>(), scn); + ReplPairParser parser = new ReplPairParser(); + parser.readList(new ArrayList<>(), scn); assertTrue(false); } catch (BadReplParse rpex) { @@ -62,7 +63,8 @@ public class TestUtils { try (FileInputStream fis = new FileInputStream(fle); Scanner scn = new Scanner(fis)) { - lrp = ReplPair.readList(scn); + ReplPairParser parser = new ReplPairParser(); + lrp = parser.readList(scn); } catch (BadReplParse rpex) { System.err.println(rpex.toPrintString()); @@ -156,13 +158,13 @@ public class TestUtils { public static void assertIsControl(boolean doLog, String inp, String strang, Control... args) { ControlledString cs - = ControlledString.parse(inp, new ParseStrings("//", ";", "/", "|")); + = ControlledString.parse(inp, new ControlledStringParseOptions("//", ";", "/", "|")); if (doLog) { System.err.printf("[LOG] CS: %s\n", cs); } - assertEquals(strang, cs.strang); + assertEquals(strang, cs.body); assertEquals("array length mismatch:", args.length, cs.count()); -- cgit v1.2.3