diff --git a/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java b/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java index 8e4ead8e8d8ce6ff24aafb03f723f86f6a9b72e2..dc8ed947e1dc8d491358748c378dee66f9e730ac 100644 --- a/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java +++ b/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java @@ -1,7 +1,7 @@ package de.tlc4b.ltl; -import static de.tlc4b.util.TestUtil.compareEqualsConfig; +import static de.tlc4b.util.TestUtil.compareModuleAndConfig; import static de.tlc4b.util.TestUtil.compareLTLFormula; import org.junit.BeforeClass; @@ -284,7 +284,7 @@ public class LTLFormulaTest { + "===="; final String config = "SPECIFICATION Spec\nINVARIANT Invariant\nPROPERTIES ASSERT_LTL\n"; - compareEqualsConfig(expected, config, machine); + compareModuleAndConfig(expected, config, machine); } } diff --git a/src/test/java/de/tlc4b/prettyprint/EnumeratedSetsTest.java b/src/test/java/de/tlc4b/prettyprint/EnumeratedSetsTest.java index f610ead1fccd087b10f4b04e8edf232755d8222d..5164f1b7d17a2d86d73442f1d69564cc0f1156c3 100644 --- a/src/test/java/de/tlc4b/prettyprint/EnumeratedSetsTest.java +++ b/src/test/java/de/tlc4b/prettyprint/EnumeratedSetsTest.java @@ -17,6 +17,6 @@ public class EnumeratedSetsTest { + "set2 == {d}\n" + "===="; final String config = "CONSTANTS\na = a\nb = b\nc = c\nd = d\n"; - compareEqualsConfig(expected, config, machine); + compareModuleAndConfig(expected, config, machine); } } diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index f0da9dd2a1c4e5c8df87e62a4d0dd0533d9c8ee1..45048900e093b5645e5fe92785ff4c874e4c755b 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -116,7 +116,7 @@ public class TestUtil { // TODO Check that re-translated B machine matches original input? } - public static void compareEqualsConfig(String expectedModule, String expectedConfig, String machine) + public static void compareModuleAndConfig(String expectedModule, String expectedConfig, String machine) throws Exception { Translator b2tlaTranslator = new Translator(machine); b2tlaTranslator.translate(); @@ -131,10 +131,6 @@ public class TestUtil { assertEquals(expectedConfig, b2tlaTranslator.getConfigString()); } - public static void compareModuleAndConfig(String expectedModule, String expectedConfig, String machine) throws Exception { - compareEqualsConfig(expectedModule, expectedConfig, machine); - } - public static void compareEquals(String expected, String machine) throws BException { try { Translator b2tlaTranslator = new Translator(machine);