diff --git a/src/test/java/de/tlc4b/analysis/RenamerTest.java b/src/test/java/de/tlc4b/analysis/RenamerTest.java index 4150660b493346827c938976e0dd5f3606147fb7..9a6bd6dc08f2840ca2357c4d94c86c66b5c7fa39 100644 --- a/src/test/java/de/tlc4b/analysis/RenamerTest.java +++ b/src/test/java/de/tlc4b/analysis/RenamerTest.java @@ -1,9 +1,10 @@ package de.tlc4b.analysis; -import static de.tlc4b.util.TestUtil.*; - import org.junit.Test; +import static de.tlc4b.util.TestUtil.*; +import static org.junit.Assert.assertEquals; + public class RenamerTest { @@ -104,7 +105,7 @@ public class RenamerTest { + "S == {aa}\n" + "ASSUME \\E aa_1 \\in {1} : TRUE\n" + "===="; - compareEquals(expected, machine); + assertEquals(expected, translate(machine)); } } diff --git a/src/test/java/de/tlc4b/prettyprint/FunctionTest.java b/src/test/java/de/tlc4b/prettyprint/FunctionTest.java index f191f7bb19c380a3b33cb287b64628c2801a7c88..f02da43887f4eccdd8ca624e97314f9bb8cf78d1 100644 --- a/src/test/java/de/tlc4b/prettyprint/FunctionTest.java +++ b/src/test/java/de/tlc4b/prettyprint/FunctionTest.java @@ -1,10 +1,9 @@ package de.tlc4b.prettyprint; -import static de.tlc4b.util.TestUtil.*; - import org.junit.Test; - +import static de.tlc4b.util.TestUtil.*; +import static org.junit.Assert.assertEquals; public class FunctionTest { @@ -97,7 +96,7 @@ public class FunctionTest { String expected = "---- MODULE test ----\n" + "ASSUME [{1} -> {1}] = [{1} -> {1}]\n" + "===="; - compareEquals(expected, machine); + assertEquals(expected, translate(machine)); } @@ -109,7 +108,7 @@ public class FunctionTest { + "EXTENDS Functions\n" + "ASSUME {} = ParFunc({1, 2}, {1, 2})\n" + "===="; - compareEquals(expected, machine); + assertEquals(expected, translate(machine)); } } diff --git a/src/test/java/de/tlc4b/prettyprint/SetTest.java b/src/test/java/de/tlc4b/prettyprint/SetTest.java index 8e66fcbcffe6ea34316fdaccc832551c2cbc4a09..f08a95b6bbbe52d0d9e3e5bf58bace2cd678df98 100644 --- a/src/test/java/de/tlc4b/prettyprint/SetTest.java +++ b/src/test/java/de/tlc4b/prettyprint/SetTest.java @@ -190,7 +190,7 @@ public class SetTest { + "ASSUME UNION({{z}: z \\in {z \\in ({1, 2}): 1 = 1}}) = {1, 2}\n" + "===="; //TODO ERROR in TLA2B - compareEquals(expected, machine); + assertEquals(expected, translate(machine)); } @Test @@ -201,7 +201,7 @@ public class SetTest { + "EXTENDS BBuiltIns\n" + "ASSUME Inter({{z}: z \\in {z \\in ({1, 2}): 1 = 1}}) = {}\n" + "===="; - compareEquals(expected, machine); + assertEquals(expected, translate(machine)); } } diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index 2a32472e205beec086482b15e8f1a635475ed11f..c4eeec7d3b648130164b6bde202c0426b48eb75e 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -124,12 +124,6 @@ public class TestUtil { // TODO Check that re-translated B machine matches original input? } - public static void compareEquals(String expected, String machine) throws BCompoundException { - Translator b2tlaTranslator = new Translator(machine); - b2tlaTranslator.translate(); - assertEquals(expected, b2tlaTranslator.getModuleString()); - } - public static String translate(String machine) throws BCompoundException { Translator translator = new Translator(machine); translator.translate();