From 2099f75761edc9b2df1dad15de212d9d7e1f9018 Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Thu, 27 Apr 2023 14:56:33 +0200 Subject: [PATCH] Remove all manual prints from tests --- src/test/java/de/tlc4b/prettyprint/SetTest.java | 1 - .../de/tlc4b/typechecking/ModelValuesTest.java | 1 - src/test/java/de/tlc4b/util/TestUtil.java | 15 --------------- 3 files changed, 17 deletions(-) diff --git a/src/test/java/de/tlc4b/prettyprint/SetTest.java b/src/test/java/de/tlc4b/prettyprint/SetTest.java index b71fa50..8e66fcb 100644 --- a/src/test/java/de/tlc4b/prettyprint/SetTest.java +++ b/src/test/java/de/tlc4b/prettyprint/SetTest.java @@ -201,7 +201,6 @@ public class SetTest { + "EXTENDS BBuiltIns\n" + "ASSUME Inter({{z}: z \\in {z \\in ({1, 2}): 1 = 1}}) = {}\n" + "===="; - System.out.println(expected); compareEquals(expected, machine); } diff --git a/src/test/java/de/tlc4b/typechecking/ModelValuesTest.java b/src/test/java/de/tlc4b/typechecking/ModelValuesTest.java index c4e2f3c..4c6121e 100644 --- a/src/test/java/de/tlc4b/typechecking/ModelValuesTest.java +++ b/src/test/java/de/tlc4b/typechecking/ModelValuesTest.java @@ -15,7 +15,6 @@ public class ModelValuesTest { + "CONSTANTS k \n" + "PROPERTIES k = a \n" + "END"; TestTypechecker t = new TestTypechecker(machine); - System.out.println(t.constants.get("k").toString()); assertEquals("S", t.constants.get("k").toString()); } diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index f3aa5dc..4a57598 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -30,7 +30,6 @@ public class TestUtil { Translator b2tlaTranslator = new Translator(machineString); b2tlaTranslator.translate(); - System.out.println(b2tlaTranslator.getModuleString()); // TODO create standard modules BBuildins @@ -78,15 +77,12 @@ public class TestUtil { String translatedLTLFormula = b2tlaTranslator.getTranslatedLTLFormula(); translatedLTLFormula = translatedLTLFormula.replaceAll("\\s", ""); expected = expected.replaceAll("\\s", ""); - System.out.println(translatedLTLFormula); - System.out.println(b2tlaTranslator.getModuleString()); assertEquals(expected, translatedLTLFormula); } public static void checkMachine(String machine) throws Exception { Translator b2tlaTranslator = new Translator(machine); b2tlaTranslator.translate(); - System.out.println(b2tlaTranslator.getModuleString()); String name = b2tlaTranslator.getMachineName(); translateTLA2B(name, b2tlaTranslator.getModuleString()); @@ -98,8 +94,6 @@ public class TestUtil { throws Exception { Translator b2tlaTranslator = new Translator(machine); b2tlaTranslator.translate(); - System.out.println(b2tlaTranslator.getModuleString()); - System.out.println(b2tlaTranslator.getConfigString()); String name = b2tlaTranslator.getMachineName(); @@ -114,8 +108,6 @@ public class TestUtil { throws Exception { Translator b2tlaTranslator = new Translator(machine); b2tlaTranslator.translate(); - System.out.println(b2tlaTranslator.getModuleString()); - System.out.println(b2tlaTranslator.getConfigString()); // TODO include config file in back translation from TLA+ to B @@ -137,7 +129,6 @@ public class TestUtil { try { Translator b2tlaTranslator = new Translator(machine); b2tlaTranslator.translate(); - System.out.println(b2tlaTranslator.getModuleString()); assertEquals(expected, b2tlaTranslator.getModuleString()); } catch (BCompoundException e) { throw e.getFirstException(); @@ -149,7 +140,6 @@ public class TestUtil { try { Translator translator = new Translator(machine); translator.translate(); - System.out.println(translator.getModuleString()); return translator.getModuleString(); } catch (BCompoundException e) { throw e.getFirstException(); @@ -168,7 +158,6 @@ public class TestUtil { } private static TLCResult runTLC(String runnerClassName, String[] args) throws IOException { - System.out.println("Starting JVM..."); final Process p = startJVM("", runnerClassName, args); StreamGobbler stdOut = new StreamGobbler(p.getInputStream()); stdOut.start(); @@ -182,15 +171,12 @@ public class TestUtil { for (int i = stdOut.getLog().size() - 1; i > 1; i--) { String s = stdOut.getLog().get(i); - // System.out.println(s); if (s.startsWith("Result:")) { String resultString = s.substring(s.indexOf(':') + 2); resultString = resultString.replaceAll("\\s+", ""); - System.out.println(resultString); return TLCResult.valueOf(resultString); } } - System.out.println("No result found."); return null; } @@ -226,7 +212,6 @@ public class TestUtil { tlc4b.process(args); } catch (Exception e) { e.printStackTrace(); - System.err.println(e.getMessage()); throw e; } File module = new File(tlc4b.getBuildDir(), tlc4b.getMachineFileNameWithoutFileExtension() + ".tla"); -- GitLab