diff --git a/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java b/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java index 120fdd4df74e8b19e1c0237fb1d84629cf950046..99edab6c3995bbc440c7dde4549f287476a22295 100644 --- a/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java +++ b/ttool/src/test/java/tmltranslator/DiplodocusSecurityTest.java @@ -50,9 +50,15 @@ public class DiplodocusSecurityTest extends AbstractTest { @BeforeClass public static void setUpBeforeClass() throws Exception { - PROVERIF_DIR = getBaseResourcesDir() + DIR_GEN; - MODELS_DIR = getBaseResourcesDir() + DIR_MODELS; - RESOURCES_DIR = getBaseResourcesDir() + DIR_MODELS; + String test = System.getProperty("org.gradle.test.worker"); + String baseResourcesDir = getBaseResourcesDir(); + if (test==null){ + baseResourcesDir = "test/resources/"; + } + PROVERIF_DIR = baseResourcesDir + DIR_GEN; + MODELS_DIR = baseResourcesDir + DIR_MODELS; + RESOURCES_DIR = baseResourcesDir + DIR_MODELS; + } //arguments are defined in @Parameterized.Parameters @@ -237,8 +243,8 @@ public class DiplodocusSecurityTest extends AbstractTest { } return query; } - - private ArrayList<Pair<String, Pair<String, Boolean>>> getComms(String query){ + private ArrayList<Pair<String, + Pair<String, Boolean>>> getComms(String query){ ArrayList<Pair<String, Pair<String, Boolean>>> comms = new ArrayList<>(); if (query.contains("==>") && query.matches(".*comm[0-9]+.*")) { int index = query.indexOf("==>");