From 82cd59b694fcf607e74e7e149ea356a05cf74a6a Mon Sep 17 00:00:00 2001 From: David Schneider <david.schneider@bivab.de> Date: Thu, 29 Nov 2018 21:01:58 +0100 Subject: [PATCH] Updated tests to use local copy of public examples --- .../java/de/tlc4b/coverage/CoverageTest.java | 2 +- .../probprivate/AssertionErrorTest.java | 2 +- .../integration/probprivate/DeadlockTest.java | 2 +- .../tlc/integration/probprivate/GoalTest.java | 2 +- .../probprivate/InvariantViolationTest.java | 2 +- .../tlc/integration/probprivate/LawsTest.java | 20 +++++++++---------- .../integration/probprivate/NoErrorTest.java | 2 +- .../probprivate/WellDefinednessTest.java | 2 +- 8 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/test/java/de/tlc4b/coverage/CoverageTest.java b/src/test/java/de/tlc4b/coverage/CoverageTest.java index a106b1f..f5d7ca5 100644 --- a/src/test/java/de/tlc4b/coverage/CoverageTest.java +++ b/src/test/java/de/tlc4b/coverage/CoverageTest.java @@ -32,7 +32,7 @@ public class CoverageTest extends AbstractParseMachineTest { public static Configuration getConfig() { final ArrayList<String> list = new ArrayList<String>(); final ArrayList<String> ignoreList = new ArrayList<String>(); - list.add("../prob_examples/public_examples/TLC/"); + list.add("public_examples/TLC/"); list.add("./src/test/resources/"); ignoreList.add("./src/test/resources/compound/"); diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java index c694d80..03b2949 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/AssertionErrorTest.java @@ -37,7 +37,7 @@ public class AssertionErrorTest extends AbstractParseMachineTest { @Config public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); - list.add(new TestPair(AssertionError, "../prob_examples/public_examples/TLC/AssertionError")); + list.add(new TestPair(AssertionError, "public_examples/TLC/AssertionError")); return getConfiguration(list); } } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java index f49ff36..bce24e3 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/DeadlockTest.java @@ -38,7 +38,7 @@ public class DeadlockTest extends AbstractParseMachineTest { public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); list.add(new TestPair(Deadlock, - "../prob_examples/public_examples/TLC/Deadlock")); + "public_examples/TLC/Deadlock")); return getConfiguration(list); } } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java index d417892..8692465 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/GoalTest.java @@ -38,7 +38,7 @@ public class GoalTest extends AbstractParseMachineTest { public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); list.add(new TestPair(Goal, - "../prob_examples/public_examples/TLC/GOAL")); + "public_examples/TLC/GOAL")); return getConfiguration(list); } } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java index 8499fdb..32b3aca 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/InvariantViolationTest.java @@ -38,7 +38,7 @@ public class InvariantViolationTest extends AbstractParseMachineTest { public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); list.add(new TestPair(InvariantViolation, - "../prob_examples/public_examples/TLC/InvariantViolation")); + "public_examples/TLC/InvariantViolation")); return getConfiguration(list); } } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/LawsTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/LawsTest.java index b0e5e3f..0a48252 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/LawsTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/LawsTest.java @@ -17,70 +17,70 @@ public class LawsTest { @Test public void BoolLaws() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/BoolLaws.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/BoolLaws.mch"}; assertEquals(NoError, test(a)); } @Test public void BoolWithArithLaws() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/BoolWithArithLaws.mch", "-nodead"}; + String[] a = new String[] { "public_examples/TLC/Laws/BoolWithArithLaws.mch", "-nodead"}; assertEquals(NoError, test(a)); } @Test public void FunLaws() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/FunLaws.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/FunLaws.mch"}; assertEquals(NoError, test(a)); } @Test public void FunLawsWithLambda() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/FunLawsWithLambda.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/FunLawsWithLambda.mch"}; assertEquals(NoError, test(a)); } @Test public void RelLaws_TLC() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/RelLaws_TLC.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/RelLaws_TLC.mch"}; assertEquals(Goal, test(a)); } @Test public void BoolLaws_SetCompr() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/BoolLaws_SetCompr.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/BoolLaws_SetCompr.mch"}; assertEquals(NoError, test(a)); } @Test public void BoolLaws_SetComprCLPFD() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/BoolLaws_SetComprCLPFD.mch"}; + String[] a = new String[] { "public_examples/TLC/Laws/BoolLaws_SetComprCLPFD.mch"}; assertEquals(NoError, test(a)); } @Test public void CardinalityLaws_TLC() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/CardinalityLaws_TLC.mch", "-nodead"}; + String[] a = new String[] { "public_examples/TLC/Laws/CardinalityLaws_TLC.mch", "-nodead"}; assertEquals(NoError, test(a)); } @Test public void EqualityLaws() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/EqualityLaws.mch", "-nodead"}; + String[] a = new String[] { "public_examples/TLC/Laws/EqualityLaws.mch", "-nodead"}; assertEquals(NoError, test(a)); } @Test public void SubsetLaws() throws Exception { TLC4BGlobals.setDeleteOnExit(true); - String[] a = new String[] { "../prob_examples/public_examples/TLC/Laws/SubsetLaws.mch", "-nodead"}; + String[] a = new String[] { "public_examples/TLC/Laws/SubsetLaws.mch", "-nodead"}; assertEquals(NoError, test(a)); } } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java index 9983401..8605ab1 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/NoErrorTest.java @@ -38,7 +38,7 @@ public class NoErrorTest extends AbstractParseMachineTest { public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); list.add(new TestPair(NoError, - "../prob_examples/public_examples/TLC/NoError")); + "public_examples/TLC/NoError")); return getConfiguration(list); } diff --git a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java index e258315..f92a4e2 100644 --- a/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java +++ b/src/test/java/de/tlc4b/tlc/integration/probprivate/WellDefinednessTest.java @@ -37,7 +37,7 @@ public class WellDefinednessTest extends AbstractParseMachineTest { @Config public static Configuration getConfig() { final ArrayList<TestPair> list = new ArrayList<TestPair>(); - list.add(new TestPair(WellDefinednessError, "../prob_examples/public_examples/TLC/WellDefinednessError")); + list.add(new TestPair(WellDefinednessError, "public_examples/TLC/WellDefinednessError")); return getConfiguration(list); } } -- GitLab