Skip to content
Snippets Groups Projects
Commit 56e8787d authored by dgelessus's avatar dgelessus
Browse files

Remove all prints from tests

parent 4bf34c97
No related branches found
No related tags found
No related merge requests found
...@@ -74,7 +74,6 @@ public class FunctionTest { ...@@ -74,7 +74,6 @@ public class FunctionTest {
+ "ASSUME k = [x \\in {1}, <<y,z>> \\in {<<1,TRUE>>} |-> TRUE] \n" + "ASSUME k = [x \\in {1}, <<y,z>> \\in {<<1,TRUE>>} |-> TRUE] \n"
+ "================================="; + "=================================";
TestTypeChecker t = TestUtil.typeCheckString(module); TestTypeChecker t = TestUtil.typeCheckString(module);
//System.out.println(t.getConstantType("k").toString());
assertEquals("POW(INTEGER*(INTEGER*BOOL)*BOOL)", t.getConstantType("k") assertEquals("POW(INTEGER*(INTEGER*BOOL)*BOOL)", t.getConstantType("k")
.toString()); .toString());
} }
......
...@@ -52,7 +52,6 @@ public class OpArgTest { ...@@ -52,7 +52,6 @@ public class OpArgTest {
final String config = "CONSTANTS k <- def"; final String config = "CONSTANTS k <- def";
TestTypeChecker t = TestUtil.typeCheckString(module, config); TestTypeChecker t = TestUtil.typeCheckString(module, config);
assertEquals("BOOL", t.getConstantType("k2")); assertEquals("BOOL", t.getConstantType("k2"));
System.out.println(t.getDefinitionType("def"));
assertEquals("BOOL", t.getDefinitionType("def")); assertEquals("BOOL", t.getDefinitionType("def"));
assertEquals("BOOL", t.getDefinitionParamType("def", "a")); assertEquals("BOOL", t.getDefinitionParamType("def", "a"));
} }
......
...@@ -25,23 +25,16 @@ public class TestUtil { ...@@ -25,23 +25,16 @@ public class TestUtil {
Translator t = new Translator(tlaFile); Translator t = new Translator(tlaFile);
Start start = t.translate(); Start start = t.translate();
System.out.println("-------------------");
ASTPrettyPrinter aP = new ASTPrettyPrinter(start); ASTPrettyPrinter aP = new ASTPrettyPrinter(start);
start.apply(aP); start.apply(aP);
System.out.println(aP.getResultString());
final BParser parser = new BParser("testcase"); final BParser parser = new BParser("testcase");
final Start ppStart = parser.parse(aP.getResultString(), false); final Start ppStart = parser.parse(aP.getResultString(), false);
String result = getTreeAsString(start); String result = getTreeAsString(start);
System.out.println(result);
String ppResult = getTreeAsString(ppStart); String ppResult = getTreeAsString(ppStart);
System.out.println(ppResult);
System.out.println("-------------------");
// compare the generated AST and the AST of the pretty print // compare the generated AST and the AST of the pretty print
// assertEquals(result, ppResult); // assertEquals(result, ppResult);
// System.out.println(t.getBDefinitions().getDefinitionNames());
} }
public static void compareExpr(String bExpr, String tlaExpr) throws Exception { public static void compareExpr(String bExpr, String tlaExpr) throws Exception {
...@@ -51,7 +44,6 @@ public class TestUtil { ...@@ -51,7 +44,6 @@ public class TestUtil {
Renamer renamer = new Renamer(resultNode); Renamer renamer = new Renamer(resultNode);
ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode, renamer); ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode, renamer);
resultNode.apply(aP); resultNode.apply(aP);
System.out.println(aP.getResultString());
String bAstString = getAstStringofBExpressionString(bExpr); String bAstString = getAstStringofBExpressionString(bExpr);
String result = getAstStringofBExpressionString(aP.getResultString()); String result = getAstStringofBExpressionString(aP.getResultString());
// String tlaAstString = getTreeAsString(resultNode); // String tlaAstString = getTreeAsString(resultNode);
...@@ -77,41 +69,17 @@ public class TestUtil { ...@@ -77,41 +69,17 @@ public class TestUtil {
Translator trans = new Translator(tlaModule, null); Translator trans = new Translator(tlaModule, null);
Start resultNode = trans.translate(); Start resultNode = trans.translate();
String result = getTreeAsString(resultNode); 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); assertEquals(expected, result);
// System.out.println(result);
// assertEquals(expected, getTreeAsString(ast));
} }
public static void compare(String bMachine, String tlaModule, String config) throws Exception { public static void compare(String bMachine, String tlaModule, String config) throws Exception {
ToolIO.setMode(ToolIO.TOOL); ToolIO.setMode(ToolIO.TOOL);
String expected = getAstStringofBMachineString(bMachine); String expected = getAstStringofBMachineString(bMachine);
System.out.println(expected);
Translator trans = new Translator(tlaModule, config); Translator trans = new Translator(tlaModule, config);
Start resultNode = trans.translate(); Start resultNode = trans.translate();
ASTPrettyPrinter aP = new ASTPrettyPrinter(resultNode);
resultNode.apply(aP);
System.out.println(aP.getResultString());
String result = getTreeAsString(resultNode); String result = getTreeAsString(resultNode);
System.out.println(result);
assertEquals(expected, result); assertEquals(expected, result);
} }
...@@ -127,8 +95,6 @@ public class TestUtil { ...@@ -127,8 +95,6 @@ public class TestUtil {
Renamer renamer = new Renamer(start); Renamer renamer = new Renamer(start);
ASTPrettyPrinter aP = new ASTPrettyPrinter(start, renamer); ASTPrettyPrinter aP = new ASTPrettyPrinter(start, renamer);
start.apply(aP); start.apply(aP);
System.out.println(aP.getResultString());
final BParser parser = new BParser("testcase"); final BParser parser = new BParser("testcase");
parser.parse(aP.getResultString(), false); parser.parse(aP.getResultString(), false);
} }
......
...@@ -30,7 +30,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest { ...@@ -30,7 +30,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
@Test @Test
public void testRunTLC() throws Exception { public void testRunTLC() throws Exception {
// String[] a = new String[] { moduleFile.getPath() }; // String[] a = new String[] { moduleFile.getPath() };
System.out.println(moduleFile.getPath());
// runModule(moduleFile.getPath()); // runModule(moduleFile.getPath());
Translator t = new Translator(moduleFile.getPath()); Translator t = new Translator(moduleFile.getPath());
Start start = t.translate(); Start start = t.translate();
...@@ -38,7 +37,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest { ...@@ -38,7 +37,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
ASTPrettyPrinter aP = new ASTPrettyPrinter(start); ASTPrettyPrinter aP = new ASTPrettyPrinter(start);
start.apply(aP); start.apply(aP);
System.out.println(aP.getResultString());
// parse pretty print result // parse pretty print result
final BParser parser = new BParser("testcase"); final BParser parser = new BParser("testcase");
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment