Merge remote-tracking branch 'origin/develop' into develop

Author: arcuri82

jdk_8_maven/em/embedded/thrift/ncs/src/main/java/em/embedded/org/thriftncs/EmbeddedEvoMasterController.java

@@ -9,6 +9,7 @@
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
+import org.evomaster.client.java.controller.api.dto.problem.rpc.RPCType;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RPCProblem;

jdk_8_maven/em/embedded/thrift/scs/src/main/java/em/embedded/org/thriftscs/EmbeddedEvoMasterController.java

@@ -9,6 +9,7 @@
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
+import org.evomaster.client.java.controller.api.dto.problem.rpc.RPCType;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RPCProblem;

jdk_8_maven/em/external/thrift/ncs/src/main/java/em/external/org/rpc/thriftncs/ExternalEvoMasterController.java

@@ -9,6 +9,7 @@
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
+import org.evomaster.client.java.controller.api.dto.problem.rpc.RPCType;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RPCProblem;
@@ -74,6 +75,9 @@ public ExternalEvoMasterController(int controllerPort, String jarLocation, int s
         setJavaCommand(command);
     }
 
+    public ExternalEvoMasterController(String jarLocation){
+        this(40100, jarLocation, 12345, 120, "java");
+    }
 
     @Override
     public String[] getInputParameters() {

jdk_8_maven/em/external/thrift/scs/src/main/java/em/external/org/rpc/thriftscs/ExternalEvoMasterController.java

@@ -9,6 +9,7 @@
 import org.evomaster.client.java.controller.InstrumentedSutStarter;
 import org.evomaster.client.java.controller.api.dto.AuthenticationDto;
 import org.evomaster.client.java.controller.api.dto.SutInfoDto;
+import org.evomaster.client.java.controller.api.dto.problem.rpc.RPCType;
 import org.evomaster.client.java.controller.internal.db.DbSpecification;
 import org.evomaster.client.java.controller.problem.ProblemInfo;
 import org.evomaster.client.java.controller.problem.RPCProblem;
@@ -66,6 +67,10 @@ public ExternalEvoMasterController() {
         this(40100, "cs/rpc/thrift/artificial/thrift-scs/target/rpc-thrift-scs-sut.jar", 12345, 120, "java");
     }
 
+    public ExternalEvoMasterController(String jarLocation){
+        this(40100, jarLocation, 12345, 120, "java");
+    }
+
     public ExternalEvoMasterController(int controllerPort, String jarLocation, int sutPort, int timeoutSeconds, String command) {
         this.sutPort = sutPort;
         this.jarLocation = jarLocation;