new constructor, to handle issue in External Driver jar location

arcuri82 · arcuri82 · commit 7b0a50cb0eea · 2022-01-25T16:04:47.000+01:00
diff --git a/jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java b/jdk_11_gradle/em/external/graphql/patio-api/src/main/java/em/external/patio/ExternalEvoMasterController.java
@@ -58,7 +58,7 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
 
     private static final GenericContainer postgres = new GenericContainer("postgres:9")
@@ -72,6 +72,11 @@ public ExternalEvoMasterController(){
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(
             int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command
            ) {
diff --git a/jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java b/jdk_11_maven/em/external/graphql/timbuctoo/src/main/java/em/external/nl/knaw/huygens/ExternalEvoMasterController.java
@@ -57,7 +57,7 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private final String tmpFolder;
     private final String CONFIG_FILE = "timbuctoo_evomaster.yaml";
 
@@ -71,6 +71,11 @@ public ExternalEvoMasterController(){
         this(40100, "../api/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort,
                                        String jarLocation,
                                        int sutPort,
diff --git a/jdk_11_maven/em/external/rest/cwa-verification/src/main/java/em/external/app/coronawarn/verification/ExternalEvoMasterController.java b/jdk_11_maven/em/external/rest/cwa-verification/src/main/java/em/external/app/coronawarn/verification/ExternalEvoMasterController.java
@@ -55,14 +55,19 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
     private Server h2;
 
     public ExternalEvoMasterController() {
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.dbPort = sutPort + 1;
diff --git a/jdk_8_maven/em/external/graphql/graphql-ncs/src/main/java/em/external/org/graphqlncs/ExternalEvoMasterController.java b/jdk_8_maven/em/external/graphql/graphql-ncs/src/main/java/em/external/org/graphqlncs/ExternalEvoMasterController.java
@@ -49,12 +49,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private String jarLocation;
 
     public ExternalEvoMasterController(){
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(
             int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command
     ) {
diff --git a/jdk_8_maven/em/external/graphql/graphql-scs/src/main/java/em/external/org/graphqlscs/ExternalEvoMasterController.java b/jdk_8_maven/em/external/graphql/graphql-scs/src/main/java/em/external/org/graphqlscs/ExternalEvoMasterController.java
@@ -49,12 +49,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
 
     public ExternalEvoMasterController(){
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(
             int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command
     ) {
diff --git a/jdk_8_maven/em/external/graphql/spring-petclinic-graphql/src/main/java/em/external/org/springframework/samples/petclinic/ExternalEvoMasterController.java b/jdk_8_maven/em/external/graphql/spring-petclinic-graphql/src/main/java/em/external/org/springframework/samples/petclinic/ExternalEvoMasterController.java
@@ -57,7 +57,7 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
 
     private static final GenericContainer postgres = new GenericContainer("postgres:9")
@@ -70,6 +70,11 @@ public ExternalEvoMasterController(){
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(
             int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command
            ) {
diff --git a/jdk_8_maven/em/external/rest/catwatch/src/main/java/em/external/org/zalando/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/catwatch/src/main/java/em/external/org/zalando/ExternalEvoMasterController.java
@@ -56,14 +56,20 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private String jarLocation;
     private Connection connection;
     private Server h2;
 
+
     public ExternalEvoMasterController() {
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.dbPort = sutPort + 1;
diff --git a/jdk_8_maven/em/external/rest/features-service/src/main/java/em/external/org/javiermf/features/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/features-service/src/main/java/em/external/org/javiermf/features/ExternalEvoMasterController.java
@@ -54,14 +54,19 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
     private Server h2;
 
     public ExternalEvoMasterController() {
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.dbPort = sutPort + 1;
diff --git a/jdk_8_maven/em/external/rest/ind0/src/main/java/em/external/org/ind0/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/ind0/src/main/java/em/external/org/ind0/ExternalEvoMasterController.java
@@ -66,7 +66,7 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private final String packagesToInstrument;
     private Connection connection;
 
@@ -79,6 +79,11 @@ public ExternalEvoMasterController(){
         this(40100, SUT_LOCATION_IND0, 12345, 120, "java", SUT_PACKAGE_IND0);
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(
             int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command,
             String packagesToInstrument) {
diff --git a/jdk_8_maven/em/external/rest/languagetool/src/main/java/em/external/org/languagetool/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/languagetool/src/main/java/em/external/org/languagetool/ExternalEvoMasterController.java
@@ -54,12 +54,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
 
     public ExternalEvoMasterController() {
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
diff --git a/jdk_8_maven/em/external/rest/ncs/src/main/java/em/external/org/restncs/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/ncs/src/main/java/em/external/org/restncs/ExternalEvoMasterController.java
@@ -48,12 +48,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
 
     public ExternalEvoMasterController() {
         this(40100, "cs/rest/artificial/ncs/target/rest-ncs.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
diff --git a/jdk_8_maven/em/external/rest/news/src/main/java/em/external/org/tsdes/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/news/src/main/java/em/external/org/tsdes/ExternalEvoMasterController.java
@@ -54,14 +54,19 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
     private Server h2;
 
     public ExternalEvoMasterController() {
         this(40100, "../core/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.dbPort = sutPort + 1;
diff --git a/jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/ocvn/src/main/java/em/external/org/devgateway/ocvn/ExternalEvoMasterController.java
@@ -62,7 +62,7 @@ public static void main(String[] args) {
     private final int sutPort;
     private final int dbPort;
 
-    private final String jarLocation;
+    private  String jarLocation;
     private Connection connection;
     private Server h2;
 
@@ -75,6 +75,11 @@ public ExternalEvoMasterController() {
         this(40100, "../web/target/web-1.1.1-SNAPSHOT-exec.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
diff --git a/jdk_8_maven/em/external/rest/proxyprint/src/main/java/em/external/io/github/proxyprint/kitchen/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/proxyprint/src/main/java/em/external/io/github/proxyprint/kitchen/ExternalEvoMasterController.java
@@ -60,7 +60,7 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private final String tmpDir;
     private Connection connection;
     private Server h2;
@@ -69,6 +69,11 @@ public ExternalEvoMasterController() {
         this(40100, "cs/rest/original/proxyprint/target/proxyprint.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.dbPort = sutPort + 1;
diff --git a/jdk_8_maven/em/external/rest/restcountries/src/main/java/em/external/eu/fayder/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/restcountries/src/main/java/em/external/eu/fayder/ExternalEvoMasterController.java
@@ -48,12 +48,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
 
     public ExternalEvoMasterController() {
         this(40100, "cs/rest/original/restcountries/target/restcountries-sut.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
diff --git a/jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/scout-api/src/main/java/em/external/se/devscout/scoutapi/ExternalEvoMasterController.java
@@ -67,7 +67,7 @@ public static void main(String[] args) {
     private final int timeoutSeconds;
     private final int sutPort;
     private final int dbPort;
-    private final String jarLocation;
+    private  String jarLocation;
     private final String tmpDir;
     private final String CONFIG_FILE = "scout_api_evomaster.yml";
 
@@ -80,6 +80,11 @@ public ExternalEvoMasterController(){
         this(40100, "../api/target", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort,
                                        String jarLocation,
                                        int sutPort,
diff --git a/jdk_8_maven/em/external/rest/scs/src/main/java/em/external/org/restscs/ExternalEvoMasterController.java b/jdk_8_maven/em/external/rest/scs/src/main/java/em/external/org/restscs/ExternalEvoMasterController.java
@@ -48,12 +48,17 @@ public static void main(String[] args) {
 
     private final int timeoutSeconds;
     private final int sutPort;
-    private final String jarLocation;
+    private  String jarLocation;
 
     public ExternalEvoMasterController() {
         this(40100, "cs/rest/artificial/scs/target/rest-scs.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation) {
+        this();
+        this.jarLocation = jarLocation;
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;
