Merge remote-tracking branch 'origin/master' into regex-java-flag-x

Author: lmasroca

.github/workflows/ci.yml

@@ -32,7 +32,7 @@ on:
 #      - "**"
 
 env:
-  evomaster-version: 6.0.1
+  evomaster-version: 6.1.2
   # Unfortunately, to use JPackage we need JDK 17 or above :(
   # Which is really bad due to the madness of --add-opens.
   # Even if hunt down all cases of reflections in EM, there is still the problem of

.github/workflows/release.yml

@@ -8,7 +8,7 @@ on:
       - "v*"
 
 env:
-  evomaster-version: 6.0.1
+  evomaster-version: 6.1.2
   jdk-jar: 17
   jdk-jpackage: 21
   java-distribution: temurin

client-java/ci-utils/pom.xml

@@ -13,7 +13,7 @@
     <parent>
         <artifactId>evomaster-client-java</artifactId>
         <groupId>org.evomaster</groupId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-ci-utils</artifactId>

client-java/client-util/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-util</artifactId>

client-java/controller-api/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-controller-api</artifactId>

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/database/execution/RedisFailedCommand.java

@@ -1,5 +1,8 @@
 package org.evomaster.client.java.controller.api.dto.database.execution;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * Each time a Redis command is executed and returns no data, we keep track of which keys were involved,
  * as well as relevant information such as the command type.
@@ -12,9 +15,9 @@ public class RedisFailedCommand {
     public String command;
 
     /**
-     * Key involved. Could be null if the command does not have a key in the arguments. For example: KEYS (pattern).
+     * Keys involved. Could be null if the command does not have any key in the arguments. For example: KEYS (pattern).
      */
-    public String key;
+    public List<String> keys;
 
     /**
      * Pattern involved. It'd only apply to commands with pattern like KEYS.
@@ -28,9 +31,9 @@ public class RedisFailedCommand {
 
     public RedisFailedCommand() {}
 
-    public RedisFailedCommand(String command, String key, String pattern, String field) {
+    public RedisFailedCommand(String command, List<String> keys, String pattern, String field) {
         this.command = command;
-        this.key = key;
+        this.keys =  new ArrayList<>(keys);
         this.pattern = pattern;
         this.field = field;
     }

client-java/controller/pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.evomaster</groupId>
         <artifactId>evomaster-client-java</artifactId>
-        <version>6.0.1-SNAPSHOT</version>
+        <version>6.1.2-SNAPSHOT</version>
     </parent>
 
     <artifactId>evomaster-client-java-controller</artifactId>

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

@@ -105,9 +105,15 @@ public List<RedisCommandEvaluation> getEvaluatedRedisCommands() {
 
     private void registerFailedCommand(RedisCommand redisCommand, double distance) {
         RedisCommand.RedisCommandType type = redisCommand.getType();
-        if (distance > 0 &&
-                type.equals(GET) || type.equals(KEYS) || type.equals(HGET) || type.equals(HGETALL)) {
-            //For this first iteration we'll only work on GET commands.
+        if (distance > 0 && (
+            type.equals(GET) ||
+            type.equals(HGET) ||
+            type.equals(HGETALL) ||
+            type.equals(KEYS) ||
+            type.equals(SINTER) ||
+            type.equals(SMEMBERS))
+        ) {
+            // Further commands will be registered in future iterations.
             failedCommands.add(createFailedCommand(redisCommand));
         }
     }
@@ -117,13 +123,15 @@ private RedisFailedCommand createFailedCommand(RedisCommand redisCommand) {
         List<String> args = redisCommand.extractArgs();
         switch (type) {
             case GET:
-            case HGETALL: {
+            case HGETALL:
+            case SINTER:
+            case SMEMBERS: {
                 if (args.isEmpty()) {
                     throw new IllegalArgumentException("Command " + type.getLabel() + " has invalid arguments.");
                 }
                 return new RedisFailedCommand(
                         type.getLabel().toUpperCase(),
-                        args.get(0),
+                        args,
                         null,
                         null);
             }
@@ -134,7 +142,7 @@ private RedisFailedCommand createFailedCommand(RedisCommand redisCommand) {
                 }
                 return new RedisFailedCommand(
                         type.getLabel().toUpperCase(),
-                        null,
+                        Collections.emptyList(),
                         RedisUtils.redisPatternToRegex(args.get(0)),
                         null);
             }
@@ -145,7 +153,7 @@ private RedisFailedCommand createFailedCommand(RedisCommand redisCommand) {
                 }
                 return new RedisFailedCommand(
                         type.getLabel().toUpperCase(),
-                        args.get(0),
+                        Collections.singletonList((args.get(0))),
                         null,
                         args.get(1));
             }
@@ -207,8 +215,7 @@ private RedisKeyValueStore createRedisInfoForIntersection(List<String> commandKe
         //The value for each one, since each key represents a SET, correspond to the members of that given set.
         Map<String, RedisValueData> redisData = new HashMap<>();
         keySet.forEach(
-                key -> redisData.put(key, new RedisValueData(redisClient.getSetMembers(key))
-        ));
+                key -> redisData.put(key, new RedisValueData(redisClient.getSetMembers(key))));
         return new RedisKeyValueStore(redisData);
     }
 
@@ -219,8 +226,7 @@ private RedisKeyValueStore createRedisInfoForAllKeys(ReflectionBasedRedisClient
         //No value is needed in this case.
         Map<String, RedisValueData> redisData = new HashMap<>();
         keys.forEach(
-                key -> redisData.put(key, null)
-        );
+                key -> redisData.put(key, null));
         return new RedisKeyValueStore(redisData);
     }
 
@@ -230,7 +236,8 @@ private RedisKeyValueStore createRedisInfoForKeysByType(String type, ReflectionB
         //A Map structure is introduced here using the same keys that are stored in REDIS.
         //No value is needed in this case.
         Map<String, RedisValueData> redisData = new HashMap<>();
-        keys.forEach(key -> redisData.put(key, null));
+        keys.forEach(
+                key -> redisData.put(key, null));
         return new RedisKeyValueStore(redisData);
     }
 
@@ -240,7 +247,8 @@ private RedisKeyValueStore createRedisInfoForKeysByField(ReflectionBasedRedisCli
         //A Map structure is introduced here using the same keys that are stored in REDIS.
         //The value for each one, since each key is of type HASH, correspond to the fields stored for that given key.
         Map<String, RedisValueData> redisData = new HashMap<>();
-        keys.forEach(key -> redisData.put(key, new RedisValueData(redisClient.getHashFields(key))));
+        keys.forEach(
+                key -> redisData.put(key, new RedisValueData(redisClient.getHashFields(key))));
         return new RedisKeyValueStore(redisData);
     }
 

client-java/controller/src/main/java/org/evomaster/client/java/controller/redis/RedisCommandExecutor.java

@@ -37,6 +37,9 @@ public static RedisInsertionResultsDto executeInsert(
                     case "HSET":
                         client.hashSet(dto.key, dto.field, dto.value);
                         break;
+                    case "SADD":
+                        client.addMember(dto.key, dto.value);
+                        break;
                     default:
                         throw new IllegalArgumentException(
                                 "Unsupported Redis command: " + dto.command);

client-java/controller/src/main/java/org/evomaster/client/java/controller/redis/ReflectionBasedRedisClient.java

@@ -23,6 +23,7 @@ public class ReflectionBasedRedisClient {
     private static final String HGETALL_METHOD = "hgetall";
     private static final String HSET_METHOD = "hset";
     private static final String KEYS_METHOD = "keys";
+    private static final String SADD_METHOD = "sadd";
     private static final String SELECT_METHOD = "select";
     private static final String SET_METHOD = "set";
     private static final String SHUTDOWN_METHOD = "shutdown";
@@ -117,6 +118,11 @@ public void hashSet(String key, String field, String value) {
         invoke(HSET_METHOD, key, field, value);
     }
 
+    /** SADD key */
+    public void addMember(String key, String member) {
+        invoke(SADD_METHOD, key, new String[]{member});
+    }
+
     /** SMEMBERS key */
     public Set<String> getSetMembers(String key) {
         Object result = invoke(SMEMBERS_METHOD, key);