diff --git a/src/test/java/de/tla2b/examples/RegressionTests.java b/src/test/java/de/tla2b/examples/RegressionTests.java index 791533bdebffe2c99cd34519b198053d8aa32d8c..506ebcdb289073350861c8ab4b92e93775f81089 100644 --- a/src/test/java/de/tla2b/examples/RegressionTests.java +++ b/src/test/java/de/tla2b/examples/RegressionTests.java @@ -28,8 +28,7 @@ public class RegressionTests extends AbstractParseModuleTest { @Config public static Configuration getConfig() { final ArrayList<String> list = new ArrayList<String>(); - final ArrayList<String> ignoreList = new ArrayList<String>(); list.add("./src/test/resources/regression"); - return getConfiguration2(list, ignoreList); + return getConfiguration2(list); } } diff --git a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java b/src/test/java/de/tla2b/util/AbstractParseModuleTest.java index f30bbdb7f17abad6510b26ae11e5d9935407e329..602161b1638181aa391898cc6205e31c366ecf7c 100644 --- a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java +++ b/src/test/java/de/tla2b/util/AbstractParseModuleTest.java @@ -2,7 +2,6 @@ package de.tla2b.util; import java.io.File; import java.io.FilenameFilter; -import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; @@ -30,12 +29,11 @@ public abstract class AbstractParseModuleTest { return dir.listFiles(new ModuleFilenameFilter()); } - protected static File[] getModulesRecursively(String path, ArrayList<String> ignoreList) { - File[] files = walk(path, ignoreList).toArray(new File[0]); - return files; + protected static File[] getModulesRecursively(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(); @@ -45,20 +43,7 @@ public abstract class AbstractParseModuleTest { 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(); @@ -72,12 +57,12 @@ public abstract class AbstractParseModuleTest { return files; } - protected static Configuration getConfiguration2(ArrayList<String> list, ArrayList<String> ignoreList) { + protected static Configuration getConfiguration2(ArrayList<String> list) { final ArrayList<File> allModules = new ArrayList<File>(); final ArrayList<Object> expectedValues = new ArrayList<Object>(); for (String path : list) { - File[] modules = getModulesRecursively(path, ignoreList); + File[] modules = getModulesRecursively(path); allModules.addAll(Arrays.asList(modules)); for (int i = 0; i < modules.length; i++) { expectedValues.add(1); @@ -104,4 +89,4 @@ public abstract class AbstractParseModuleTest { } -} \ No newline at end of file +} diff --git a/src/test/java/testing/ExampleFilesTest.java b/src/test/java/testing/ExampleFilesTest.java index ad2dfc1c3b545b6039855343be802052b910548d..5d88458bf98140e67d69776c02ba903bf4f10702 100644 --- a/src/test/java/testing/ExampleFilesTest.java +++ b/src/test/java/testing/ExampleFilesTest.java @@ -66,10 +66,7 @@ public class ExampleFilesTest extends AbstractParseModuleTest { @Config public static Configuration getConfig() { final ArrayList<String> list = new ArrayList<String>(); - final ArrayList<String> ignoreList = new ArrayList<String>(); - list.add("./src/test/resources/prettyprint/OperationsTest/"); - // ignoreList.add("./src/test/resources/testing/"); - return getConfiguration2(list, ignoreList); + return getConfiguration2(list); } }