From a09f91882f127f0c094b2bfce094b930b5c752ac Mon Sep 17 00:00:00 2001 From: "Achim D. Brucker" Date: Sun, 18 Sep 2016 02:26:44 +0100 Subject: [PATCH] Share generated supergraph across multiple tests. --- .../dasca/dataflow/test/TestSuite.java | 24 ++++++++++++++----- 1 file changed, 18 insertions(+), 6 deletions(-) diff --git a/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/test/TestSuite.java b/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/test/TestSuite.java index 031282b..c79c13e 100644 --- a/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/test/TestSuite.java +++ b/src/eu.aniketos.dasca.dataflow/src/main/java/eu/aniketos/dasca/dataflow/test/TestSuite.java @@ -114,14 +114,18 @@ public class TestSuite { } - public static void initTestSG(String test) throws IllegalArgumentException, CancelException, IOException{ + public static void initTestSG(String test, boolean force) + throws IllegalArgumentException, CancelException, IOException{ + if ((null != superGraph) && !force) return; + List entryPoints = new ArrayList(); if (null != test) { + log.info("Generating Global SG:"); entryPoints.add("Leu/aniketos/dasca/dataflow/test/data/"+test); }else{ + log.info("Generating Test Specific SG ("+ test +"):"); entryPoints.addAll(Arrays.asList(customEntryPoints)); } - log.info("Generating Test Specific SG ("+ test +"):"); for (String element : entryPoints) { log.info(" "+element); } @@ -136,14 +140,22 @@ public class TestSuite { logConfiguration(); } + + public static void initTestSG(String test) + throws IllegalArgumentException, CancelException, IOException{ + initTestSG(test, false); + } + public static void initTestSG() + throws IllegalArgumentException, CancelException, IOException{ + initTestSG(null); + } @BeforeClass public static void setUp() throws IllegalArgumentException, CancelException, IOException { - if (null != superGraph){ - return; - } + if (null != superGraph) return; sources = Arrays.asList(testDir); libs = Arrays.asList(WalaProperties.getJ2SEJarFiles()); logConfiguration(); - initTestSG(null); } + initTestSG(); + } }