From b0191b09c28a6b29ca4a985e178b5a4f634c486e Mon Sep 17 00:00:00 2001
From: dgelessus <dgelessus@users.noreply.github.com>
Date: Wed, 26 Apr 2023 18:17:50 +0200
Subject: [PATCH] Move getModulesRecursively into TestUtil
---
.../de/tla2b/examples/RegressionTests.java | 5 ++--
.../tla2b/util/AbstractParseModuleTest.java | 26 -------------------
src/test/java/de/tla2b/util/TestUtil.java | 24 +++++++++++++++++
src/test/java/testing/ExampleFilesTest.java | 6 ++---
4 files changed, 28 insertions(+), 33 deletions(-)
delete mode 100644 src/test/java/de/tla2b/util/AbstractParseModuleTest.java
diff --git a/src/test/java/de/tla2b/examples/RegressionTests.java b/src/test/java/de/tla2b/examples/RegressionTests.java
index e4e11db..06d9092 100644
--- a/src/test/java/de/tla2b/examples/RegressionTests.java
+++ b/src/test/java/de/tla2b/examples/RegressionTests.java
@@ -3,7 +3,6 @@ package de.tla2b.examples;
import java.io.File;
import java.util.List;
-import de.tla2b.util.AbstractParseModuleTest;
import de.tla2b.util.TestUtil;
import org.junit.Test;
@@ -11,7 +10,7 @@ import org.junit.runner.RunWith;
import org.junit.runners.Parameterized;
@RunWith(Parameterized.class)
-public class RegressionTests extends AbstractParseModuleTest {
+public class RegressionTests {
private final File moduleFile;
public RegressionTests(File machine) {
@@ -25,6 +24,6 @@ public class RegressionTests extends AbstractParseModuleTest {
@Parameterized.Parameters(name = "{0}")
public static List<File> getConfig() {
- return getModulesRecursively("./src/test/resources/regression");
+ return TestUtil.getModulesRecursively("./src/test/resources/regression");
}
}
diff --git a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java b/src/test/java/de/tla2b/util/AbstractParseModuleTest.java
deleted file mode 100644
index 103d467..0000000
--- a/src/test/java/de/tla2b/util/AbstractParseModuleTest.java
+++ /dev/null
@@ -1,26 +0,0 @@
-package de.tla2b.util;
-
-import java.io.File;
-import java.util.ArrayList;
-
-public abstract class AbstractParseModuleTest {
- private static final String TLA_SUFFIX = ".tla";
-
- protected static ArrayList<File> getModulesRecursively(String path) {
- File root = new File(path);
- File[] list = root.listFiles();
-
- ArrayList<File> files = new ArrayList<File>();
- if (list == null)
- return files;
-
- for (File f : list) {
- if (f.isDirectory()) {
- files.addAll(getModulesRecursively(f.getAbsolutePath()));
- } else if (f.getName().endsWith(TLA_SUFFIX)) {
- files.add(f);
- }
- }
- return files;
- }
-}
diff --git a/src/test/java/de/tla2b/util/TestUtil.java b/src/test/java/de/tla2b/util/TestUtil.java
index 4ba66b4..e75c6a7 100644
--- a/src/test/java/de/tla2b/util/TestUtil.java
+++ b/src/test/java/de/tla2b/util/TestUtil.java
@@ -1,5 +1,9 @@
package de.tla2b.util;
+import java.io.File;
+import java.util.ArrayList;
+import java.util.List;
+
import de.be4.classicalb.core.parser.BParser;
import de.be4.classicalb.core.parser.analysis.prolog.ASTProlog;
import de.be4.classicalb.core.parser.exceptions.BCompoundException;
@@ -17,6 +21,26 @@ import util.ToolIO;
import static org.junit.Assert.assertEquals;
public class TestUtil {
+ private static final String TLA_SUFFIX = ".tla";
+
+ public static List<File> getModulesRecursively(String path) {
+ File root = new File(path);
+ File[] list = root.listFiles();
+
+ List<File> files = new ArrayList<File>();
+ if (list == null) {
+ return files;
+ }
+
+ for (File f : list) {
+ if (f.isDirectory()) {
+ files.addAll(getModulesRecursively(f.getAbsolutePath()));
+ } else if (f.getName().endsWith(TLA_SUFFIX)) {
+ files.add(f);
+ }
+ }
+ return files;
+ }
public static void loadTlaFile(String tlaFile) throws TLA2BException {
Translator t = new Translator(tlaFile);
diff --git a/src/test/java/testing/ExampleFilesTest.java b/src/test/java/testing/ExampleFilesTest.java
index d4b2c13..038f449 100644
--- a/src/test/java/testing/ExampleFilesTest.java
+++ b/src/test/java/testing/ExampleFilesTest.java
@@ -6,7 +6,6 @@ import java.util.List;
import de.be4.classicalb.core.parser.BParser;
import de.be4.classicalb.core.parser.node.Start;
import de.be4.classicalb.core.parser.util.PrettyPrinter;
-import de.tla2b.util.AbstractParseModuleTest;
import de.tla2b.util.FileUtils;
import de.tla2b.util.TestUtil;
import de.tla2bAst.Translator;
@@ -18,8 +17,7 @@ import org.junit.runners.Parameterized;
import static org.junit.Assert.assertEquals;
@RunWith(Parameterized.class)
-public class ExampleFilesTest extends AbstractParseModuleTest {
-
+public class ExampleFilesTest {
private final File moduleFile;
public ExampleFilesTest(File machine) {
@@ -63,6 +61,6 @@ public class ExampleFilesTest extends AbstractParseModuleTest {
@Parameterized.Parameters(name = "{0}")
public static List<File> getConfig() {
- return getModulesRecursively("./src/test/resources/prettyprint/OperationsTest/");
+ return TestUtil.getModulesRecursively("./src/test/resources/prettyprint/OperationsTest/");
}
}
--
GitLab