Merge branch 'master' into feature/jsonPatch

Author: suarezrominajulieta

core-tests/e2e-tests/e2e-tests-utils/src/test/java/org/evomaster/e2etests/utils/EnterpriseTestBase.java

@@ -459,6 +459,7 @@ protected List<String> getArgsWithCompilation(int iterations, String outputFolde
         boolean active = code % 2 == 0;
 
         List<String> arguments = new ArrayList<>(Arrays.asList(
+                "--blackBox", "false",
                 "--createTests", "" + createTests,
                 "--seed", "" + defaultSeed,
                 "--useTimeInFeedbackSampling" , "false",

core-tests/e2e-tests/e2e-tests-utils/src/test/java/org/evomaster/e2etests/utils/RestTestBase.java

@@ -45,6 +45,7 @@ protected String runAndCheckDeterminism(int iterations, Consumer<List<String>> l
         SimpleLogger.setThreshold(SimpleLogger.Level.OFF);
 
         List<String> args =  new ArrayList<>(Arrays.asList(
+                "--blackBox", "false",
                 "--createTests", "false",
                 "--seed", "42",
                 "--showProgress", "false",

core-tests/e2e-tests/spring/spring-graphql/src/test/kotlin/org/evomaster/e2etests/spring/graphql/blackbox/GQLBlackBoxBaseEMTest.java

@@ -33,12 +33,10 @@ public void testRunEM(boolean bbExperiments) throws Throwable {
                 ClassName.get("org.foo.BlackBoxConstant"),
                 true);
 
+        setOption(args, "blackBox", "true");
+        setOption(args, "bbTargetUrl", baseUrlOfSut+"/graphql");
         args.add("--problemType");
         args.add("GRAPHQL");
-        args.add("--blackBox");
-        args.add("true");
-        args.add("--bbTargetUrl");
-        args.add(baseUrlOfSut+"/graphql");
         args.add("--bbExperiments");
         args.add("" + bbExperiments);
 

core-tests/e2e-tests/spring/spring-rest-h2-v1/src/test/java/org/evomaster/e2etests/spring/examples/db/directintwithsql/DbDirectIntWithSqlEMTest.java

@@ -102,6 +102,7 @@ public void testSteps(boolean heuristicsForSQLAdvanced) {
         CIUtils.skipIfOnCircleCI();
 
         List<String> args = new ArrayList<>();
+        setOption(args, "blackBox", "false");
         setOption(args, "createTests", "true");
         setOption(args, "seed", "42" );
         setOption(args, "sutControllerPort", "" + controllerPort);

core-tests/e2e-tests/spring/spring-rest-h2-v1/src/test/java/org/evomaster/e2etests/spring/examples/db/javatypes/JavaTypesEMTest.java

@@ -46,6 +46,7 @@ public void testRunEMWithSQL(boolean heuristicsForSQLAdvanced) throws Throwable
 
         handleFlaky(() -> {
             List<String> args = new ArrayList<>();
+            setOption(args, "blackBox", "false");
             setOption(args, "createTests", "true");
             setOption(args, "seed", "" + defaultSeed++);
             setOption(args, "sutControllerPort", "" + controllerPort);

core-tests/e2e-tests/spring/spring-rest-h2-v1/src/test/java/org/evomaster/e2etests/spring/examples/resource/ResourceMIOHWTestBase.java

@@ -75,6 +75,7 @@ protected Gene getGeneByName(Action action, String name){
     protected List<String> generalArgs(int budget, int seed){
         return new ArrayList<>(
                 Arrays.asList(
+                        "--blackBox", "false",
                         "--createTests", "false",
                         "--seed", ""+seed,
                         "--useTimeInFeedbackSampling", "false",

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/authenticatedswaggerendpoint/AuthenticatedSwaggerEndpointEMTest.kt

@@ -42,12 +42,10 @@ class AuthenticatedSwaggerEndpointEMTest : SpringTestBase(){
             20
         ) { args: MutableList<String> ->
 
-            args.add("--blackBox")
-            args.add("true")
-            args.add("--bbTargetUrl")
-            args.add(baseUrlOfSut)
-            args.add("--bbSwaggerUrl")
-            args.add("$baseUrlOfSut/v3/api-docs")
+            setOption(args, "blackBox", "true")
+            setOption(args, "bbTargetUrl", baseUrlOfSut)
+            setOption(args, "bbSwaggerUrl", "$baseUrlOfSut/v3/api-docs")
+
             args.add("--bbExperiments")
             args.add("false")
 

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/base/BaseMaxTimeAttemptEMTest.kt

@@ -27,6 +27,7 @@ class BaseMaxTimeAttemptEMTest : SpringTestBase() {
     fun testRunEM() {
 
             val args = listOf(
+                    "--blackBox", "false",
                     "--createTests", "false",
                     "--seed", "" + defaultSeed,
                     "--useTimeInFeedbackSampling", "false",

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/logintoken/LoginTokenEMTest.kt

@@ -42,12 +42,10 @@ class LoginTokenEMTest : SpringTestBase(){
             20
         ) { args: MutableList<String> ->
 
-            args.add("--blackBox")
-            args.add("true")
-            args.add("--bbTargetUrl")
-            args.add(baseUrlOfSut)
-            args.add("--bbSwaggerUrl")
-            args.add("$baseUrlOfSut/v3/api-docs")
+            setOption(args, "blackBox", "true")
+            setOption(args, "bbTargetUrl", baseUrlOfSut)
+            setOption(args, "bbSwaggerUrl", "$baseUrlOfSut/v3/api-docs")
+
             args.add("--bbExperiments")
             args.add("false")
 

core-tests/e2e-tests/spring/spring-rest-openapi-v3/src/test/kotlin/org/evomaster/e2etests/spring/openapi/v3/wiremock/hostnameaction/HostnameResolutionActionEMTest.kt

@@ -61,6 +61,7 @@ class HostnameResolutionActionEMTest: SpringTestBase() {
     @Test
     fun manualTest() {
         val args = arrayOf(
+            "--blackBox", "false",
             "--createTests", "false",
             "--seed", "42",
             "--sutControllerPort", "" + controllerPort,