Merge pull request #699 from EMResearch/issue-698

Issue 698

Author: arcuri82

core/src/main/kotlin/org/evomaster/core/EMConfig.kt

@@ -260,6 +260,13 @@ class EMConfig {
             They can be check only once all fields have been updated
          */
 
+        if(!blackBox && bbSwaggerUrl.isNotBlank()){
+            throw IllegalArgumentException("'bbSwaggerUrl' should be set only in black-box mode")
+        }
+        if(!blackBox && bbTargetUrl.isNotBlank()){
+            throw IllegalArgumentException("'bbTargetUrl' should be set only in black-box mode")
+        }
+
         if (blackBox && !bbExperiments) {
 
             if(problemType == ProblemType.DEFAULT){

core/src/main/kotlin/org/evomaster/core/output/TestSuiteSplitter.kt

@@ -278,7 +278,11 @@ object TestSuiteSplitter {
      * if it contains the field "errors" in its body.
      */
     fun assessFailed(result: GraphQlCallResult): Boolean{
-        val resultBody = Gson().fromJson(result.getBody(), HashMap::class.java)
+        val resultBody = try {
+            Gson().fromJson(result.getBody(), HashMap::class.java)
+        } catch (e : JsonSyntaxException){
+            return true //TODO should this be treated specially???
+        }
         val errMsg = resultBody?.get("errors")
         return (resultBody!=null && errMsg != null)
     }

core/src/main/kotlin/org/evomaster/core/output/oracles/SchemaOracle.kt

@@ -1,6 +1,7 @@
 package org.evomaster.core.output.oracles
 
 import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
 import io.swagger.v3.oas.models.media.*
 import org.evomaster.core.logging.LoggingUtil
 import org.evomaster.core.output.Lines
@@ -342,7 +343,12 @@ class SchemaOracle : ImplementedOracle() {
         var supported = true
 
         if (res.getBodyType()?.isCompatible(MediaType.APPLICATION_JSON_TYPE) == true){
-            val actualObject = Gson().fromJson(res.getBody(), Object::class.java)
+            val actualObject = try {
+                Gson().fromJson(res.getBody(), Object::class.java)
+            } catch (e: JsonSyntaxException) {
+                return false
+            }
+
             if  (actualObject is Map<*,*>)
                 supported = supportedObject(actualObject, call)
             else if (actualObject is List<*>

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

@@ -1,6 +1,7 @@
 package org.evomaster.core.output.service
 
 import com.google.gson.Gson
+import com.google.gson.JsonSyntaxException
 import org.evomaster.core.database.DbAction
 import org.evomaster.core.database.DbActionResult
 import org.evomaster.core.output.CookieWriter
@@ -68,14 +69,22 @@ abstract class ApiTestCaseWriter : TestCaseWriter() {
         when (bodyString?.trim()?.first()) {
             //TODO this should be handled recursively, and not ad-hoc here...
             '[' -> {
+                try{
                 // This would be run if the JSON contains an array of objects.
                 val list = Gson().fromJson(bodyString, List::class.java)
                 handleAssertionsOnList(list, lines, "", bodyVarName)
+                } catch (e: JsonSyntaxException) {
+                    lines.add("/* Failed to parse JSON response */")
+                }
             }
             '{' -> {
                 // JSON contains an object
-                val resContents = Gson().fromJson(bodyString, Map::class.java)
-                handleAssertionsOnObject(resContents as Map<String, *>, lines, "", bodyVarName)
+                try {
+                    val resContents = Gson().fromJson(bodyString, Map::class.java)
+                    handleAssertionsOnObject(resContents as Map<String, *>, lines, "", bodyVarName)
+                } catch (e: JsonSyntaxException) {
+                    lines.add("/* Failed to parse JSON response */")
+                }
             }
             '"' -> {
                 lines.add(bodyIsString(bodyString, GeneUtils.EscapeMode.BODY, bodyVarName))

core/src/test/kotlin/org/evomaster/core/EMConfigTest.kt

@@ -138,31 +138,32 @@ internal class EMConfigTest{
     }
 
 
-    @ParameterizedTest
-    @ValueSource(strings = ["bbSwaggerUrl", "bbTargetUrl"])
-    fun testUrl(name: String){
+    @Test
+    fun testUrl(){
+
+        val name = "bbSwaggerUrl"
 
         val parser = EMConfig.getOptionParser()
         val opt = parser.recognizedOptions()[name] ?:
             throw Exception("Cannot find option")
         val config = EMConfig()
 
         val ok = "http://localhost:8080"
-        var options = parser.parse("--$name", ok)
+        var options = parser.parse("--$name", ok, "--blackBox","true","--outputFormat","JAVA_JUNIT_4")
         assertEquals(ok, opt.value(options))
         config.updateProperties(options) // no exception
 
         val noPort = "http://localhost"
-        options = parser.parse("--$name", noPort)
+        options = parser.parse("--$name", noPort, "--blackBox","true","--outputFormat","JAVA_JUNIT_4")
         assertEquals(noPort, opt.value(options))
         config.updateProperties(options) // no exception
 
         val wrong = "foobar"
-        options = parser.parse("--$name", wrong)
+        options = parser.parse("--$name", wrong, "--blackBox","true","--outputFormat","JAVA_JUNIT_4")
         assertThrows(Exception::class.java, {config.updateProperties(options)})
 
         val noProtocol = "localhost:8080"
-        options = parser.parse("--$name", noProtocol)
+        options = parser.parse("--$name", noProtocol, "--blackBox","true","--outputFormat","JAVA_JUNIT_4")
         assertThrows(Exception::class.java, {config.updateProperties(options)})
     }