From 24d7790c3f352ea094f1751957c14641421a8489 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 19:02:28 +0200
Subject: [PATCH] Remove TestPair
---
.../de/tlc4b/tlc/integration/BasicTest.java | 22 +++++++++----------
.../probprivate/AssertionErrorTest.java | 7 +++---
.../integration/probprivate/DeadlockTest.java | 22 +++++++++----------
.../tlc/integration/probprivate/GoalTest.java | 22 +++++++++----------
.../probprivate/InvariantViolationTest.java | 22 +++++++++----------
.../integration/probprivate/NoErrorTest.java | 22 +++++++++----------
.../probprivate/WellDefinednessTest.java | 7 +++---
.../tlc4b/util/AbstractParseMachineTest.java | 8 +++----
src/test/java/de/tlc4b/util/TestPair.java | 22 -------------------
9 files changed, 61 insertions(+), 93 deletions(-)
delete mode 100644 src/test/java/de/tlc4b/util/TestPair.java
diff --git a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
index 23d6a18..556c0ec 100644
--- a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
@@ -1,18 +1,18 @@
package de.tlc4b.tlc.integration;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
+
import org.junit.Test;
import org.junit.runner.RunWith;
-import java.io.File;
-import java.util.ArrayList;
-import java.util.List;
-
import static de.tlc4b.TLC4BOption.DFID;
import static de.tlc4b.tlc.TLCResults.TLCResult.NoError;
import static de.tlc4b.util.TestUtil.test;
@@ -43,11 +43,11 @@ public class BasicTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(NoError, "./src/test/resources/composition/sees"));
- list.add(new TestPair(NoError, "./src/test/resources/composition/sees2"));
- list.add(new TestPair(NoError, "./src/test/resources/basics"));
- list.add(new TestPair(NoError, "./src/test/resources/laws"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("./src/test/resources/composition/sees");
+ list.add("./src/test/resources/composition/sees2");
+ list.add("./src/test/resources/basics");
+ list.add("./src/test/resources/laws");
+ return getConfiguration(list, NoError);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
index 5d1cdc6..ee6c53e 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
@@ -9,7 +9,6 @@ import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,8 +36,8 @@ public class AssertionErrorTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(AssertionError, "build/prob_examples/public_examples/TLC/AssertionError"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/AssertionError");
+ return getConfiguration(list, AssertionError);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
index 2a5f9e6..b2a84f9 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
@@ -1,23 +1,22 @@
package de.tlc4b.tlc.integration.probprivate;
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.Deadlock;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
@RunWith(PolySuite.class)
public class DeadlockTest extends AbstractParseMachineTest {
@@ -37,9 +36,8 @@ public class DeadlockTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(Deadlock,
- "build/prob_examples/public_examples/TLC/Deadlock"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/Deadlock");
+ return getConfiguration(list, Deadlock);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
index c3faa91..937f228 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
@@ -1,23 +1,22 @@
package de.tlc4b.tlc.integration.probprivate;
-import static org.junit.Assert.assertEquals;
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.Goal;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
@RunWith(PolySuite.class)
public class GoalTest extends AbstractParseMachineTest {
@@ -37,9 +36,8 @@ public class GoalTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(Goal,
- "build/prob_examples/public_examples/TLC/GOAL"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/GOAL");
+ return getConfiguration(list, Goal);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
index 158346e..27990f0 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
@@ -1,23 +1,22 @@
package de.tlc4b.tlc.integration.probprivate;
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.InvariantViolation;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
@RunWith(PolySuite.class)
public class InvariantViolationTest extends AbstractParseMachineTest {
@@ -37,9 +36,8 @@ public class InvariantViolationTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(InvariantViolation,
- "build/prob_examples/public_examples/TLC/InvariantViolation"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/InvariantViolation");
+ return getConfiguration(list, InvariantViolation);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
index aa3b8ba..d8a42a4 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
@@ -1,23 +1,22 @@
package de.tlc4b.tlc.integration.probprivate;
-import static de.tlc4b.tlc.TLCResults.TLCResult.*;
-import static de.tlc4b.util.TestUtil.test;
-import static org.junit.Assert.assertEquals;
-
import java.io.File;
import java.util.ArrayList;
import java.util.List;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
-import de.tlc4b.util.TestPair;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static de.tlc4b.tlc.TLCResults.TLCResult.NoError;
+import static de.tlc4b.util.TestUtil.test;
+import static org.junit.Assert.assertEquals;
+
@RunWith(PolySuite.class)
public class NoErrorTest extends AbstractParseMachineTest {
@@ -37,10 +36,9 @@ public class NoErrorTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(NoError,
- "build/prob_examples/public_examples/TLC/NoError"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/NoError");
+ return getConfiguration(list, NoError);
}
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
index 533bc46..543d75c 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
@@ -9,7 +9,6 @@ import de.tlc4b.util.AbstractParseMachineTest;
import de.tlc4b.util.PolySuite;
import de.tlc4b.util.PolySuite.Config;
import de.tlc4b.util.PolySuite.Configuration;
-import de.tlc4b.util.TestPair;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -37,8 +36,8 @@ public class WellDefinednessTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- List<TestPair> list = new ArrayList<>();
- list.add(new TestPair(WellDefinednessError, "build/prob_examples/public_examples/TLC/WellDefinednessError"));
- return getConfiguration(list);
+ List<String> list = new ArrayList<>();
+ list.add("build/prob_examples/public_examples/TLC/WellDefinednessError");
+ return getConfiguration(list, WellDefinednessError);
}
}
diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
index 138b9c4..1bf4e0e 100644
--- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
+++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
@@ -67,15 +67,15 @@ public abstract class AbstractParseMachineTest {
};
}
- protected static Configuration getConfiguration(List<TestPair> list) {
+ protected static Configuration getConfiguration(List<String> list, TLCResult expectedResult) {
List<File> allMachines = new ArrayList<>();
List<TLCResult> expectedValues = new ArrayList<>();
- for (TestPair testPair : list) {
- File[] machines = getMachines(testPair.getPath());
+ for (String path : list) {
+ File[] machines = getMachines(path);
allMachines.addAll(Arrays.asList(machines));
for (int i = 0; i < machines.length; i++) {
- expectedValues.add(testPair.getResult());
+ expectedValues.add(expectedResult);
}
}
diff --git a/src/test/java/de/tlc4b/util/TestPair.java b/src/test/java/de/tlc4b/util/TestPair.java
deleted file mode 100644
index 8bdc29b..0000000
--- a/src/test/java/de/tlc4b/util/TestPair.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package de.tlc4b.util;
-
-import de.tlc4b.tlc.TLCResults.TLCResult;
-
-
-public class TestPair {
- private final TLCResult error;
- private final String path;
-
- public TestPair(TLCResult error, String path) {
- this.error = error;
- this.path = path;
- }
-
- public TLCResult getResult() {
- return error;
- }
-
- public String getPath() {
- return path;
- }
-}
\ No newline at end of file
--
GitLab