Merge pull request #1511 from WebFuzzing/cleanup-merge

Cleanup tests and fixes

Author: arcuri82

.github/workflows/ci.yml

@@ -76,9 +76,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.build-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.build-jdk}}
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -99,9 +100,10 @@ jobs:
       - uses: actions/checkout@v4
       # Build/test for JDK
       - name: Setup JDK ${{env.build-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.build-jdk}}
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -147,9 +149,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.release-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.release-jdk}}
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -168,9 +171,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.release-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.release-jdk}}
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:
@@ -196,9 +200,10 @@ jobs:
 #    steps:
 #      - uses: actions/checkout@v4
 #      - name: Setup JDK ${{env.latest-jdk}}
-#        uses: actions/setup-java@v1
+#        uses: actions/setup-java@v5
 #        with:
 #          java-version: ${{env.latest-jdk}}
+#          distribution: 'temurin'
 #      - name: Cache Maven packages
 #        uses: actions/cache@v3
 #        with:
@@ -222,9 +227,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.release-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.release-jdk}}
+          distribution: 'temurin'
       - name: Download fat jar
         uses: actions/download-artifact@v4
         with:
@@ -247,9 +253,10 @@ jobs:
     steps:
       - uses: actions/checkout@v3
       - name: Setup JDK ${{env.release-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.release-jdk}}
+          distribution: 'temurin'
       - name: Download fat jar
         uses: actions/download-artifact@v4
         with:
@@ -272,9 +279,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.release-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.release-jdk}}
+          distribution: 'temurin'
       - name: Download fat jar
         uses: actions/download-artifact@v4
         with:
@@ -339,9 +347,10 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       - name: Setup JDK ${{env.build-jdk}}
-        uses: actions/setup-java@v1
+        uses: actions/setup-java@v5
         with:
           java-version: ${{env.build-jdk}}
+          distribution: 'temurin'
       - name: Cache Maven packages
         uses: actions/cache@v3
         with:

core-tests/integration-tests/core-it/src/main/kotlin/bar/examples/it/spring/cleanupuuid/CleanUpUUIDApplication.kt

@@ -0,0 +1,66 @@
+package bar.examples.it.spring.cleanupuuid
+
+import org.springframework.boot.SpringApplication
+import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.*
+import java.util.UUID
+
+
+@SpringBootApplication(exclude = [SecurityAutoConfiguration::class])
+@RequestMapping(path = ["/api/resources"])
+@RestController
+open class CleanUpUUIDApplication {
+
+    companion object {
+        @JvmStatic
+        fun main(args: Array<String>) {
+            SpringApplication.run(CleanUpUUIDApplication::class.java, *args)
+        }
+
+        private val data = mutableMapOf<UUID, String>()
+
+        fun reset(){
+            data.clear()
+        }
+
+        fun numberExistingData() = data.size
+    }
+
+
+    @PostMapping(path = [""])
+    open fun post(): ResponseEntity<CleanUpUUIDDto> {
+        val id = UUID.randomUUID()
+        data[id] = "Data for $id"
+        return ResponseEntity.status(201).body(CleanUpUUIDDto(id,data.size))
+    }
+
+
+    @PutMapping(path = ["/{id}"])
+    open fun put(
+        @PathVariable("id") id: UUID
+    ): ResponseEntity<CleanUpUUIDDto> {
+
+        val status = if(data.containsKey(id)){
+            200
+        } else {
+            201
+        }
+
+        data[id] = "Data for $id"
+        return ResponseEntity.status(status).body(CleanUpUUIDDto(id,data.size))
+    }
+
+    @DeleteMapping(path = ["/{id}"])
+    open fun delete(@PathVariable("id") id: UUID): ResponseEntity<String> {
+
+        if(!data.containsKey(id)){
+            return ResponseEntity.status(404).build()
+        }
+
+        data.remove(id)
+
+        return ResponseEntity.status(204).build()
+    }
+}

core-tests/integration-tests/core-it/src/main/kotlin/bar/examples/it/spring/cleanupuuid/CleanUpUUIDDto.kt

@@ -0,0 +1,10 @@
+package bar.examples.it.spring.cleanupuuid
+
+import java.util.UUID
+
+open class CleanUpUUIDDto(
+
+    var id : UUID? = null,
+
+    var size: Int? = null
+)

core-tests/integration-tests/core-it/src/test/kotlin/bar/examples/it/spring/cleanupuuid/CleanUpUUIDController.kt

@@ -0,0 +1,6 @@
+package bar.examples.it.spring.cleanupuuid
+
+import bar.examples.it.spring.SpringController
+import bar.examples.it.spring.cleanupcreate.CleanUpDeleteApplication
+
+class CleanUpUUIDController : SpringController(CleanUpUUIDApplication::class.java)

core-tests/integration-tests/core-it/src/test/kotlin/org/evomaster/core/problem/rest/IntegrationTestRestBase.kt

@@ -49,19 +49,21 @@ abstract class IntegrationTestRestBase : RestTestBase() {
         injector = init(args)
     }
 
-    fun getPirToRest() = injector.getInstance(PirToRest::class.java)
+    fun getPirToRest() = injector.getInstance(PirToRest::class.java)!!
 
     fun getArchive() = injector.getInstance(Archive::class.java) as Archive<RestIndividual>
 
     fun getSecurityRest() = injector.getInstance(RestSecurityBuilder::class.java) as RestSecurityBuilder
 
-    fun getEMConfig() = injector.getInstance(EMConfig::class.java)
+    fun getEMConfig() = injector.getInstance(EMConfig::class.java)!!
 
-    fun getBuilder() = injector.getInstance(RestIndividualBuilder::class.java)
+    fun getBuilder() = injector.getInstance(RestIndividualBuilder::class.java)!!
 
-    fun getSecurityOracle() = injector.getInstance(RestSecurityOracle::class.java)
+    fun getSecurityOracle() = injector.getInstance(RestSecurityOracle::class.java)!!
 
-    fun getExecutionPhaseController() = injector.getInstance(ExecutionPhaseController::class.java)
+    fun getExecutionPhaseController() = injector.getInstance(ExecutionPhaseController::class.java)!!
+
+    fun getFitnessFunction() = injector.getInstance(AbstractRestFitness::class.java)!!
 
     /**
      * Create and evaluate an individual
@@ -79,10 +81,10 @@ abstract class IntegrationTestRestBase : RestTestBase() {
          */
         val ind = sampler.createIndividual(sampleT, actions.toMutableList())
 
-        val ff = injector.getInstance(AbstractRestFitness::class.java)
+        val ff = getFitnessFunction()
         val ei = ff.calculateCoverage(ind)!!
 
         return ei
     }
 
-}
+}