Merge remote-tracking branch 'origin/master' into regex-support-extension

Author: lmasroca

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/ControllerConstants.java

@@ -30,6 +30,8 @@ public class ControllerConstants {
 
     public static final String MONGO_INSERTION = "/mongoInsertion";
 
+    public static final String REDIS_INSERTION = "/redisInsertion";
+
     public static final String POST_SEARCH_ACTION = "/postSearchAction";
 
     public static final String DERIVE_PARAMS = "/deriveParams";

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

@@ -1,5 +1,6 @@
 package org.evomaster.client.java.controller.api.dto;
 
+import org.evomaster.client.java.controller.api.dto.database.execution.RedisExecutionsDto;
 import org.evomaster.client.java.controller.api.dto.database.execution.SqlExecutionsDto;
 import org.evomaster.client.java.controller.api.dto.database.execution.MongoExecutionsDto;
 import java.util.ArrayList;
@@ -21,4 +22,6 @@ public class ExtraHeuristicsDto {
     public SqlExecutionsDto sqlSqlExecutionsDto;
 
     public MongoExecutionsDto mongoExecutionsDto;
+
+    public RedisExecutionsDto redisExecutionsDto;
 }

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

@@ -0,0 +1,15 @@
+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, we keep track of those that return no data.
+ * This class summarizes every failed command in a given execution.
+ */
+public class RedisExecutionsDto {
+
+    public RedisExecutionsDto() {}
+
+    public List<RedisFailedCommand> failedCommands = new ArrayList<>();
+}

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

@@ -0,0 +1,31 @@
+package org.evomaster.client.java.controller.api.dto.database.execution;
+
+/**
+ * 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.
+ */
+public class RedisFailedCommand {
+
+    /**
+     * Command keyword. Corresponds to a RedisCommandType label.
+     */
+    public String command;
+
+    /**
+     * Command type. Corresponds to a RedisCommandType dataType.
+     */
+    public String type;
+
+    /**
+     * Key involved. Could be null if the command does not have a key in the arguments. For example: KEYS (pattern).
+     */
+    public String key;
+
+    public RedisFailedCommand() {}
+
+    public RedisFailedCommand(String command, String key, String type) {
+        this.command = command;
+        this.key = key;
+        this.type = type;
+    }
+}

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/database/operations/RedisDatabaseCommandsDto.java

@@ -0,0 +1,12 @@
+package org.evomaster.client.java.controller.api.dto.database.operations;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Class used to execute Redis commands.
+ * Each item in the insertions list corresponds to a command to be executed.
+ */
+public class RedisDatabaseCommandsDto {
+    public List<RedisInsertionDto> insertions = new ArrayList<>();
+}

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/database/operations/RedisInsertionDto.java

@@ -0,0 +1,13 @@
+package org.evomaster.client.java.controller.api.dto.database.operations;
+
+/**
+ * Contains data to be inserted into Redis.
+ */
+public class RedisInsertionDto {
+
+    /** The Redis key.*/
+    public String key;
+
+    /** The serialized value to set for that key. */
+    public String value;
+}

client-java/controller-api/src/main/java/org/evomaster/client/java/controller/api/dto/database/operations/RedisInsertionResultsDto.java

@@ -0,0 +1,17 @@
+package org.evomaster.client.java.controller.api.dto.database.operations;
+
+import java.util.List;
+
+/**
+ * The execution result of {@link RedisDatabaseCommandsDto} that performs insertions.
+ */
+public class RedisInsertionResultsDto {
+
+    public RedisInsertionResultsDto() {}
+
+    /**
+     * Whether the insertion at the index of a sequence of Redis insertions (i.e., {@link RedisDatabaseCommandsDto#insertions})
+     * executed successfully.
+     */
+    public List<Boolean> executionResults;
+}

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

@@ -114,6 +114,11 @@ public final void setExecutingInitMongo(boolean executingInitMongo) {
         ExecutionTracer.setExecutingInitMongo(executingInitMongo);
     }
 
+    @Override
+    public final void setExecutingInitRedis(boolean executingInitRedis) {
+        ExecutionTracer.setExecutingInitRedis(executingInitRedis);
+    }
+
     @Override
     public final void setExecutingAction(boolean executingAction){
         ExecutionTracer.setExecutingAction(executingAction);

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

@@ -522,6 +522,14 @@ public final void setExecutingInitMongo(boolean executingInitMongo) {
         ExecutionTracer.setExecutingInitMongo(executingInitMongo);
     }
 
+    @Override
+    public final void setExecutingInitRedis(boolean executingInitRedis) {
+        checkInstrumentation();
+        serverController.setExecutingInitRedis(executingInitRedis);
+        // sync executingInitRedis on the local ExecutionTracer
+        ExecutionTracer.setExecutingInitRedis(executingInitRedis);
+    }
+
     @Override
     public final void setExecutingAction(boolean executingAction){
         checkInstrumentation();

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

@@ -1,9 +1,6 @@
 package org.evomaster.client.java.controller;
 
-import org.evomaster.client.java.controller.api.dto.database.operations.InsertionDto;
-import org.evomaster.client.java.controller.api.dto.database.operations.InsertionResultsDto;
-import org.evomaster.client.java.controller.api.dto.database.operations.MongoInsertionDto;
-import org.evomaster.client.java.controller.api.dto.database.operations.MongoInsertionResultsDto;
+import org.evomaster.client.java.controller.api.dto.database.operations.*;
 import org.evomaster.client.java.controller.api.dto.problem.rpc.ScheduleTaskInvocationResultDto;
 import org.evomaster.client.java.controller.redis.ReflectionBasedRedisClient;
 import org.evomaster.client.java.sql.DbCleaner;
@@ -91,6 +88,8 @@ default void setupForGeneratedTest(){}
 
     MongoInsertionResultsDto execInsertionsIntoMongoDatabase(List<MongoInsertionDto> insertions);
 
+    RedisInsertionResultsDto execInsertionsIntoRedisDatabase(List<RedisInsertionDto> insertions);
+
     /**
      * <p>
      * return an instance of a client of an RPC service.