Merge branch 'master' into xss-starter

Author: omursahin

.github/workflows/ci.yml

@@ -40,10 +40,9 @@ env:
   # https://github.com/WebFuzzing/EvoMaster/issues/447
   release-jdk: 21
   build-jdk: 17
-#  latest-jdk: 21
   retention-days: 5
   debug: false  # put to true if need to debug a specific test
-  debugTestName: "org.evomaster.e2etests.spring.graphql.db.tree.DbTreeEMTest" # replace with test to debug
+  debugTestName: "com.foo.base.BaseIT" # replace with test to debug
 
 # This build is quite expensive (some hours), so we run it whole only on some JVM versions and OSs.
 # For the moment, we need to support JVM 8 and all following LTS versions (e.g, 11 and  17).
@@ -84,7 +83,7 @@ jobs:
       - name: Debug Test Case
         env:
           CI_env: GithubAction
-        run: mvn test  -Dtest=${{env.debugTestName}} -Dsurefire.failIfNoSpecifiedTests=false  -DredirectTestOutputToFile=false
+        run: mvn -B install  -Dtest=${{env.debugTestName}} -Dsurefire.failIfNoSpecifiedTests=false  -DredirectTestOutputToFile=false
 
   full-build-base:
     runs-on: ubuntu-latest
@@ -122,7 +121,7 @@ jobs:
         env:
           NODE_OPTIONS: "--max_old_space_size=8000"
         with:
-          report_paths: '**/target/surefire-reports/TEST-*.xml'
+          report_paths: '**/target/*-reports/TEST-*.xml'
       # Upload coverage results
       # As of 2024, looks like a rate limiter is breaking the build.
       # As such, now we only upload from master branch, hoping it is enough.

client-java/controller/pom.xml

@@ -199,6 +199,11 @@
             <artifactId>mongodb-driver-sync</artifactId>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>io.lettuce</groupId>
+            <artifactId>lettuce-core</artifactId>
+            <scope>test</scope>
+        </dependency>
 
         <!--gRPC RPC test-->
         <dependency>

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

@@ -93,7 +93,12 @@ public final void setupForGeneratedTest(){
         //In the past, we configured P6Spy here
     }
 
-    public void setNeedsJdk17Options(boolean needsJdk17Options) {
+    /**
+     * Unfortunately, the use of --add-opens in JDK 17+ has broken many things... :(
+     * If you are using JDK 17 or above, you must set this to true
+     * @param needsJdk17Options
+     */
+    public final void setNeedsJdk17Options(boolean needsJdk17Options) {
         this.needsJdk17Options = needsJdk17Options;
     }
 

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

@@ -181,6 +181,8 @@ default void extractRPCSchema(){}
 
     default Object getOpenSearchConnection() {return null;}
 
+    default Object getRedisConnection() {return null;}
+
     /**
      * <p>
      * register or execute specified SQL script for initializing data in database

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

@@ -33,7 +33,7 @@
 import org.evomaster.client.java.sql.SqlScriptRunner;
 import org.evomaster.client.java.sql.SqlScriptRunnerCached;
 import org.evomaster.client.java.sql.DbSpecification;
-import org.evomaster.client.java.controller.internal.db.MongoHandler;
+import org.evomaster.client.java.controller.internal.db.mongo.MongoHandler;
 import org.evomaster.client.java.sql.DbInfoExtractor;
 import org.evomaster.client.java.sql.internal.SqlHandler;
 import org.evomaster.client.java.controller.mongo.MongoScriptRunner;

…nternal/db/MongoCommandWithDistance.java …l/db/mongo/MongoCommandWithDistance.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoCommandWithDistance.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoCommandWithDistance.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoCommandWithDistance.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoCommandWithDistance.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 public class MongoCommandWithDistance {
 

…nternal/db/MongoDistanceWithMetrics.java …l/db/mongo/MongoDistanceWithMetrics.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetrics.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetrics.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetrics.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetrics.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 public class MongoDistanceWithMetrics {
 

…controller/internal/db/MongoHandler.java …ller/internal/db/mongo/MongoHandler.javaclient-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoHandler.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandler.java client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/MongoHandler.java renamed to client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandler.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoFailedQuery;
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoExecutionsDto;

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisCommandEvaluation.java

@@ -0,0 +1,24 @@
+package org.evomaster.client.java.controller.internal.db.redis;
+
+import org.evomaster.client.java.instrumentation.RedisCommand;
+
+/**
+ * This class will link a given RedisCommand to the result of the distance calculation for that commmand.
+ */
+public class RedisCommandEvaluation {
+    private final RedisCommand redisCommand;
+    private final RedisDistanceWithMetrics redisDistanceWithMetrics;
+
+    public RedisCommandEvaluation(RedisCommand redisCommand, RedisDistanceWithMetrics redisDistanceWithMetrics) {
+        this.redisCommand = redisCommand;
+        this.redisDistanceWithMetrics = redisDistanceWithMetrics;
+    }
+
+    public RedisCommand getRedisCommand() {
+        return redisCommand;
+    }
+
+    public RedisDistanceWithMetrics getRedisDistanceWithMetrics() {
+        return redisDistanceWithMetrics;
+    }
+}

client-java/controller/src/main/java/org/evomaster/client/java/controller/internal/db/redis/RedisDistanceWithMetrics.java

@@ -0,0 +1,30 @@
+package org.evomaster.client.java.controller.internal.db.redis;
+
+/**
+ * This class will have the distance for a RedisCommand (between 0 and 1)
+ * and the number of evaluated keys in that distance calculation.
+ */
+public class RedisDistanceWithMetrics {
+    private final double redisDistance; // A number between 0 and 1.
+    private final int numberOfEvaluatedKeys;
+
+    public RedisDistanceWithMetrics(double redisDistance, int numberOfEvaluatedKeys) {
+        if(redisDistance < 0){
+            throw new IllegalArgumentException("Distance must be non-negative but value is " + redisDistance);
+        }
+        if(numberOfEvaluatedKeys < 0){
+            throw new IllegalArgumentException("Number of evaluated keys must be non-negative but value is "
+                    + numberOfEvaluatedKeys);
+        }
+        this.redisDistance = redisDistance;
+        this.numberOfEvaluatedKeys = numberOfEvaluatedKeys;
+    }
+
+    public int getNumberOfEvaluatedKeys() {
+        return numberOfEvaluatedKeys;
+    }
+
+    public double getDistance() {
+        return redisDistance;
+    }
+}