From d9cc292e542ac9f3bddc0dd4af832adec41f4cae Mon Sep 17 00:00:00 2001 From: dgelessus <dgelessus@users.noreply.github.com> Date: Tue, 30 Jul 2024 19:03:43 +0200 Subject: [PATCH] Simplify AbstractParseMachineTest expected value handling further --- .../tlc4b/util/AbstractParseMachineTest.java | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java index 1bf4e0e..baab6fc 100644 --- a/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java +++ b/src/test/java/de/tlc4b/util/AbstractParseMachineTest.java @@ -39,13 +39,8 @@ public abstract class AbstractParseMachineTest { protected static Configuration getConfiguration2(List<String> list) { List<File> allMachines = new ArrayList<>(); - List<TLCResult> expectedValues = new ArrayList<>(); for (String path : list) { - List<File> machines = getMachinesRecursively(path); - allMachines.addAll(machines); - for (int i = 0; i < machines.size(); i++) { - expectedValues.add(TLCResult.NoError); - } + allMachines.addAll(getMachinesRecursively(path)); } return new Configuration() { @@ -62,7 +57,7 @@ public abstract class AbstractParseMachineTest { } public TLCResult getExpectedValue(int index) { - return expectedValues.get(index); + return TLCResult.NoError; } }; } @@ -70,13 +65,8 @@ public abstract class AbstractParseMachineTest { protected static Configuration getConfiguration(List<String> list, TLCResult expectedResult) { List<File> allMachines = new ArrayList<>(); - List<TLCResult> expectedValues = new ArrayList<>(); for (String path : list) { - File[] machines = getMachines(path); - allMachines.addAll(Arrays.asList(machines)); - for (int i = 0; i < machines.length; i++) { - expectedValues.add(expectedResult); - } + allMachines.addAll(Arrays.asList(getMachines(path))); } return new Configuration() { @@ -93,7 +83,7 @@ public abstract class AbstractParseMachineTest { } public TLCResult getExpectedValue(int index) { - return expectedValues.get(index); + return expectedResult; } }; } -- GitLab