Updated integration tests with project directory path, cleanup additional files in int test shell script

Author: Alekh Meka

buildpng.sh

@@ -1,4 +1,5 @@
 cd output
+mkdir "$1"
 for i in `ls *-reachability.dot`;
 do
     echo Processing "$i"...
@@ -8,4 +9,6 @@ do
 done
 mv *.png "$1"
 rm *.dot
+rm *.ser
+rm *.csv
 echo Completed generating png files

src/test/java/inttest/ConvexIT.java

@@ -19,9 +19,9 @@
 public class ConvexIT {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(ConvexIT.class);
-    private final Path convexJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex-core-0.7.1.jar");
-    private final Path convexDependencyJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex-core-0.7.1-jar-with-dependencies.jar");
-    private final Path convexTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex-core-0.7.1-tests.jar");
+    private final Path convexJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex","convex-core-0.7.1.jar");
+    private final Path convexDependencyJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex","convex-core-0.7.1-jar-with-dependencies.jar");
+    private final Path convexTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","convex","convex-core-0.7.1-tests.jar");
     private final Path convexGraph = Paths.get(System.getProperty("user.dir"),"convex-core_graph");
     private final Path primitiveRoundTrip = Paths.get(System.getProperty("user.dir"),"output","GenTestFormat#primitiveRoundTrip.dot");
     private final Path primitiveRoundTripReachability = Paths.get(System.getProperty("user.dir"),"output","GenTestFormat#primitiveRoundTrip-reachability.dot");

src/test/java/inttest/JFlexIT.java

@@ -18,10 +18,10 @@
 public class JFlexIT {
     private static final Logger LOGGER = LoggerFactory.getLogger(JFlexIT.class);
 
-    private final Path jflexJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex-1.8.2.jar");
-    private final Path jflexDependencyJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex-1.8.2-jar-with-dependencies.jar");
-    private final Path jflexFullJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex-full-1.8.2.jar");
-    private final Path jflexTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex-1.8.2-tests.jar");
+    private final Path jflexJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex", "jflex-1.8.2.jar");
+    private final Path jflexDependencyJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex","jflex-1.8.2-jar-with-dependencies.jar");
+    private final Path jflexFullJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex","jflex-full-1.8.2.jar");
+    private final Path jflexTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","jflex","jflex-1.8.2-tests.jar");
     private final Path jflexGraph = Paths.get(System.getProperty("user.dir"),"jflex_graph");
     private final Path removeAdd = Paths.get(System.getProperty("user.dir"), "output", "StateSetQuickcheck#removeAdd-reachability.dot");
     private final Path addStateDoesNotRemove = Paths.get(System.getProperty("user.dir"), "output", "StateSetQuickcheck#addStateDoesNotRemove-reachability.dot");

src/test/java/inttest/MphTableIT.java

@@ -19,8 +19,8 @@
 public class MphTableIT {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MphTableIT.class);
-    private final Path mphJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","mph-table-1.0.6-SNAPSHOT.jar");
-    private final Path mphTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","mph-table-1.0.6-SNAPSHOT-tests.jar");
+    private final Path mphJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","mph-table", "mph-table-1.0.6-SNAPSHOT.jar");
+    private final Path mphTestJar = Paths.get(System.getProperty("user.dir"),"artifacts","output","mph-table","mph-table-1.0.6-SNAPSHOT-tests.jar");
     private final Path mphGraph = Paths.get(System.getProperty("user.dir"),"mph-table_graph");
     private final Path mphSmartByteSerializer = Paths.get(System.getProperty("user.dir"),"output","TestSmartByteSerializer#canRoundTripBytes.dot");
     private final Path mphSmartByteSerializerReachability = Paths.get(System.getProperty("user.dir"),"output","TestSmartByteSerializer#canRoundTripBytes-reachability.dot");