From 09f9a4d8cba3e4ccb97fbcac340663a3ce1244ac Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:51:36 +0200
Subject: [PATCH] Weaken list types in AbstractParseMachineTest
---
.../de/tlc4b/tlc/integration/BasicTest.java | 3 ++-
.../probprivate/AssertionErrorTest.java | 3 ++-
.../integration/probprivate/CoverageTest.java | 3 ++-
.../integration/probprivate/DeadlockTest.java | 3 ++-
.../tlc/integration/probprivate/GoalTest.java | 3 ++-
.../probprivate/InvariantViolationTest.java | 3 ++-
.../integration/probprivate/NoErrorTest.java | 3 ++-
.../probprivate/WellDefinednessTest.java | 3 ++-
.../de/tlc4b/util/AbstractParseMachineTest.java | 17 +++++++++--------
9 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
index 0749c2d..23d6a18 100644
--- a/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/BasicTest.java
@@ -11,6 +11,7 @@ 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;
@@ -42,7 +43,7 @@ public class BasicTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ 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"));
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 3469cd6..5d1cdc6 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java
@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
@@ -36,7 +37,7 @@ public class AssertionErrorTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(AssertionError, "build/prob_examples/public_examples/TLC/AssertionError"));
return getConfiguration(list);
}
diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java
index bf5ed77..8b7b3f0 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java
@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import de.tlc4b.TLC4B;
import de.tlc4b.tlc.TLCResults.TLCResult;
@@ -38,7 +39,7 @@ public class CoverageTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<String> list = new ArrayList<>();
+ List<String> list = new ArrayList<>();
list.add("build/prob_examples/public_examples/TLC/");
// The subdirectories bugs, compound, and test are intentionally not included here.
list.add("src/test/resources/basics/");
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 5f164b4..2a5f9e6 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java
@@ -6,6 +6,7 @@ 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;
@@ -36,7 +37,7 @@ public class DeadlockTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(Deadlock,
"build/prob_examples/public_examples/TLC/Deadlock"));
return getConfiguration(list);
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 b33f198..c3faa91 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java
@@ -6,6 +6,7 @@ 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;
@@ -36,7 +37,7 @@ public class GoalTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(Goal,
"build/prob_examples/public_examples/TLC/GOAL"));
return getConfiguration(list);
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 dd913a4..158346e 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java
@@ -6,6 +6,7 @@ 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;
@@ -36,7 +37,7 @@ public class InvariantViolationTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(InvariantViolation,
"build/prob_examples/public_examples/TLC/InvariantViolation"));
return getConfiguration(list);
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 7a2252c..aa3b8ba 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java
@@ -6,6 +6,7 @@ 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;
@@ -36,7 +37,7 @@ public class NoErrorTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(NoError,
"build/prob_examples/public_examples/TLC/NoError"));
return getConfiguration(list);
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 2676795..533bc46 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java
@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File;
import java.util.ArrayList;
+import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest;
@@ -36,7 +37,7 @@ public class WellDefinednessTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
- final ArrayList<TestPair> list = new ArrayList<>();
+ List<TestPair> list = new ArrayList<>();
list.add(new TestPair(WellDefinednessError, "build/prob_examples/public_examples/TLC/WellDefinednessError"));
return getConfiguration(list);
}
diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
index 2716e43..805c3ca 100644
--- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
+++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
@@ -3,6 +3,7 @@ package de.tlc4b.util;
import java.io.File;
import java.util.ArrayList;
import java.util.Arrays;
+import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.PolySuite.Configuration;
@@ -18,11 +19,11 @@ public abstract class AbstractParseMachineTest {
return walk(path).toArray(new File[0]);
}
- private static ArrayList<File> walk(String path) {
+ private static List<File> walk(String path) {
File root = new File(path);
File[] list = root.listFiles();
- ArrayList<File> files = new ArrayList<>();
+ List<File> files = new ArrayList<>();
if (list == null)
return files;
@@ -39,10 +40,10 @@ public abstract class AbstractParseMachineTest {
return files;
}
- protected static Configuration getConfiguration2(ArrayList<String> list) {
- final ArrayList<File> allMachines = new ArrayList<>();
+ protected static Configuration getConfiguration2(List<String> list) {
+ List<File> allMachines = new ArrayList<>();
- final ArrayList<TLCResult> expectedValues = new ArrayList<>();
+ List<TLCResult> expectedValues = new ArrayList<>();
for (String path : list) {
File[] machines = getMachinesRecursively(path);
allMachines.addAll(Arrays.asList(machines));
@@ -70,10 +71,10 @@ public abstract class AbstractParseMachineTest {
};
}
- protected static Configuration getConfiguration(ArrayList<TestPair> list) {
- final ArrayList<File> allMachines = new ArrayList<>();
+ protected static Configuration getConfiguration(List<TestPair> list) {
+ List<File> allMachines = new ArrayList<>();
- final ArrayList<TLCResult> expectedValues = new ArrayList<>();
+ List<TLCResult> expectedValues = new ArrayList<>();
for (TestPair testPair : list) {
File[] machines = getMachines(testPair.getPath());
allMachines.addAll(Arrays.asList(machines));
--
GitLab