Merge branch 'master' into vulnerability-analyser

Author: seran

client-java/test-utils-java/src/main/java/org/evomaster/test/utils/EMTestUtils.java

@@ -42,15 +42,27 @@ public static String resolveLocation(String locationHeader, String expectedTempl
         } catch (Exception e){
             return locationHeader;
         }
+
+        /*
+            Default behavior of split() is "peculiar", to say the least...
+            /a
+            would be "/" split into ["",a]
+            the same as
+            /a/
+            !!!!!!!!
+            to get trailing "", need to put a negative limit...
+         */
+        int wtfJava = -1;
+
         String locationPath = locationURI.getPath();
-        String[] locationTokens = locationPath.split("/");
+        String[] locationTokens = locationPath.split("/",wtfJava);
 
 
         //the template is not a valid URL, due to {}
         String normalizedTemplate = expectedTemplate.replace("{","").replace("}","");
         URI templateURI = URI.create(normalizedTemplate);
         String templatePath = templateURI.getPath();
-        String[] templateTokens = templatePath.split("/");
+        String[] templateTokens = templatePath.split("/",wtfJava);
 
 
         String targetPath = locationPath;

client-java/test-utils-java/src/test/java/org/evomaster/test/utils/EMTestUtilsTest.java

@@ -8,6 +8,17 @@
 
 public class EMTestUtilsTest {
 
+    @Test
+    public void testEmptyPath(){
+
+        String template = "http://localhost:12345/a/42";
+        String location = "/a/";
+
+        String res = EMTestUtils.resolveLocation(location, template);
+        assertEquals("http://localhost:12345/a/", res);
+    }
+
+
     @Test
     public void testResolveLocation_direct() {
 

core-it/src/main/kotlin/bar/examples/it/spring/cleanupcreate/CleanUpDeleteApplication.kt

@@ -18,7 +18,7 @@ open class CleanUpDeleteApplication {
             SpringApplication.run(CleanUpDeleteApplication::class.java, *args)
         }
 
-        private val data = mutableMapOf<Int, String>()
+        private val data = mutableMapOf<String, String>()
 
         fun reset(){
             data.clear()
@@ -30,15 +30,15 @@ open class CleanUpDeleteApplication {
 
     @PutMapping(path = ["/{id}"])
     open fun put(
-        @PathVariable("id") id: Int
+        @PathVariable("id") id: String
     ): ResponseEntity<Any> {
 
         data[id] = "Data for $id"
         return ResponseEntity.status(200).build()
     }
 
     @DeleteMapping(path = ["/{id}"])
-    open fun delete(@PathVariable("id") id: Int): ResponseEntity<String> {
+    open fun delete(@PathVariable("id") id: String): ResponseEntity<String> {
 
         if(!data.containsKey(id)){
             return ResponseEntity.status(404).build()

core-it/src/test/kotlin/org/evomaster/core/problem/rest/cleanupdelete/CleanUpDeleteTest.kt

@@ -12,6 +12,7 @@ import org.evomaster.core.problem.rest.data.RestCallResult
 import org.junit.jupiter.api.Assertions.*
 import org.junit.jupiter.api.BeforeAll
 import org.junit.jupiter.api.BeforeEach
+import org.junit.jupiter.api.Disabled
 import org.junit.jupiter.api.Test
 
 class CleanUpDeleteTest: IntegrationTestRestBase() {
@@ -53,4 +54,33 @@ class CleanUpDeleteTest: IntegrationTestRestBase() {
         assertEquals(0, CleanUpDeleteApplication.numberExistingData())
 
     }
+
+    @Disabled("Tricky. In the end, we made not possible to send empty path elements. " +
+            "See discussion in action builder.")
+    @Test
+    fun testEmpty(){
+
+        assertEquals(0, CleanUpDeleteApplication.numberExistingData())
+
+        val pirTest = getPirToRest()
+
+        val fail = pirTest.fromVerbPath("put", "/api/resources")
+        assertNull(fail)
+
+        val put = pirTest.fromVerbPath("put", "/api/resources/")!!
+        val delete = pirTest.fromVerbPath("delete", "/api/resources/")!!  //explicit delete
+        val x = createIndividual(listOf(put,delete), SampleType.RANDOM)
+        val resPut = x.evaluatedMainActions()[0].result as RestCallResult
+        val resDel = x.evaluatedMainActions()[1].result as RestCallResult
+        assertEquals(200, resPut.getStatusCode())
+        assertEquals(204, resDel.getStatusCode())
+
+        assertEquals(0, CleanUpDeleteApplication.numberExistingData())
+
+        val y = createIndividual(listOf(put), SampleType.RANDOM)
+        val resPutY = y.evaluatedMainActions()[0].result as RestCallResult
+        assertEquals(200, resPutY.getStatusCode())
+
+        assertEquals(0, CleanUpDeleteApplication.numberExistingData())
+    }
 }

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

@@ -455,12 +455,13 @@ class RestTestCaseWriter : HttpWsTestCaseWriter {
                     "\"${call.path.resolveOnlyPath(call.parameters)}\""
                 }
 
-                //TODO JS
                 //TODO code here should use same algorithm as in res.getResourceId()
                 //TODO this is quite limited, would need proper refactoring
                 val extract = when {
                     format.isPython() -> "str($resVarName.json()['${res.getResourceIdName()}'])"
-                    else -> "$resVarName.extract().body().path$extraTypeInfo(\"${res.getResourceIdName()}\").toString()"
+                    format.isJavaScript() -> "$resVarName.body.${res.getResourceIdName()}"
+                    format.isJavaOrKotlin() -> "$resVarName.extract().body().path$extraTypeInfo(\"${res.getResourceIdName()}\").toString()"
+                    else -> throw IllegalStateException("Unhandled format: $format")
                 }
 
                 lines.add("${locationVar(call.creationLocationId())} = $baseUri + \"/\" + $extract")

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

@@ -129,6 +129,7 @@ abstract class TestCaseWriter {
             //  handleFieldDeclarations.
             handleTestInitialization(lines, baseUrlOfSut, ind, insertionVars, test.name)
             handleActionCalls(lines, baseUrlOfSut, ind, insertionVars, testCaseName = test.name, testSuitePath)
+            handleCleanUpActions(lines, baseUrlOfSut, ind, insertionVars, test.name,testSuitePath)
         }
 
 

core/src/main/kotlin/org/evomaster/core/problem/rest/builder/RestActionBuilderV3.kt

@@ -1640,7 +1640,7 @@ object RestActionBuilderV3 {
     }
 
     /**
-     * Buils a StringGene that represents a char value.
+     * Build a StringGene that represents a char value.
      * Char values are modelled as string of fixed size 1.
      */
     private fun buildStringGeneForChar(
@@ -1663,7 +1663,14 @@ object RestActionBuilderV3 {
         isInPath: Boolean
     ): StringGene {
 
+        /*
+            This is bit tricky, as would prevent empty inputs, which are not necessarily invalid.
+            In OpenAPI, path variables are always require.
+            Sending an empty  /users/ for a /users/{id} might or might not work, and could lead to a 405...
+            maybe we skip it, and treat it for a robustness testing
+         */
         val defaultMin = if(isInPath) 1 else 0
+        //val defaultMin = 0
 
         return StringGene(
             name,

core/src/main/kotlin/org/evomaster/core/problem/rest/data/RestPath.kt

@@ -462,7 +462,7 @@ class RestPath(path: String) {
     }
 
     fun getElements(): List<Map<String, Boolean>> {
-        return elements.map { it.tokens.map { t -> Pair(t.name, t.isParameter) }.toMap() }
+        return elements.map { it.tokens.associate { t -> Pair(t.name, t.isParameter) } }
     }
 
     /**
@@ -477,9 +477,7 @@ class RestPath(path: String) {
      * /foo/bar/{id}
      */
     fun matches(resolvedPath: String): Boolean {
-        if (resolvedPath.matches(Regex(getRegexToMatch())))
-            return true
-        return false
+        return resolvedPath.matches(Regex(getRegexToMatch()))
     }
 
     /**

core/src/main/kotlin/org/evomaster/core/problem/rest/service/fitness/BlackBoxRestFitness.kt

@@ -129,8 +129,6 @@ class BlackBoxRestFitness : RestFitness() {
             }
             individual.addCleanUpAction(delete)
 
-            //FIXME chainState seems broken as based on static path, so can have only one. Need refactoring
-
             //make sure location is saved in the chain
             handleSaveLocation(create.action,create.result as RestCallResult,chainState)
         }
@@ -141,6 +139,8 @@ class BlackBoxRestFitness : RestFitness() {
 
         for(delete in cleanup){
             handleRestCall(delete as RestCallAction, all, actionResults, chainState, cookies, tokens, fv)
+            val res = actionResults.first { it.sourceLocalId == delete.getLocalId() } as RestCallResult
+            assert(StatusGroup.G_2xx.isInGroup(res.getStatusCode())){"Wrong status: ${res.getStatusCode()}"}
         }
     }
 

core/src/test/kotlin/org/evomaster/core/problem/rest/RestPathTest.kt

@@ -302,6 +302,18 @@ internal class RestPathTest{
         assertEquals("/x%20+%20y?a=k+%2B+w", uri)
     }
 
+    @Test
+    fun testMatchEmptyElement(){
+
+        assertFalse(RestPath("/x/").matches("/x"))
+        assertFalse(RestPath("/x").matches("/x/"))
+
+        assertTrue(RestPath("/x").matches("/x"))
+        assertTrue(RestPath("/x/").matches("/x/"))
+
+        assertTrue(RestPath("/x/{id}").matches("/x/"))
+    }
+
     @Test
     fun testMatchResolvedPath(){
         val path = RestPath("/x/{y}/z")