diff options
Diffstat (limited to 'src/test/java/bjc')
| -rw-r--r-- | src/test/java/bjc/everge/EvergeTest.java | 8 | ||||
| -rw-r--r-- | src/test/java/bjc/everge/ReplPairTest.java | 26 | ||||
| -rw-r--r-- | src/test/java/bjc/everge/TestUtils.java | 12 |
3 files changed, 26 insertions, 20 deletions
diff --git a/src/test/java/bjc/everge/EvergeTest.java b/src/test/java/bjc/everge/EvergeTest.java index c99b15e..3f4e113 100644 --- a/src/test/java/bjc/everge/EvergeTest.java +++ b/src/test/java/bjc/everge/EvergeTest.java @@ -9,6 +9,8 @@ import static bjc.everge.TestUtils.*; import org.junit.Test; +import bjc.utils.ioutils.*; + /** * Unit tests for Everge front-end. * @@ -45,8 +47,8 @@ public class EvergeTest { ByteArrayOutputStream baos = new ByteArrayOutputStream(); ByteArrayOutputStream errBaos = new ByteArrayOutputStream(); - OutputStream normOut = new MirrorOutputStream(baos, System.out); - OutputStream normErr = new MirrorOutputStream(errBaos, System.err); + OutputStream normOut = new MirrorOutputStream(baos/*, System.out*/); + OutputStream normErr = new MirrorOutputStream(errBaos/*, System.err*/); Everge evg = new Everge(); evg.setOutput(normOut); @@ -55,7 +57,7 @@ public class EvergeTest { evg.processArgs("--verbosity", "4"); List<String> errs = new ArrayList<>(); boolean stat = evg.processArgs(errs, "--input-status", "line", "--file", - "data/test/evg-test1.rp", "data/test/evg-test1.inp"); + "data/test/evg-test1.evg", "data/test/evg-test1.inp"); if (!stat) { System.err.println("[ERROR] Did not succesfully process args"); for (String err : errs) { diff --git a/src/test/java/bjc/everge/ReplPairTest.java b/src/test/java/bjc/everge/ReplPairTest.java index f88279b..650ee14 100644 --- a/src/test/java/bjc/everge/ReplPairTest.java +++ b/src/test/java/bjc/everge/ReplPairTest.java @@ -22,11 +22,13 @@ public class ReplPairTest { @Test public void testLoadFile() { List<ReplPair> lrp = null; - String fName = "data/test/test1-empty.rp"; + String fName = "data/test/test1-empty.evg"; 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) { @@ -36,28 +38,28 @@ public class ReplPairTest { @Test public void testSingleReplace() { - assertMultiReplace("data/test/test2-singlereplace.rp", "test2", "test1", "test2", "test2"); + assertMultiReplace("data/test/test2-singlereplace.evg", "test2", "test1", "test2", "test2"); } @Test public void testMultiReplace() { - assertMultiReplace("data/test/test3-multireplace.rp", "A B C", "a b c", "A A B", "a a b", + assertMultiReplace("data/test/test3-multireplace.evg", "A B C", "a b c", "A A B", "a a b", "AAB", "aab"); } @Test public void testReplaceOrder() { - assertMultiReplace("data/test/test4-implicitorder.rp", "a", "a", "d", "ab"); + assertMultiReplace("data/test/test4-implicitorder.evg", "a", "a", "d", "ab"); } @Test public void testReplaceExpOrder() { - assertMultiReplace(false, "data/test/test5-explicitorder.rp", "a", "a", "aa", "ab"); + assertMultiReplace(false, "data/test/test5-explicitorder.evg", "a", "a", "aa", "ab"); } @Test public void testStaging() { - assertMultiReplace("data/test/test6-staging.rp", "c", "a", "y2", "x"); + assertMultiReplace("data/test/test6-staging.evg", "c", "a", "y2", "x"); } @Test @@ -67,7 +69,7 @@ public class ReplPairTest { + " replacement body for raw name 'a'" + "\n\t\tContext: No associated line"; - assertThrownMessage(msg, "data/test/test7-error.rp"); + assertThrownMessage(msg, "data/test/test7-error.evg"); } @Test @@ -83,19 +85,19 @@ public class ReplPairTest { @Test public void testGlobals() { - assertMultiReplace("data/test/test8-globals.rp", "b1d\n1d\n1b1", "acca"); + assertMultiReplace("data/test/test8-globals.evg", "b1d\n1d\n1b1", "acca"); } @Test public void testGuards() { - assertMultiReplace("data/test/test10-guard.rp", "a", "a", "bbb", "aaa"); + assertMultiReplace("data/test/test10-guard.evg", "a", "a", "bbb", "aaa"); } @Test public void testMultiControl() { - assertMultiReplace("data/test/test11-bodyinlinemulti.rp", "bc", "a", "z\na", "d", "m", "po"); + assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "bc", "a", "z\na", "d", "m", "po"); // NOTE Uncomment when :EndingSlash is fixed - //assertMultiReplace("data/test/test11.rp", "q\\", "FG"); + //assertMultiReplace("data/test/test11-bodyinlinemulti.evg", "q\\", "FG"); } } 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()); |