From 3d1ae78df61a4cbffc85138287f7dd5e6f8bab42 Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Tue, 30 Jul 2024 18:49:01 +0200
Subject: [PATCH] Remove AbstractParseMachineTest ignoreList support
---
.../integration/probprivate/CoverageTest.java | 15 ++++++-----
.../tlc4b/util/AbstractParseMachineTest.java | 27 +++++--------------
2 files changed, 14 insertions(+), 28 deletions(-)
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 689247c..bf5ed77 100644
--- a/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java
+++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/CoverageTest.java
@@ -39,14 +39,15 @@ public class CoverageTest extends AbstractParseMachineTest {
@Config
public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<>();
- final ArrayList<String> ignoreList = new ArrayList<>();
list.add("build/prob_examples/public_examples/TLC/");
-
- list.add("./src/test/resources/");
- ignoreList.add("./src/test/resources/bugs/");
- ignoreList.add("./src/test/resources/compound/");
- ignoreList.add("./src/test/resources/test/");
- return getConfiguration2(list, ignoreList);
+ // The subdirectories bugs, compound, and test are intentionally not included here.
+ list.add("src/test/resources/basics/");
+ list.add("src/test/resources/composition/");
+ list.add("src/test/resources/errors/");
+ list.add("src/test/resources/laws/");
+ list.add("src/test/resources/ltl/");
+ list.add("src/test/resources/special/");
+ return getConfiguration2(list);
}
}
diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
index 31dd91a..2716e43 100644
--- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
+++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java
@@ -1,7 +1,6 @@
package de.tlc4b.util;
import java.io.File;
-import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -15,11 +14,11 @@ public abstract class AbstractParseMachineTest {
return new File(path).listFiles((dir, name) -> name.endsWith(MCH_SUFFIX));
}
- protected static File[] getMachinesRecursively(String path, ArrayList<String> ignoreList) {
- return walk(path, ignoreList).toArray(new File[0]);
+ protected static File[] getMachinesRecursively(String path) {
+ return walk(path).toArray(new File[0]);
}
- private static ArrayList<File> walk(String path, ArrayList<String> ignoreList) {
+ private static ArrayList<File> walk(String path) {
File root = new File(path);
File[] list = root.listFiles();
@@ -29,21 +28,7 @@ public abstract class AbstractParseMachineTest {
for (File f : list) {
if (f.isDirectory()) {
- boolean visitDir = true;
- for (String string : ignoreList) {
- File ignore = new File(string);
- try {
- if(f.getCanonicalPath().equals(ignore.getCanonicalPath())){
- visitDir = false;
- }
- } catch (IOException e) {
- visitDir = false;
- }
- }
- if(visitDir){
- files.addAll(walk(f.getAbsolutePath(),ignoreList));
- }
-
+ files.addAll(walk(f.getAbsolutePath()));
} else {
String name = f.getName();
if (name.endsWith(MCH_SUFFIX)) {
@@ -54,12 +39,12 @@ public abstract class AbstractParseMachineTest {
return files;
}
- protected static Configuration getConfiguration2(ArrayList<String> list, ArrayList<String> ignoreList) {
+ protected static Configuration getConfiguration2(ArrayList<String> list) {
final ArrayList<File> allMachines = new ArrayList<>();
final ArrayList<TLCResult> expectedValues = new ArrayList<>();
for (String path : list) {
- File[] machines = getMachinesRecursively(path, ignoreList);
+ File[] machines = getMachinesRecursively(path);
allMachines.addAll(Arrays.asList(machines));
for (int i = 0; i < machines.length; i++) {
expectedValues.add(TLCResult.NoError);
--
GitLab