diff --git a/src/test/java/de/tla2b/typechecking/FunctionTest.java b/src/test/java/de/tla2b/typechecking/FunctionTest.java index 4bba2f6ddda5d13dce25054fdb8702a3bcb5b59d..8b528b41e9bb063fbd8ce3a60149fe978ea169cb 100644 --- a/src/test/java/de/tla2b/typechecking/FunctionTest.java +++ b/src/test/java/de/tla2b/typechecking/FunctionTest.java @@ -74,7 +74,6 @@ public class FunctionTest { + "ASSUME k = [x \\in {1}, <<y,z>> \\in {<<1,TRUE>>} |-> TRUE] \n" + "================================="; TestTypeChecker t = TestUtil.typeCheckString(module); - //System.out.println(t.getConstantType("k").toString()); assertEquals("POW(INTEGER*(INTEGER*BOOL)*BOOL)", t.getConstantType("k") .toString()); } diff --git a/src/test/java/de/tla2b/typechecking/OpArgTest.java b/src/test/java/de/tla2b/typechecking/OpArgTest.java index 3895f898e317c5ddfde4970d65016400b8b8ab3c..5c0abe06e76de4bfcfae97786c6cd98d2bfa3774 100644 --- a/src/test/java/de/tla2b/typechecking/OpArgTest.java +++ b/src/test/java/de/tla2b/typechecking/OpArgTest.java @@ -52,7 +52,6 @@ public class OpArgTest { final String config = "CONSTANTS k <- def"; TestTypeChecker t = TestUtil.typeCheckString(module, config); assertEquals("BOOL", t.getConstantType("k2")); - System.out.println(t.getDefinitionType("def")); assertEquals("BOOL", t.getDefinitionType("def")); assertEquals("BOOL", t.getDefinitionParamType("def", "a")); } diff --git a/src/test/java/de/tla2b/util/TestUtil.java b/src/test/java/de/tla2b/util/TestUtil.java index d608f42dd69af89bf96aea08a49552ce53374444..66b88253eefbe293119db96ca6be306a1ba1d06c 100644 --- a/src/test/java/de/tla2b/util/TestUtil.java +++ b/src/test/java/de/tla2b/util/TestUtil.java @@ -25,23 +25,16 @@ public class TestUtil { Translator t = new Translator(tlaFile); Start start = t.translate(); - System.out.println("-------------------"); ASTPrettyPrinter aP = new ASTPrettyPrinter(start); start.apply(aP); - System.out.println(aP.getResultString()); - final BParser parser = new BParser("testcase"); final Start ppStart = parser.parse(aP.getResultString(), false); String result = getTreeAsString(start); - System.out.println(result); String ppResult = getTreeAsString(ppStart); - System.out.println(ppResult); - System.out.println("-------------------"); // compare the generated AST and the AST of the pretty print // assertEquals(result, ppResult); - // System.out.println(t.getBDefinitions().getDefinitionNames()); } public static void compareExpr(String bExpr, String tlaExpr) throws Exception { @@ -51,7 +44,6 @@ public class TestUtil { Renamer renamer = new Renamer(resultNode); ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode, renamer); resultNode.apply(aP); - System.out.println(aP.getResultString()); String bAstString = getAstStringofBExpressionString(bExpr); String result = getAstStringofBExpressionString(aP.getResultString()); // String tlaAstString = getTreeAsString(resultNode); @@ -77,41 +69,17 @@ public class TestUtil { Translator trans = new Translator(tlaModule, null); Start resultNode = trans.translate(); String result = getTreeAsString(resultNode); - System.out.println(expected); - System.out.println(result); - - ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode); - resultNode.apply(aP); - System.out.println("-------------------"); - System.out.println(aP.getResultString()); - final BParser parser = new BParser("testcase"); - // Start ast = parser.parse(aP.getResultString(), false); - // BParser.printASTasProlog(System.out, new BParser(), new - // File("./test.mch"), resultNode, false, true, null); - - // System.out.println("----------PP------------"); - // System.out.println(aP.getResultString()); - // System.out.println(getTreeAsString(ast)); assertEquals(expected, result); - - // System.out.println(result); - // assertEquals(expected, getTreeAsString(ast)); } public static void compare(String bMachine, String tlaModule, String config) throws Exception { ToolIO.setMode(ToolIO.TOOL); String expected = getAstStringofBMachineString(bMachine); - System.out.println(expected); Translator trans = new Translator(tlaModule, config); Start resultNode = trans.translate(); - ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode); - resultNode.apply(aP); - System.out.println(aP.getResultString()); - String result = getTreeAsString(resultNode); - System.out.println(result); assertEquals(expected, result); } @@ -127,8 +95,6 @@ public class TestUtil { Renamer renamer = new Renamer(start); ASTPrettyPrinter aP = new ASTPrettyPrinter(start, renamer); start.apply(aP); - System.out.println(aP.getResultString()); - final BParser parser = new BParser("testcase"); parser.parse(aP.getResultString(), false); } diff --git a/src/test/java/testing/ExampleFilesTest.java b/src/test/java/testing/ExampleFilesTest.java index d5e4c67c0d6848887a4c077fdd5d403ba89cc0a7..b809a0a67ad28c5c4e66b582f896838d1b8f0536 100644 --- a/src/test/java/testing/ExampleFilesTest.java +++ b/src/test/java/testing/ExampleFilesTest.java @@ -30,7 +30,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest { @Test public void testRunTLC() throws Exception { // String[] a = new String[] { moduleFile.getPath() }; - System.out.println(moduleFile.getPath()); // runModule(moduleFile.getPath()); Translator t = new Translator(moduleFile.getPath()); Start start = t.translate(); @@ -38,7 +37,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest { ASTPrettyPrinter aP = new ASTPrettyPrinter(start); start.apply(aP); - System.out.println(aP.getResultString()); // parse pretty print result final BParser parser = new BParser("testcase");