wip: testing graph creation

Author: francastagna

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/DynamosaConfig.java

@@ -6,22 +6,33 @@
  */
 public class DynamosaConfig {
 
-    private static volatile boolean enableGraphs = false;
-    private static volatile boolean writeCfg = false;
+    private static volatile boolean enableGraphs = true;
+    private static volatile boolean writeCfg = true;
 
+    
     public static boolean isGraphsEnabled() {
+        System.out.println("enableGraphs: " + enableGraphs);
         return enableGraphs;
     }
 
     public static void setEnableGraphs(boolean value) {
+        System.out.println("----------------------------------------------");
+        System.out.println("Setting enableGraphs to " + value);
+        System.out.println("----------------------------------------------");
         enableGraphs = value;
     }
 
     public static boolean isWriteCfgEnabled() {
+        System.out.println("----------------------------------------------");
+        System.out.println("writeCfg: " + writeCfg);
+        System.out.println("----------------------------------------------");
         return writeCfg;
     }
 
     public static void setWriteCfgEnabled(boolean value) {
+        System.out.println("----------------------------------------------");
+        System.out.println("Setting writeCfg to " + value);
+        System.out.println("----------------------------------------------");
         writeCfg = value;
     }
 }

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cdg/DominatorNode.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.evomaster.client.java.graphs.cdg;
+package org.evomaster.client.java.instrumentation.dynamosa.graphs.cdg;
 
 import java.util.HashSet;
 import java.util.Set;

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/ASMWrapper.java

@@ -153,7 +153,7 @@ public String getType() {
      * @return a boolean.
      */
     public boolean isActualBranch() {
-        return isBranch() || isSwitch();
+        return isBranch();
     }
 
     /**

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/BytecodeInstructionFactory.java

@@ -86,12 +86,14 @@ public List<BytecodeInstruction> registerMethodNode(MethodNode node,
         for (int instructionId = 0; instructionId < node.instructions.size(); instructionId++) {
             AbstractInsnNode instructionNode = node.instructions.get(instructionId);
 
-            BytecodeInstruction instruction = BytecodeInstructionFactory.createBytecodeInstruction(classLoader,
+            BytecodeInstruction instruction = new BytecodeInstruction(
+                    classLoader,
                     className,
                     methodName,
                     instructionId,
                     bytecodeOffset,
-                    instructionNode);
+                    instructionNode
+            );
 
             if (instruction.isLineNumber())
                 lastLineNumber = instruction.getLineNumber();

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/BytecodeInstructionIdComparator.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.graphs.cfg;
+package org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg;
 
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/BytecodeInstructionPool.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.evomaster.client.java.graphs.cfg;
+package org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg;
 
 import org.objectweb.asm.tree.analysis.Frame;
 

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/CFGClassAdapter.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.evomaster.client.java.graphs.cfg;
+package org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg;
 
 public class EntryBlock extends BasicBlock {
 

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/dynamosa/graphs/cfg/CFGFrame.java

@@ -17,7 +17,7 @@
  * You should have received a copy of the GNU Lesser General Public
  * License along with EvoSuite. If not, see <http://www.gnu.org/licenses/>.
  */
-package org.evomaster.client.java.graphs.cfg;
+package org.evomaster.client.java.instrumentation.dynamosa.graphs.cfg;
 
 public class ExitBlock extends BasicBlock {