Address Andrea's initial feedback on PR #1399

Author: francastagna

.gitignore

@@ -159,3 +159,4 @@ client-java/sql-dto/target
 client-java/distance-heuristics/target
 client-java/test-old-libraries/target
 core-tests/e2e-tests/spring/spring-rest-mysql/target
+client-java/instrumentation/evosuite-graphs/

client-java/controller-api/pom.xml

@@ -22,10 +22,6 @@
             <groupId>org.evomaster</groupId>
             <artifactId>evomaster-client-java-sql-dto</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.evomaster</groupId>
-            <artifactId>evomaster-client-java-instrumentation-shared</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.evomaster</groupId>
             <artifactId>evomaster-test-utils-java</artifactId>

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/BranchObjectiveDto.java

@@ -0,0 +1,13 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Descriptor and numeric id for a branch objective (true or false outcome).
+ */
+public class BranchObjectiveDto implements Serializable {
+
+    public int id;
+    public String descriptiveId;
+}
+

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/ControlDependenceGraphDto.java

@@ -0,0 +1,20 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Serializable representation of the control-dependence information of a method.
+ * Contains only the data needed by EvoMaster core: branch objective identifiers,
+ * the subset that are roots, and the parent-child relationships between them.
+ */
+public class ControlDependenceGraphDto implements Serializable {
+
+    public String className;
+    public String methodName;
+    public List<BranchObjectiveDto> objectives = new ArrayList<>();
+    public List<Integer> rootObjectiveIds = new ArrayList<>();
+    public List<DependencyEdgeDto> edges = new ArrayList<>();
+}
+

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/DependencyEdgeDto.java

@@ -0,0 +1,13 @@
+package org.evomaster.client.java.controller.api.dto;
+
+import java.io.Serializable;
+
+/**
+ * Directed edge describing that parentObjectiveId must be covered before childObjectiveId.
+ */
+public class DependencyEdgeDto implements Serializable {
+
+    public int parentObjectiveId;
+    public int childObjectiveId;
+}
+

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/SutRunDto.java

@@ -46,9 +46,9 @@ public class SutRunDto {
     public String methodReplacementCategories;
 
     /**
-     * Whether to enable Dynamosa graphs generation in the Java agent
+     * Whether to enable Control Dependence Graph generation in the Java agent
      */
-    public Boolean enableDynamosaGraphs;
+    public Boolean enableControlDependenceGraphs;
 
     /**
      * Whether to write generated graphs (DOT/PNGs) to disk on the agent side

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/TestResultsDto.java

@@ -1,7 +1,5 @@
 package org.evomaster.client.java.controller.api.dto;
 
-import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -18,7 +16,7 @@ public class TestResultsDto {
     public List<ExtraHeuristicsDto> extraHeuristics = new ArrayList<>();
 
     /**
-     * Incremental DynaMOSA control-dependence graphs discovered since the last handshake.
+     * Incremental control-dependence graphs discovered since the last handshake.
      */
-    public List<ControlDependenceGraphDto> dynamosaCdgs = new ArrayList<>();
+    public List<ControlDependenceGraphDto> controlDependenceGraphs = new ArrayList<>();
 }

client-java/controller/src/main/java/org/evomaster/client/java/controller/EmbeddedSutController.java

@@ -6,8 +6,8 @@
 import org.evomaster.client.java.controller.api.dto.problem.rpc.ScheduleTaskInvocationDto;
 import org.evomaster.client.java.controller.internal.SutController;
 import org.evomaster.client.java.instrumentation.*;
-import org.evomaster.client.java.instrumentation.external.DynamosaControlDependenceSnapshot;
-import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
+import org.evomaster.client.java.instrumentation.external.ControlDependenceSnapshot;
+import org.evomaster.client.java.controller.api.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.object.ClassToSchema;
 import org.evomaster.client.java.instrumentation.staticstate.ExecutionTracer;
 import org.evomaster.client.java.instrumentation.staticstate.ObjectiveRecorder;
@@ -33,7 +33,7 @@
  */
 public abstract class EmbeddedSutController extends SutController {
 
-    private int dynamosaCdgIndex = 0;
+    private int controlDependenceGraphIndex = 0;
 
     @Override
     public final void setupForGeneratedTest(){
@@ -144,15 +144,15 @@ public final void bootingSut(boolean bootingSut) {
     }
 
     @Override
-    public List<ControlDependenceGraphDto> getDynamosaControlDependenceGraphs() {
-        DynamosaControlDependenceSnapshot snapshot = InstrumentationController.getControlDependenceSnapshot(dynamosaCdgIndex);
-        dynamosaCdgIndex = snapshot.getNextIndex();
+    public List<ControlDependenceGraphDto> getControlDependenceGraphs() {
+        ControlDependenceSnapshot snapshot = InstrumentationController.getControlDependenceSnapshot(controlDependenceGraphIndex);
+        controlDependenceGraphIndex = snapshot.getNextIndex();
         return snapshot.getGraphs();
     }
 
     @Override
-    public void setDynamosaGraphsEnabled(boolean enableGraphs) {
-        InstrumentationController.setDynamosaGraphsEnabled(enableGraphs);
+    public void setControlDependenceGraphsEnabled(boolean enableGraphs) {
+        InstrumentationController.setControlDependenceGraphsEnabled(enableGraphs);
     }
 
     @Override

client-java/controller/src/main/java/org/evomaster/client/java/controller/ExternalSutController.java

@@ -12,8 +12,8 @@
 import org.evomaster.client.java.controller.internal.SutController;
 import org.evomaster.client.java.instrumentation.external.JarAgentLocator;
 import org.evomaster.client.java.instrumentation.external.ServerController;
-import org.evomaster.client.java.instrumentation.external.DynamosaConfigDto;
-import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
+import org.evomaster.client.java.instrumentation.external.ControlDependenceGraphConfigDto;
+import org.evomaster.client.java.controller.api.dto.ControlDependenceGraphDto;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -450,11 +450,11 @@ public BootTimeInfoDto getBootTimeInfoDto() {
     }
 
     @Override
-    public List<ControlDependenceGraphDto> getDynamosaControlDependenceGraphs() {
+    public List<ControlDependenceGraphDto> getControlDependenceGraphs() {
         if (!isInstrumentationActivated()){
             return Collections.emptyList();
         }
-        List<ControlDependenceGraphDto> graphs = serverController.getDynamosaControlDependenceGraphs();
+        List<ControlDependenceGraphDto> graphs = serverController.getControlDependenceGraphs();
         return graphs != null ? graphs : Collections.emptyList();
     }
 
@@ -534,25 +534,25 @@ public final void setExecutingInitMongo(boolean executingInitMongo) {
     }
 
     /**
-     * Send Dynamosa configuration to the Java Agent.
+     * Send CDG configuration to the Java Agent.
      */
-    public final void setDynamosaGraphsEnabled(boolean enableGraphs) {
+    public final void setControlDependenceGraphsEnabled(boolean enableGraphs) {
         checkInstrumentation();
-        DynamosaConfigDto dto = new DynamosaConfigDto();
+        ControlDependenceGraphConfigDto dto = new ControlDependenceGraphConfigDto();
         dto.enableGraphs = enableGraphs;
         dto.writeCfg = null;
-        serverController.setDynamosaConfig(dto);
+        serverController.setControlDependenceGraphConfig(dto);
     }
 
     /**
      * Control whether the agent writes DOT/PNG graphs to disk.
      */
     public final void setWriteCfgEnabled(boolean writeCfg) {
         checkInstrumentation();
-        DynamosaConfigDto dto = new DynamosaConfigDto();
+        ControlDependenceGraphConfigDto dto = new ControlDependenceGraphConfigDto();
         dto.enableGraphs = null;
         dto.writeCfg = writeCfg;
-        serverController.setDynamosaConfig(dto);
+        serverController.setControlDependenceGraphConfig(dto);
     }
 
     @Override

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/EMController.java

@@ -19,7 +19,7 @@
 import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.evomaster.client.java.controller.problem.rpc.schema.LocalAuthSetupSchema;
 import org.evomaster.client.java.instrumentation.*;
-import org.evomaster.client.java.instrumentation.shared.dto.ControlDependenceGraphDto;
+import org.evomaster.client.java.controller.api.dto.ControlDependenceGraphDto;
 import org.evomaster.client.java.instrumentation.shared.StringSpecializationInfo;
 import org.evomaster.client.java.instrumentation.staticstate.ExecutionTracer;
 import org.evomaster.client.java.utils.SimpleLogger;
@@ -377,9 +377,9 @@ public Response runSut(SutRunDto dto, @Context HttpServletRequest httpServletReq
                     if (!noKillSwitch(() -> sutController.isSutRunning())) {
                         noKillSwitch(() -> sutController.bootingSut(true));
                         baseUrlOfSUT = noKillSwitch(() -> sutController.startSut());
-                        // Configure Dynamosa graphs on the agent, if requested by core
-                        Boolean enableGraphs = dto.enableDynamosaGraphs;
-                        if (enableGraphs != null) noKillSwitch(() -> sutController.setDynamosaGraphsEnabled(enableGraphs));
+                        // Configure CDG generation on the agent, if requested by core
+                        Boolean enableGraphs = dto.enableControlDependenceGraphs;
+                        if (enableGraphs != null) noKillSwitch(() -> sutController.setControlDependenceGraphsEnabled(enableGraphs));
                         Boolean writeCfg = dto.writeCfg;
                         if (writeCfg != null) noKillSwitch(() -> sutController.setWriteCfgEnabled(writeCfg));
                         noKillSwitch(() -> sutController.bootingSut(false));
@@ -594,10 +594,10 @@ public Response getTestResults(
                     return Response.status(500).entity(WrappedResponseDto.withError(msg)).build();
                 }
 
-            List<ControlDependenceGraphDto> dynamosaCdgs =
-                    noKillSwitch(() -> sutController.getDynamosaControlDependenceGraphs());
-            if (dynamosaCdgs != null && !dynamosaCdgs.isEmpty()) {
-                dto.dynamosaCdgs.addAll(dynamosaCdgs);
+            List<ControlDependenceGraphDto> cdgs =
+                    noKillSwitch(() -> sutController.getControlDependenceGraphs());
+            if (cdgs != null && !cdgs.isEmpty()) {
+                dto.controlDependenceGraphs.addAll(cdgs);
                 }
 //            }
 //        else {