diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java index baab6fc1cab29c1ebc47300dba84b792eb0c8b01..e6f0e66ea113f826b5787a3c975e0375791a0042 100644 --- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java +++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java @@ -9,38 +9,11 @@ import de.tlc4b.tlc.TLCResults.TLCResult; import de.tlc4b.util.PolySuite.Configuration; public abstract class AbstractParseMachineTest { - private static final String MCH_SUFFIX = ".mch"; - - protected static File[] getMachines(String path) { - return new File(path).listFiles((dir, name) -> name.endsWith(MCH_SUFFIX)); - } - - protected static List<File> getMachinesRecursively(String path) { - File root = new File(path); - File[] list = root.listFiles(); - - List<File> files = new ArrayList<>(); - if (list == null) - return files; - - for (File f : list) { - if (f.isDirectory()) { - files.addAll(getMachinesRecursively(f.getAbsolutePath())); - } else { - String name = f.getName(); - if (name.endsWith(MCH_SUFFIX)) { - files.add(f); - } - } - } - return files; - } - protected static Configuration getConfiguration2(List<String> list) { List<File> allMachines = new ArrayList<>(); for (String path : list) { - allMachines.addAll(getMachinesRecursively(path)); + allMachines.addAll(TestUtil.getMachinesRecursively(path)); } return new Configuration() { @@ -66,7 +39,7 @@ public abstract class AbstractParseMachineTest { List<File> allMachines = new ArrayList<>(); for (String path : list) { - allMachines.addAll(Arrays.asList(getMachines(path))); + allMachines.addAll(Arrays.asList(TestUtil.getMachines(path))); } return new Configuration() { diff --git a/src/test/java/de/tlc4b/util/TestUtil.java b/src/test/java/de/tlc4b/util/TestUtil.java index 4b9d4d92fac48510214b64bbd98b19fb7f3e1a6d..70a961b0761b8841c6a1b6de8c494fa7b72cf6f0 100644 --- a/src/test/java/de/tlc4b/util/TestUtil.java +++ b/src/test/java/de/tlc4b/util/TestUtil.java @@ -1,6 +1,7 @@ package de.tlc4b.util; import java.io.BufferedReader; +import java.io.File; import java.io.IOException; import java.io.InputStream; import java.io.InputStreamReader; @@ -23,6 +24,34 @@ import static de.tlc4b.TLC4BOption.NOTRACE; import static org.junit.Assert.assertEquals; public class TestUtil { + private static final String MCH_SUFFIX = ".mch"; + + public static File[] getMachines(String path) { + return new File(path).listFiles((dir, name) -> name.endsWith(MCH_SUFFIX)); + } + + public static List<File> getMachinesRecursively(String path) { + File root = new File(path); + File[] list = root.listFiles(); + + List<File> files = new ArrayList<>(); + if (list == null) { + return files; + } + + for (File f : list) { + if (f.isDirectory()) { + files.addAll(getMachinesRecursively(f.getAbsolutePath())); + } else { + String name = f.getName(); + if (name.endsWith(MCH_SUFFIX)) { + files.add(f); + } + } + } + + return files; + } public static void compare(final String expectedModule, final String machineString) throws BCompoundException, TLA2BException { TLC4BGlobals.setForceTLCToEvalConstants(false);