Skip to content
Snippets Groups Projects
Commit 80cefb99 authored by dgelessus's avatar dgelessus
Browse files

Remove unused ignoreList from AbstractParseModuleTest

parent e1b48188
No related branches found
No related tags found
No related merge requests found
...@@ -28,8 +28,7 @@ public class RegressionTests extends AbstractParseModuleTest { ...@@ -28,8 +28,7 @@ public class RegressionTests extends AbstractParseModuleTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<String>(); final ArrayList<String> list = new ArrayList<String>();
final ArrayList<String> ignoreList = new ArrayList<String>();
list.add("./src/test/resources/regression"); list.add("./src/test/resources/regression");
return getConfiguration2(list, ignoreList); return getConfiguration2(list);
} }
} }
...@@ -2,7 +2,6 @@ package de.tla2b.util; ...@@ -2,7 +2,6 @@ package de.tla2b.util;
import java.io.File; import java.io.File;
import java.io.FilenameFilter; import java.io.FilenameFilter;
import java.io.IOException;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
...@@ -30,12 +29,11 @@ public abstract class AbstractParseModuleTest { ...@@ -30,12 +29,11 @@ public abstract class AbstractParseModuleTest {
return dir.listFiles(new ModuleFilenameFilter()); return dir.listFiles(new ModuleFilenameFilter());
} }
protected static File[] getModulesRecursively(String path, ArrayList<String> ignoreList) { protected static File[] getModulesRecursively(String path) {
File[] files = walk(path, ignoreList).toArray(new File[0]); return walk(path).toArray(new File[0]);
return files;
} }
private static ArrayList<File> walk(String path, ArrayList<String> ignoreList) { private static ArrayList<File> walk(String path) {
File root = new File(path); File root = new File(path);
File[] list = root.listFiles(); File[] list = root.listFiles();
...@@ -45,20 +43,7 @@ public abstract class AbstractParseModuleTest { ...@@ -45,20 +43,7 @@ public abstract class AbstractParseModuleTest {
for (File f : list) { for (File f : list) {
if (f.isDirectory()) { if (f.isDirectory()) {
boolean visitDir = true; files.addAll(walk(f.getAbsolutePath()));
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));
}
} else { } else {
String name =f.getName(); String name =f.getName();
...@@ -72,12 +57,12 @@ public abstract class AbstractParseModuleTest { ...@@ -72,12 +57,12 @@ public abstract class AbstractParseModuleTest {
return files; 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<File> allModules = new ArrayList<File>();
final ArrayList<Object> expectedValues = new ArrayList<Object>(); final ArrayList<Object> expectedValues = new ArrayList<Object>();
for (String path : list) { for (String path : list) {
File[] modules = getModulesRecursively(path, ignoreList); File[] modules = getModulesRecursively(path);
allModules.addAll(Arrays.asList(modules)); allModules.addAll(Arrays.asList(modules));
for (int i = 0; i < modules.length; i++) { for (int i = 0; i < modules.length; i++) {
expectedValues.add(1); expectedValues.add(1);
......
...@@ -66,10 +66,7 @@ public class ExampleFilesTest extends AbstractParseModuleTest { ...@@ -66,10 +66,7 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<String>(); final ArrayList<String> list = new ArrayList<String>();
final ArrayList<String> ignoreList = new ArrayList<String>();
list.add("./src/test/resources/prettyprint/OperationsTest/"); list.add("./src/test/resources/prettyprint/OperationsTest/");
// ignoreList.add("./src/test/resources/testing/"); return getConfiguration2(list);
return getConfiguration2(list, ignoreList);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment