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

Simplify AbstractParseModuleTest to use only one directory

Because in practice the tests never use more than one path.
parent 96dca801
No related branches found
No related tags found
No related merge requests found
package de.tla2b.examples; package de.tla2b.examples;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import org.junit.Test;
import org.junit.runner.RunWith;
import de.tla2b.util.AbstractParseModuleTest; import de.tla2b.util.AbstractParseModuleTest;
import de.tla2b.util.PolySuite; import de.tla2b.util.PolySuite;
...@@ -12,6 +8,9 @@ import de.tla2b.util.PolySuite.Config; ...@@ -12,6 +8,9 @@ import de.tla2b.util.PolySuite.Config;
import de.tla2b.util.PolySuite.Configuration; import de.tla2b.util.PolySuite.Configuration;
import de.tla2b.util.TestUtil; import de.tla2b.util.TestUtil;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(PolySuite.class) @RunWith(PolySuite.class)
public class RegressionTests extends AbstractParseModuleTest { public class RegressionTests extends AbstractParseModuleTest {
private final File moduleFile; private final File moduleFile;
...@@ -27,8 +26,6 @@ public class RegressionTests extends AbstractParseModuleTest { ...@@ -27,8 +26,6 @@ public class RegressionTests extends AbstractParseModuleTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<String>(); return getConfiguration2("./src/test/resources/regression");
list.add("./src/test/resources/regression");
return getConfiguration2(list);
} }
} }
...@@ -37,17 +37,13 @@ public abstract class AbstractParseModuleTest { ...@@ -37,17 +37,13 @@ public abstract class AbstractParseModuleTest {
return files; return files;
} }
protected static Configuration getConfiguration2(ArrayList<String> list) { protected static Configuration getConfiguration2(String path) {
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) {
File[] modules = getModulesRecursively(path); File[] modules = getModulesRecursively(path);
allModules.addAll(Arrays.asList(modules)); final ArrayList<File> allModules = new ArrayList<File>(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);
} }
}
return new Configuration() { return new Configuration() {
public int size() { public int size() {
......
package testing; package testing;
import java.io.File; import java.io.File;
import java.util.ArrayList;
import de.be4.classicalb.core.parser.BParser; import de.be4.classicalb.core.parser.BParser;
import de.be4.classicalb.core.parser.node.Start; import de.be4.classicalb.core.parser.node.Start;
...@@ -65,8 +64,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest { ...@@ -65,8 +64,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<String>(); return getConfiguration2("./src/test/resources/prettyprint/OperationsTest/");
list.add("./src/test/resources/prettyprint/OperationsTest/");
return getConfiguration2(list);
} }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment