fixes for PR, added EXECUTING_INIT_REDIS in Command (instrumentation-external) and corrected redis flow

Author: aszyrej

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

@@ -525,9 +525,9 @@ public final void setExecutingInitMongo(boolean executingInitMongo) {
     @Override
     public final void setExecutingInitRedis(boolean executingInitRedis) {
         checkInstrumentation();
-        serverController.setExecutingInitMongo(executingInitRedis);
-        // sync executingInitMongo on the local ExecutionTracer
-        ExecutionTracer.setExecutingInitMongo(executingInitRedis);
+        serverController.setExecutingInitRedis(executingInitRedis);
+        // sync executingInitRedis on the local ExecutionTracer
+        ExecutionTracer.setExecutingInitRedis(executingInitRedis);
     }
 
     @Override

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/InstrumentationController.java

@@ -51,6 +51,10 @@ public static void setExecutingInitMongo(boolean executingInitMongo){
         ExecutionTracer.setExecutingInitMongo(executingInitMongo);
     }
 
+    public static void setExecutingInitRedis(boolean executingInitRedis){
+        ExecutionTracer.setExecutingInitRedis(executingInitRedis);
+    }
+
     public static void setExecutingAction(boolean executingAction){
         ExecutionTracer.setExecutingAction(executingAction);
     }

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/external/AgentController.java

@@ -94,6 +94,10 @@ public static void start(int port){
                         handleExecutingInitMongo();
                         sendCommand(Command.ACK);
                         break;
+                    case EXECUTING_INIT_REDIS:
+                        handleExecutingInitRedis();
+                        sendCommand(Command.ACK);
+                        break;
                     case EXECUTING_ACTION:
                         handleExecutingAction();
                         sendCommand(Command.ACK);
@@ -180,6 +184,16 @@ private static void handleExecutingInitMongo() {
         }
     }
 
+    private static void handleExecutingInitRedis() {
+        try {
+            Object msg = in.readObject();
+            Boolean executingInitRedis = (Boolean) msg;
+            InstrumentationController.setExecutingInitRedis(executingInitRedis);
+        } catch (Exception e){
+            SimpleLogger.error("Failure in handling executing-init-redis: "+e.getMessage());
+        }
+    }
+
     private static void handleExecutingAction() {
         try {
             Object msg = in.readObject();

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/external/Command.java

@@ -19,6 +19,7 @@ public enum Command implements Serializable {
     KILL_SWITCH,
     EXECUTING_INIT_SQL,
     EXECUTING_INIT_MONGO,
+    EXECUTING_INIT_REDIS,
     EXECUTING_ACTION,
     BOOT_TIME_INFO,
     EXTRACT_JVM_DTO,

client-java/instrumentation/src/main/java/org/evomaster/client/java/instrumentation/external/ServerController.java

@@ -208,6 +208,10 @@ public boolean setExecutingInitMongo(boolean executingInitMongo) {
         return sendWithDataAndExpectACK(Command.EXECUTING_INIT_MONGO, executingInitMongo);
     }
 
+    public boolean setExecutingInitRedis(boolean executingInitRedis) {
+        return sendWithDataAndExpectACK(Command.EXECUTING_INIT_REDIS, executingInitRedis);
+    }
+
     public boolean setExecutingAction(boolean executingAction){
         return sendWithDataAndExpectACK(Command.EXECUTING_ACTION, executingAction);
     }

…key/RedisLettuceFindKeyNoSaveEMTest.java …ave/RedisLettuceFindKeyNoSaveEMTest.javacore-tests/e2e-tests/spring/spring-rest-redis/src/test/java/org/evomaster/e2etests/spring/rest/redis/lettuce/findkeynosave/findkey/RedisLettuceFindKeyNoSaveEMTest.java renamed to core-tests/e2e-tests/spring/spring-rest-redis/src/test/java/org/evomaster/e2etests/spring/rest/redis/lettuce/findkeynosave/RedisLettuceFindKeyNoSaveEMTest.java core-tests/e2e-tests/spring/spring-rest-redis/src/test/java/org/evomaster/e2etests/spring/rest/redis/lettuce/findkeynosave/findkey/RedisLettuceFindKeyNoSaveEMTest.java renamed to core-tests/e2e-tests/spring/spring-rest-redis/src/test/java/org/evomaster/e2etests/spring/rest/redis/lettuce/findkeynosave/RedisLettuceFindKeyNoSaveEMTest.java

@@ -1,4 +1,4 @@
-package org.evomaster.e2etests.spring.rest.redis.lettuce.findkeynosave.findkey;
+package org.evomaster.e2etests.spring.rest.redis.lettuce.findkeynosave;
 
 import com.foo.spring.rest.redis.lettuce.findkeynosave.findkey.RedisLettuceFindKeyNoSaveController;
 import org.evomaster.core.EMConfig;
@@ -30,7 +30,7 @@ public void testFindKeyWithGeneratedDataEM() throws Throwable {
         runTestHandlingFlakyAndCompilation(
                 "RedisLettuceFindKeyNoSaveEM",
                 "org.foo.spring.rest.redis.RedisLettuceFindKeyNoSaveEM",
-                1000,
+                100,
                 true,
                 (args) -> {
                     setOption(args, "heuristicsForRedis", "true");

core/src/main/kotlin/org/evomaster/core/output/service/ApiTestCaseWriter.kt

@@ -60,7 +60,7 @@ abstract class ApiTestCaseWriter : TestCaseWriter() {
         val initializingRedisActions = ind.individual.seeInitializingActions().filterIsInstance<RedisDbAction>()
         val initializingRedisResults = (ind.seeResults(initializingRedisActions))
         if (initializingRedisResults.any { (it as? RedisDbActionResult) == null })
-            throw IllegalStateException("the type of results are expected as MongoDbActionResults")
+            throw IllegalStateException("the type of results are expected as RedisDbActionResults")
 
         val initializingHostnameResolutionActions = ind.individual
             .seeInitializingActions()
@@ -94,7 +94,9 @@ abstract class ApiTestCaseWriter : TestCaseWriter() {
                     }
                     EvaluatedRedisDbAction(initializingRedisActions[it], result)
                 },
-                lines, insertionVars = insertionVars, skipFailure = config.skipFailureSQLInTestFile)
+                lines,
+                insertionVars = insertionVars,
+                skipFailure = config.skipFailureSQLInTestFile)
             // Same flag skipFailureSQLInTestFile as in mongo and sql.
         }