diff --git a/src/test/java/de/tlc4b/tlc/integration/SpecialTest.java b/src/test/java/de/tlc4b/tlc/integration/SpecialTest.java index 502bceabf21419d8495e5401d9d81e81dbf56357..cf37f5cc387256bb8d6b88bb378e5d44248f1f3d 100644 --- a/src/test/java/de/tlc4b/tlc/integration/SpecialTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/SpecialTest.java @@ -3,6 +3,7 @@ package de.tlc4b.tlc.integration; import static de.tlc4b.TLC4BOption.*; import static de.tlc4b.tlc.TLCResults.TLCResult.*; import static de.tlc4b.util.TestUtil.test; +import static de.tlc4b.util.TestUtil.testWithTrace; import static org.junit.Assert.*; import org.junit.Test; @@ -65,7 +66,7 @@ public class SpecialTest { public void testCustomOutputDir() throws Exception { Path specialDir = Paths.get("./src/test/resources/special/veryspecialoutput"); String[] a = new String[] { "./src/test/resources/errors/InvariantError.mch", OUTPUT.cliArg(), specialDir.toString()}; - assertEquals(InvariantViolation, test(a, true)); + assertEquals(InvariantViolation, testWithTrace(a)); assertTrue(Files.deleteIfExists(specialDir.resolve("InvariantError.tla"))); assertTrue(Files.deleteIfExists(specialDir.resolve("InvariantError.cfg"))); @@ -81,7 +82,7 @@ public class SpecialTest { logFile.toFile().delete(); String[] a = new String[] { machineFile.toString(), LOG.cliArg(), logFile.toString(), COVERAGE.cliArg()}; - assertEquals(InvariantViolation, test(a, true)); + assertEquals(InvariantViolation, testWithTrace(a)); List<String> lines = Files.readAllLines(logFile); assertEquals(lines.size(), 12); diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index 70a961b0761b8841c6a1b6de8c494fa7b72cf6f0..02c8ea03eafdb7aaa0806fb5f0a40df8175766da 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -178,19 +178,15 @@ public class TestUtil { } public static TLCResult test(String[] args) throws IOException { - return test(args, false); + String[] newArgs = Arrays.copyOf(args, args.length + 1); + newArgs[args.length] = NOTRACE.cliArg(); + String runnerClassName = TLC4BTester.class.getCanonicalName(); + return runTLC(runnerClassName, newArgs); } - public static TLCResult test(String[] args, boolean createTrace) throws IOException { + public static TLCResult testWithTrace(String[] args) throws IOException { String runnerClassName = TLC4BTester.class.getCanonicalName(); - String[] newArgs; - if (createTrace) { - newArgs = args; - } else { - newArgs = Arrays.copyOf(args, args.length + 1); - newArgs[args.length] = NOTRACE.cliArg(); - } - return runTLC(runnerClassName, newArgs); + return runTLC(runnerClassName, args); } private static TLCResult runTLC(String runnerClassName, String[] args) throws IOException {