Skip to content
Snippets Groups Projects
Commit 30cb6226 authored by dgelessus's avatar dgelessus
Browse files

Combine compareEqualsConfig into compareModuleAndConfig

parent d0a4ff3c
No related branches found
No related tags found
No related merge requests found
package de.tlc4b.ltl; 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 static de.tlc4b.util.TestUtil.compareLTLFormula;
import org.junit.BeforeClass; import org.junit.BeforeClass;
...@@ -284,7 +284,7 @@ public class LTLFormulaTest { ...@@ -284,7 +284,7 @@ public class LTLFormulaTest {
+ "===="; + "====";
final String config = "SPECIFICATION Spec\nINVARIANT Invariant\nPROPERTIES ASSERT_LTL\n"; final String config = "SPECIFICATION Spec\nINVARIANT Invariant\nPROPERTIES ASSERT_LTL\n";
compareEqualsConfig(expected, config, machine); compareModuleAndConfig(expected, config, machine);
} }
} }
...@@ -17,6 +17,6 @@ public class EnumeratedSetsTest { ...@@ -17,6 +17,6 @@ public class EnumeratedSetsTest {
+ "set2 == {d}\n" + "set2 == {d}\n"
+ "===="; + "====";
final String config = "CONSTANTS\na = a\nb = b\nc = c\nd = d\n"; final String config = "CONSTANTS\na = a\nb = b\nc = c\nd = d\n";
compareEqualsConfig(expected, config, machine); compareModuleAndConfig(expected, config, machine);
} }
} }
...@@ -116,7 +116,7 @@ public class TestUtil { ...@@ -116,7 +116,7 @@ public class TestUtil {
// TODO Check that re-translated B machine matches original input? // 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 { throws Exception {
Translator b2tlaTranslator = new Translator(machine); Translator b2tlaTranslator = new Translator(machine);
b2tlaTranslator.translate(); b2tlaTranslator.translate();
...@@ -131,10 +131,6 @@ public class TestUtil { ...@@ -131,10 +131,6 @@ public class TestUtil {
assertEquals(expectedConfig, b2tlaTranslator.getConfigString()); 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 { public static void compareEquals(String expected, String machine) throws BException {
try { try {
Translator b2tlaTranslator = new Translator(machine); Translator b2tlaTranslator = new Translator(machine);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment