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

Weaken list types in AbstractParseMachineTest

parent 3d1ae78d
Branches
Tags
No related merge requests found
Showing with 25 additions and 16 deletions
...@@ -11,6 +11,7 @@ import org.junit.runner.RunWith; ...@@ -11,6 +11,7 @@ import org.junit.runner.RunWith;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import static de.tlc4b.TLC4BOption.DFID; import static de.tlc4b.TLC4BOption.DFID;
import static de.tlc4b.tlc.TLCResults.TLCResult.NoError; import static de.tlc4b.tlc.TLCResults.TLCResult.NoError;
...@@ -42,7 +43,7 @@ public class BasicTest extends AbstractParseMachineTest { ...@@ -42,7 +43,7 @@ public class BasicTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(NoError, "./src/test/resources/composition/sees")); list.add(new TestPair(NoError, "./src/test/resources/composition/sees"));
list.add(new TestPair(NoError, "./src/test/resources/composition/sees2")); list.add(new TestPair(NoError, "./src/test/resources/composition/sees2"));
list.add(new TestPair(NoError, "./src/test/resources/basics")); list.add(new TestPair(NoError, "./src/test/resources/basics"));
......
...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate; ...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult; import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest; import de.tlc4b.util.AbstractParseMachineTest;
...@@ -36,7 +37,7 @@ public class AssertionErrorTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class AssertionErrorTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(AssertionError, "build/prob_examples/public_examples/TLC/AssertionError")); list.add(new TestPair(AssertionError, "build/prob_examples/public_examples/TLC/AssertionError"));
return getConfiguration(list); return getConfiguration(list);
} }
......
...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate; ...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import de.tlc4b.TLC4B; import de.tlc4b.TLC4B;
import de.tlc4b.tlc.TLCResults.TLCResult; import de.tlc4b.tlc.TLCResults.TLCResult;
...@@ -38,7 +39,7 @@ public class CoverageTest extends AbstractParseMachineTest { ...@@ -38,7 +39,7 @@ public class CoverageTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<String> list = new ArrayList<>(); List<String> list = new ArrayList<>();
list.add("build/prob_examples/public_examples/TLC/"); list.add("build/prob_examples/public_examples/TLC/");
// The subdirectories bugs, compound, and test are intentionally not included here. // The subdirectories bugs, compound, and test are intentionally not included here.
list.add("src/test/resources/basics/"); list.add("src/test/resources/basics/");
......
...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals; ...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -36,7 +37,7 @@ public class DeadlockTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class DeadlockTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(Deadlock, list.add(new TestPair(Deadlock,
"build/prob_examples/public_examples/TLC/Deadlock")); "build/prob_examples/public_examples/TLC/Deadlock"));
return getConfiguration(list); return getConfiguration(list);
......
...@@ -6,6 +6,7 @@ import static de.tlc4b.util.TestUtil.test; ...@@ -6,6 +6,7 @@ import static de.tlc4b.util.TestUtil.test;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -36,7 +37,7 @@ public class GoalTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class GoalTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(Goal, list.add(new TestPair(Goal,
"build/prob_examples/public_examples/TLC/GOAL")); "build/prob_examples/public_examples/TLC/GOAL"));
return getConfiguration(list); return getConfiguration(list);
......
...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals; ...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -36,7 +37,7 @@ public class InvariantViolationTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class InvariantViolationTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(InvariantViolation, list.add(new TestPair(InvariantViolation,
"build/prob_examples/public_examples/TLC/InvariantViolation")); "build/prob_examples/public_examples/TLC/InvariantViolation"));
return getConfiguration(list); return getConfiguration(list);
......
...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals; ...@@ -6,6 +6,7 @@ import static org.junit.Assert.assertEquals;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
...@@ -36,7 +37,7 @@ public class NoErrorTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class NoErrorTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(NoError, list.add(new TestPair(NoError,
"build/prob_examples/public_examples/TLC/NoError")); "build/prob_examples/public_examples/TLC/NoError"));
return getConfiguration(list); return getConfiguration(list);
......
...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate; ...@@ -2,6 +2,7 @@ package de.tlc4b.tlc.integration.probprivate;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult; import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.AbstractParseMachineTest; import de.tlc4b.util.AbstractParseMachineTest;
...@@ -36,7 +37,7 @@ public class WellDefinednessTest extends AbstractParseMachineTest { ...@@ -36,7 +37,7 @@ public class WellDefinednessTest extends AbstractParseMachineTest {
@Config @Config
public static Configuration getConfig() { public static Configuration getConfig() {
final ArrayList<TestPair> list = new ArrayList<>(); List<TestPair> list = new ArrayList<>();
list.add(new TestPair(WellDefinednessError, "build/prob_examples/public_examples/TLC/WellDefinednessError")); list.add(new TestPair(WellDefinednessError, "build/prob_examples/public_examples/TLC/WellDefinednessError"));
return getConfiguration(list); return getConfiguration(list);
} }
......
...@@ -3,6 +3,7 @@ package de.tlc4b.util; ...@@ -3,6 +3,7 @@ package de.tlc4b.util;
import java.io.File; import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import de.tlc4b.tlc.TLCResults.TLCResult; import de.tlc4b.tlc.TLCResults.TLCResult;
import de.tlc4b.util.PolySuite.Configuration; import de.tlc4b.util.PolySuite.Configuration;
...@@ -18,11 +19,11 @@ public abstract class AbstractParseMachineTest { ...@@ -18,11 +19,11 @@ public abstract class AbstractParseMachineTest {
return walk(path).toArray(new File[0]); return walk(path).toArray(new File[0]);
} }
private static ArrayList<File> walk(String path) { private static List<File> walk(String path) {
File root = new File(path); File root = new File(path);
File[] list = root.listFiles(); File[] list = root.listFiles();
ArrayList<File> files = new ArrayList<>(); List<File> files = new ArrayList<>();
if (list == null) if (list == null)
return files; return files;
...@@ -39,10 +40,10 @@ public abstract class AbstractParseMachineTest { ...@@ -39,10 +40,10 @@ public abstract class AbstractParseMachineTest {
return files; return files;
} }
protected static Configuration getConfiguration2(ArrayList<String> list) { protected static Configuration getConfiguration2(List<String> list) {
final ArrayList<File> allMachines = new ArrayList<>(); List<File> allMachines = new ArrayList<>();
final ArrayList<TLCResult> expectedValues = new ArrayList<>(); List<TLCResult> expectedValues = new ArrayList<>();
for (String path : list) { for (String path : list) {
File[] machines = getMachinesRecursively(path); File[] machines = getMachinesRecursively(path);
allMachines.addAll(Arrays.asList(machines)); allMachines.addAll(Arrays.asList(machines));
...@@ -70,10 +71,10 @@ public abstract class AbstractParseMachineTest { ...@@ -70,10 +71,10 @@ public abstract class AbstractParseMachineTest {
}; };
} }
protected static Configuration getConfiguration(ArrayList<TestPair> list) { protected static Configuration getConfiguration(List<TestPair> list) {
final ArrayList<File> allMachines = new ArrayList<>(); List<File> allMachines = new ArrayList<>();
final ArrayList<TLCResult> expectedValues = new ArrayList<>(); List<TLCResult> expectedValues = new ArrayList<>();
for (TestPair testPair : list) { for (TestPair testPair : list) {
File[] machines = getMachines(testPair.getPath()); File[] machines = getMachines(testPair.getPath());
allMachines.addAll(Arrays.asList(machines)); allMachines.addAll(Arrays.asList(machines));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment