From 9459df89c0ea0c147ddc7ce1647f99c561e74209 Mon Sep 17 00:00:00 2001 From: Ben Culkin Date: Wed, 20 May 2020 17:14:05 -0400 Subject: Fix issue with test Fix an outstanding issue w/ tests. why line-ending, why? --- src/test/java/bjc/everge/EvergeTest.java | 5 +++-- src/test/java/bjc/everge/TestUtils.java | 4 ++++ 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'src/test/java/bjc') diff --git a/src/test/java/bjc/everge/EvergeTest.java b/src/test/java/bjc/everge/EvergeTest.java index 3b42758..e9384cd 100644 --- a/src/test/java/bjc/everge/EvergeTest.java +++ b/src/test/java/bjc/everge/EvergeTest.java @@ -5,6 +5,7 @@ import java.io.*; import java.util.*; import static org.junit.Assert.*; +import static bjc.everge.TestUtils.*; import org.junit.Test; @@ -51,7 +52,7 @@ public class EvergeTest { evg.setOutput(normOut); evg.setError(normErr); - evg.processArgs("--verbosity", "3"); + evg.processArgs("--verbosity", "4", "-n"); List errs = new ArrayList<>(); boolean stat = evg.processArgs(errs, "--input-status", "line", "--file", "data/test/evg-test1.rp", "data/test/evg-test1.inp"); @@ -71,6 +72,6 @@ public class EvergeTest { } String outp = baos.toString().trim(); - assertEquals("b\nb", outp); + assertMatches("b\\Rb", outp); } } diff --git a/src/test/java/bjc/everge/TestUtils.java b/src/test/java/bjc/everge/TestUtils.java index b3ca419..f3898c7 100644 --- a/src/test/java/bjc/everge/TestUtils.java +++ b/src/test/java/bjc/everge/TestUtils.java @@ -170,4 +170,8 @@ public class TestUtils { assertEquals("array value mismatch:", args[i], cs.controls[i]); } } + + public static void assertMatches(String pattern, String actual) { + assertTrue(actual.matches(pattern)); + } } -- cgit v1.2.3