Resolved issues with Integration tests

Author: Alekh Meka

buildpng.sh

@@ -1,5 +1,5 @@
 cd output
-mkdir "$1"
+mkdir -p "$1"
 for i in `ls *-reachability.dot`;
 do
     echo Processing "$i"...

src/main/java/gr/gousiosg/javacg/stat/support/RepoTool.java

@@ -245,9 +245,12 @@ private void moveJacoco(String property, long timeElapsed) throws IOException{
     }
 
     public void moveOutput() throws Exception {
+        String projectDirectory = getProjectDir();
+        if(!projectDirectory.contains("/"))
+            projectDirectory = projectDirectory + "/" + projectDirectory;
         copyFiles(
             Paths.get(System.getProperty("user.dir"), "/output"), // src
-            Paths.get(System.getProperty("user.dir"), "/artifacts/results/", getProjectDir() + timeStamp), // dst
+            Paths.get(System.getProperty("user.dir"), "/artifacts/results/", projectDirectory + timeStamp), // dst
             "*.*"  // g;ob
         );
     }

src/test/java/inttest/ConvexIT.java

@@ -3,11 +3,13 @@
 import gr.gousiosg.javacg.stat.JCallGraph;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
@@ -30,6 +32,14 @@ public class ConvexIT {
     private final Path messageRoundTrip = Paths.get(System.getProperty("user.dir"),"output","GenTestFormat#messageRoundTrip.dot");
     private final Path messageRoundTripReachability = Paths.get(System.getProperty("user.dir"),"output","GenTestFormat#messageRoundTrip-reachability.dot");
 
+    @Before
+    public void setUp(){
+        String outputDirectoryPath = System.getProperty("user.dir") + "/output/convex/";
+        File outputDir = new File(outputDirectoryPath);
+        if(!outputDir.exists())
+            outputDir.mkdir();
+    }
+
     @Test
     public void testA(){
         String [] args = {"git", "-c", "convex"};
@@ -100,12 +110,12 @@ public void testF() throws IOException, InterruptedException {
         BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
         String line;
         while((line = br.readLine()) != null) {
+            LOGGER.info(line);
             if(line.contains("%")) {
                 String[] values = line.split(" : ");
                 Double percentDifference = Double.parseDouble(values[1].replace("%", ""));
                 Assert.assertTrue(percentDifference < 0.05);
             }
-            LOGGER.info(line);
         }
         process.waitFor();
     }

src/test/java/inttest/JFlexIT.java

@@ -2,11 +2,13 @@
 
 import gr.gousiosg.javacg.stat.JCallGraph;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
@@ -31,6 +33,14 @@ public class JFlexIT {
     private final Path addSet = Paths.get(System.getProperty("user.dir"), "output", "CharClassesQuickcheck#addSet-reachability.dot");
     private final Path addString = Paths.get(System.getProperty("user.dir"), "output", "CharClassesQuickcheck#addString-reachability.dot");
 
+    @Before
+    public void setUp(){
+        String outputDirectoryPath = System.getProperty("user.dir") + "/output/jflex/";
+        File outputDir = new File(outputDirectoryPath);
+        if(!outputDir.exists())
+            outputDir.mkdir();
+    }
+
     @Test
     public void testA(){
         String [] args = {"git", "-c", "jflex"};
@@ -102,9 +112,12 @@ public void testF() throws IOException, InterruptedException {
         BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
         String line;
         while((line = br.readLine()) != null) {
-            if(line.contains("%"))
-                Assert.assertTrue(line.contains("0.0%"));
             LOGGER.info(line);
+            if(line.contains("%")) {
+                String[] values = line.split(" : ");
+                Double percentDifference = Double.parseDouble(values[1].replace("%", ""));
+                Assert.assertTrue(percentDifference < 0.05);
+            }
         }
         process.waitFor();
     }

src/test/java/inttest/MphTableIT.java

@@ -3,11 +3,13 @@
 import gr.gousiosg.javacg.stat.JCallGraph;
 import org.junit.After;
 import org.junit.Assert;
+import org.junit.Before;
 import org.junit.Test;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import java.io.BufferedReader;
+import java.io.File;
 import java.io.IOException;
 import java.io.InputStreamReader;
 import java.nio.file.Files;
@@ -37,6 +39,14 @@ public class MphTableIT {
     private final Path mphSmartStringSerializer = Paths.get(System.getProperty("user.dir"),"output","TestSmartStringSerializer#canRoundTripStrings.dot");
     private final Path mphSmartStringSerializerReachability = Paths.get(System.getProperty("user.dir"),"output","TestSmartStringSerializer#canRoundTripStrings-reachability.dot");
 
+    @Before
+    public void setUp(){
+        String outputDirectoryPath = System.getProperty("user.dir") + "/output/mph-table/";
+        File outputDir = new File(outputDirectoryPath);
+        if(!outputDir.exists())
+            outputDir.mkdir();
+    }
+
 
     // Git Stage
     @Test
@@ -115,9 +125,12 @@ public void testF() throws IOException, InterruptedException {
         BufferedReader br = new BufferedReader(new InputStreamReader(process.getInputStream()));
         String line;
         while((line = br.readLine()) != null) {
-            if(line.contains("%"))
-                Assert.assertTrue(line.contains("0.0%"));
             LOGGER.info(line);
+            if(line.contains("%")) {
+                String[] values = line.split(" : ");
+                Double percentDifference = Double.parseDouble(values[1].replace("%", ""));
+                Assert.assertTrue(percentDifference < 0.05);
+            }
         }
         process.waitFor();
     }