From dedd731014522bc965c443357a4bf137ca63891e Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:01:27 +0200
Subject: [PATCH] Simplify AbstractParseModuleTest to use only one directory
Because in practice the tests never use more than one path.
---
.../java/de/tla2b/examples/RegressionTests.java | 11 ++++-------
.../de/tla2b/util/AbstractParseModuleTest.java | 14 +++++---------
src/test/java/testing/ExampleFilesTest.java | 5 +----
3 files changed, 10 insertions(+), 20 deletions(-)
diff --git a/src/test/java/de/tla2b/examples/RegressionTests.java b/src/test/java/de/tla2b/examples/RegressionTests.java
index 506ebcd..3371573 100644
--- a/src/test/java/de/tla2b/examples/RegressionTests.java
+++ b/src/test/java/de/tla2b/examples/RegressionTests.java
@@ -1,10 +1,6 @@
package de.tla2b.examples;
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.PolySuite;
@@ -12,6 +8,9 @@ import de.tla2b.util.PolySuite.Config;
import de.tla2b.util.PolySuite.Configuration;
import de.tla2b.util.TestUtil;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
@RunWith(PolySuite.class)
public class RegressionTests extends AbstractParseModuleTest {
private final File moduleFile;
@@ -27,8 +26,6 @@ public class RegressionTests extends AbstractParseModuleTest {
@Config
public static Configuration getConfig() {
- final ArrayList<String> list = new ArrayList<String>();
- list.add("./src/test/resources/regression");
- return getConfiguration2(list);
+ return getConfiguration2("./src/test/resources/regression");
}
}
diff --git a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java b/src/test/java/de/tla2b/util/AbstractParseModuleTest.java
index 58e0e61..0a6bcb4 100644
--- a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java
+++ b/src/test/java/de/tla2b/util/AbstractParseModuleTest.java
@@ -37,16 +37,12 @@ public abstract class AbstractParseModuleTest {
return files;
}
- protected static Configuration getConfiguration2(ArrayList<String> list) {
- final ArrayList<File> allModules = new ArrayList<File>();
-
+ protected static Configuration getConfiguration2(String path) {
final ArrayList<Object> expectedValues = new ArrayList<Object>();
- for (String path : list) {
- File[] modules = getModulesRecursively(path);
- allModules.addAll(Arrays.asList(modules));
- for (int i = 0; i < modules.length; i++) {
- expectedValues.add(1);
- }
+ File[] modules = getModulesRecursively(path);
+ final ArrayList<File> allModules = new ArrayList<File>(Arrays.asList(modules));
+ for (int i = 0; i < modules.length; i++) {
+ expectedValues.add(1);
}
return new Configuration() {
diff --git a/src/test/java/testing/ExampleFilesTest.java b/src/test/java/testing/ExampleFilesTest.java
index 5d88458..43a9bbd 100644
--- a/src/test/java/testing/ExampleFilesTest.java
+++ b/src/test/java/testing/ExampleFilesTest.java
@@ -1,7 +1,6 @@
package testing;
import java.io.File;
-import java.util.ArrayList;
import de.be4.classicalb.core.parser.BParser;
import de.be4.classicalb.core.parser.node.Start;
@@ -65,8 +64,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
@Config
public static Configuration getConfig() {
- final ArrayList<String> list = new ArrayList<String>();
- list.add("./src/test/resources/prettyprint/OperationsTest/");
- return getConfiguration2(list);
+ return getConfiguration2("./src/test/resources/prettyprint/OperationsTest/");
}
}
--
GitLab