diff --git a/src/main/java/de/tlc4b/TLC4B.java b/src/main/java/de/tlc4b/TLC4B.java index 3646563fedbd6aa595b957c1ed4093d7820d0d1a..f75a1f28d2c49901a6efde78350e478fe3976e09 100644 --- a/src/main/java/de/tlc4b/TLC4B.java +++ b/src/main/java/de/tlc4b/TLC4B.java @@ -194,7 +194,6 @@ public class TLC4B { System.setProperty("apple.awt.UIElement", "true"); // avoiding pop up windows TLC4BGlobals.resetGlobals(); TLC4BGlobals.setDeleteOnExit(deleteFiles); - TLC4BGlobals.setTestingMode(true); // B2TLAGlobals.setCleanup(true); TLC4B tlc4b = new TLC4B(); try { @@ -221,7 +220,6 @@ public class TLC4B { System.setProperty("apple.awt.UIElement", "true"); // avoiding pop up windows TLC4BGlobals.resetGlobals(); TLC4BGlobals.setDeleteOnExit(deleteFiles); - TLC4BGlobals.setTestingMode(true); // B2TLAGlobals.setCleanup(true); TLC4B tlc4b = new TLC4B(); tlc4b.buildDir = new File("temp/"); diff --git a/src/main/java/de/tlc4b/TLC4BGlobals.java b/src/main/java/de/tlc4b/TLC4BGlobals.java index 8a510ca7719bf657b8bdad8ecbf209bc63bcc1a9..eea24e9d718fad5289968b9608b81138f8d9014f 100644 --- a/src/main/java/de/tlc4b/TLC4BGlobals.java +++ b/src/main/java/de/tlc4b/TLC4BGlobals.java @@ -27,8 +27,6 @@ public class TLC4BGlobals { private static boolean hideTLCConsoleOutput; private static boolean createTraceFile; - private static boolean testingMode; - private static boolean cleanup; private static boolean forceTLCToEvalConstants; @@ -75,7 +73,6 @@ public class TLC4BGlobals { deleteFilesOnExit = false; // if enabled: deletes all created '.tla', '.cfg' files on exit of the JVM. // This includes the created B2TLA standard modules (e.g. Relation, but not Naturals etc.). runTestscript = false; - testingMode = false; createTraceFile = true; } @@ -231,14 +228,6 @@ public class TLC4BGlobals { TLC4BGlobals.proBconstantsSetup = proBconstantsSetup; } - public static void setTestingMode(boolean b) { - TLC4BGlobals.testingMode = b; - } - - public static boolean getTestingMode() { - return TLC4BGlobals.testingMode; - } - public static void setWelldefinednessCheck(boolean b) { TLC4BGlobals.checkWD = b; } diff --git a/src/main/java/de/tlc4b/tlc/TLCResults.java b/src/main/java/de/tlc4b/tlc/TLCResults.java index 35782201000dd8db029749d1e9a04b24be1fd841..8864a40ba9afeac78499c022c460ddfb27445208 100644 --- a/src/main/java/de/tlc4b/tlc/TLCResults.java +++ b/src/main/java/de/tlc4b/tlc/TLCResults.java @@ -96,7 +96,7 @@ public class TLCResults implements ToolGlobals { evalAllMessages(); - if (hasTrace() || (TLC4BGlobals.getTestingMode() && OutputCollector.getInitialState() != null)) { + if (hasTrace()) { evalTrace(); } diff --git a/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java b/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java index ba07509abca2fb6a49134057a96a061e73bbc634..70a4f5ef25e4240c736a63cb6d71d23f967fccf5 100644 --- a/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java +++ b/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java @@ -1,26 +1,16 @@ package de.tlc4b.ltl; - -import static de.tlc4b.util.TestUtil.compareModuleAndConfig; -import static de.tlc4b.util.TestUtil.compareLTLFormula; - -import org.junit.BeforeClass; -import org.junit.Ignore; -import org.junit.Test; - -import de.tlc4b.TLC4BGlobals; import de.tlc4b.exceptions.LTLParseException; import de.tlc4b.exceptions.ScopeException; import de.tlc4b.exceptions.TypeErrorException; +import org.junit.Ignore; +import org.junit.Test; -public class LTLFormulaTest { +import static de.tlc4b.util.TestUtil.compareLTLFormula; +import static de.tlc4b.util.TestUtil.compareModuleAndConfig; - @BeforeClass - public static void setUp(){ - TLC4BGlobals.setTestingMode(true); - } - +public class LTLFormulaTest { @Test (expected = ScopeException.class) public void testScopeException() throws Exception { String machine = "MACHINE test\n"