Merge branch 'master' into feature/chemical-reaction-optimization

Author: francastagna

.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.
@@ -350,7 +349,7 @@ jobs:
           CI_env: GithubAction
       - name: Run BB E2E tests
         # important that what we run here does not use Docker
-        working-directory: core-tests/e2e-tests/spring-rest-bb
+        working-directory: core-tests/e2e-tests/spring/spring-rest-bb
         run:  mvn clean verify --fae
         env:
           CI_env: GithubAction

.gitignore

@@ -35,22 +35,22 @@ client-java/ci-utils/target
 core/target/
 /core-tests/e2e-tests/dropwizard-examples/target/
 /core-tests/e2e-tests/e2e-tests-utils/target/
-/core-tests/e2e-tests/spring-rest-openapi-v2/target/
+/core-tests/e2e-tests/spring/spring-rest-openapi-v2/target/
 experiments/target/
-/core-tests/e2e-tests/spring-rest-openapi-v2/src/em/EvoMasterTest.java
+/core-tests/e2e-tests/spring/spring-rest-openapi-v2/src/em/EvoMasterTest.java
 /core-tests/e2e-tests/dropwizard-examples/src/em/
 /snapshot.csv
 *.lst
 /report/target/
 /extra_heuristics.csv
 /core-extra/dbconstraint/target/
-/core-tests/e2e-tests/spring-rest-postgres/target/
-/core-tests/e2e-tests/spring-rest-postgres-data-types/target/
+/core-tests/e2e-tests/spring/spring-rest-postgres/target/
+/core-tests/e2e-tests/spring/spring-rest-postgres-data-types/target/
 /core/testWithEMB.sh
 /resource-rest-experiments/api-generator/target/
 
-/core-tests/e2e-tests/spring-rest-openapi-v3/target
-/core-tests/e2e-tests/spring-graphql/target
+/core-tests/e2e-tests/spring/spring-rest-openapi-v3/target
+/core-tests/e2e-tests/spring/spring-graphql/target
 /core-tests/e2e-tests/ci-utils/target
 
 /core-tests/core-it/target/
@@ -90,73 +90,72 @@ Migrations/
 
 
 /release/
-/core-tests/e2e-tests/spring-rpc-thrift/target/
-/core-tests/e2e-tests/spring-rpc/spring-rpc-thrift/target/
+/core-tests/e2e-tests/spring/spring-rpc-thrift/target/
+/core-tests/e2e-tests/spring/spring-rpc-grpc/target/
 /core-tests/e2e-tests/micronaut-latest/target/
 /core-tests/e2e-tests/wiremock/target/
 
 
-/core-tests/e2e-tests/spring-rest-h2-v1/target/
-/core-tests/e2e-tests/spring-rest-mysql-column-types/target/
-/core-tests/e2e-tests/spring-rest-postgres-column-types/target/
-/core-tests/e2e-tests/spring-rest-h2-column-types/target/
-/core-tests/e2e-tests/spring-rest-h2-z3solver/target/
+/core-tests/e2e-tests/spring/spring-rest-h2-v1/target/
+/core-tests/e2e-tests/spring/spring-rest-mysql-column-types/target/
+/core-tests/e2e-tests/spring/spring-rest-postgres-column-types/target/
+/core-tests/e2e-tests/spring/spring-rest-h2-column-types/target/
+/core-tests/e2e-tests/spring/spring-rest-h2-z3solver/target/
 /core-tests/client-java/test-old-libraries/target/
-/core-tests/e2e-tests/spring-web/target/
-/core-tests/e2e-tests/spring-rest-mongo/target/
-/core-tests/e2e-tests/spring-rest-opensearch/target/
+/core-tests/e2e-tests/spring/spring-web/target/
+/core-tests/e2e-tests/spring/spring-rest-mongo/target/
+/core-tests/e2e-tests/spring/spring-rest-opensearch/target/
 /core-tests/client-java/target/
 /core-tests/client-java/dependencies/target/
 /core-tests/client-java/sql-dto/target/
 /core-tests/client-java/sql/target/
 /core-tests/client-java/distance-heuristics/target/
-/core-tests/e2e-tests/spring-rpc/spring-rpc-grpc/target/
 /em.toml
 
 /core-extra/solver/target/
 /em.yaml
-/core-tests/e2e-tests/spring-rest-openapi-v2/em.yaml
-/core-tests/e2e-tests/spring-rest-openapi-v3/em.yaml
+/core-tests/e2e-tests/spring/spring-rest-openapi-v2/em.yaml
+/core-tests/e2e-tests/spring/spring-rest-openapi-v3/em.yaml
 /core-tests/core-it/em.yaml
 
 /test-utils/test-utils-js/coverage/
 /test-utils/test-utils-js/node_modules/
 /test-utils/test-utils-js/target/
 /core/em.yaml
 
-/core-tests/e2e-tests/spring-rest-bb/target/
-/core-tests/e2e-tests/spring-rest-bb/javascript/node_modules/
-/core-tests/e2e-tests/spring-rest-bb/javascript/generated/
-/core-tests/e2e-tests/spring-rest-bb/python/generated/
+/core-tests/e2e-tests/spring/spring-rest-bb/target/
+/core-tests/e2e-tests/spring/spring-rest-bb/javascript/node_modules/
+/core-tests/e2e-tests/spring/spring-rest-bb/javascript/generated/
+/core-tests/e2e-tests/spring/spring-rest-bb/python/generated/
 
 /client-java/test-utils-java/target/
 
 /test-utils/test-utils-py/target/
 /test-utils/test-utils-py/src/main/resources/__pycache__/
 /test-utils/test-utils-py/src/test/__pycache__/
 
-/core-tests/e2e-tests/spring-graphql-bb/javascript/generated/
-/core-tests/e2e-tests/spring-graphql-bb/javascript/node_modules/
-/core-tests/e2e-tests/spring-graphql-bb/python/generated/
-/core-tests/e2e-tests/spring-graphql-bb/target/
+/core-tests/e2e-tests/spring/spring-graphql-bb/javascript/generated/
+/core-tests/e2e-tests/spring/spring-graphql-bb/javascript/node_modules/
+/core-tests/e2e-tests/spring/spring-graphql-bb/python/generated/
+/core-tests/e2e-tests/spring/spring-graphql-bb/target/
 
 /generated_tests/
-/core-tests/e2e-tests/spring-rest-bb/maven/src/
-/core-tests/e2e-tests/spring-rest-bb/maven/target/
+/core-tests/e2e-tests/spring/spring-rest-bb/maven/src/
+/core-tests/e2e-tests/spring/spring-rest-bb/maven/target/
 /target/
 /wfc/target/
 
-/core-tests/e2e-tests/emb-json/target/
+/core-tests/e2e-tests/spring/emb-json/target/
 /process_data/
-/core-tests/e2e-tests/spring-rest-multidb/target/
-/core-tests/e2e-tests/spring-rest-h2-v2/target/
-/core-tests/e2e-tests/spring-rest-rsa/target/
-/core-tests/e2e-tests/spring-rest-h2-v1/em.yaml
+/core-tests/e2e-tests/spring/spring-rest-multidb/target/
+/core-tests/e2e-tests/spring/spring-rest-h2-v2/target/
+/core-tests/e2e-tests/spring/spring-rest-rsa/target/
+/core-tests/e2e-tests/spring/spring-rest-h2-v1/em.yaml
 /core-tests/integration-tests/core-it/target/
 /core-tests/integration-tests/core-it/em.yaml
 
 client-java/sql/target
 client-java/sql-dto/target
 client-java/distance-heuristics/target
 client-java/test-old-libraries/target
-core-tests/e2e-tests/spring-rest-mysql/target
+core-tests/e2e-tests/spring/spring-rest-mysql/target

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/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;

…nal/db/MongoDistanceWithMetricsTest.java …/mongo/MongoDistanceWithMetricsTest.javaclient-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetricsTest.java renamed to client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetricsTest.java client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/MongoDistanceWithMetricsTest.java renamed to client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoDistanceWithMetricsTest.java

@@ -1,4 +1,4 @@
-package org.evomaster.client.java.controller.internal.db;
+package org.evomaster.client.java.controller.internal.db.mongo;
 
 import org.junit.jupiter.api.Test;
 

client-java/controller/src/test/java/org/evomaster/client/java/controller/internal/db/mongo/MongoHandlerTest.java

@@ -3,8 +3,6 @@
 import com.mongodb.client.*;
 import org.bson.Document;
 import org.bson.conversions.Bson;
-import org.evomaster.client.java.controller.internal.db.MongoHandler;
-import org.evomaster.client.java.controller.internal.db.MongoCommandWithDistance;
 import org.evomaster.client.java.instrumentation.MongoFindCommand;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.BeforeEach;

core-tests/e2e-tests/pom.xml

@@ -16,24 +16,7 @@
         <module>e2e-tests-utils</module>
         <module>dropwizard-examples</module>
         <module>micronaut-latest</module>
-        <module>spring-rest-postgres</module>
-        <module>spring-rest-openapi-v2</module>
-        <module>spring-rest-openapi-v3</module>
-        <module>spring-graphql</module>
-        <module>spring-rest-mysql</module>
-        <module>spring-rpc</module>
-        <module>spring-rest-h2-v1</module>
-        <module>spring-rest-h2-v2</module>
-        <module>spring-rest-h2-z3solver</module>
-        <module>spring-web</module>
-        <module>spring-rest-mongo</module>
-        <module>spring-rest-bb</module>
-        <module>spring-graphql-bb</module>
-        <module>emb-json</module>
-        <module>spring-rest-multidb</module>
-        <module>spring-rest-opensearch</module>
-        <module>spring-rest-rsa</module>
-
+        <module>spring</module>
     </modules>