From 30cb62262422653fa255e9d85f8be512d313d2f0 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 20:25:22 +0200
Subject: [PATCH] Combine compareEqualsConfig into compareModuleAndConfig
---
src/test/java/de/tlc4b/ltl/LTLFormulaTest.java | 4 ++--
src/test/java/de/tlc4b/prettyprint/EnumeratedSetsTest.java | 2 +-
src/test/java/de/tlc4b/util/TestUtil.java | 6 +-----
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java b/src/test/java/de/tlc4b/ltl/LTLFormulaTest.java
index 8e4ead8..dc8ed94 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 f610ead..5164f1b 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 f0da9dd..4504890 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);
--
GitLab