upgrade open-api generator, fix mockmvc itests

holunda-io · Oct 11, 2023 · 8e02810 · 8e02810
1 parent 9ce7e38
commit 8e02810
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 23 deletions.
diff --git a/...nd/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt b/...nd/src/main/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResource.kt
@@ -147,7 +147,8 @@ class TaskResource(
     return ResponseEntity.noContent().build()
   }
 
-  private fun getAuthorizedTask(taskId: String, user: User): Task = taskServiceGateway.getTask(taskId)
+  private fun getAuthorizedTask(taskId: String, user: User): Task = taskServiceGateway
+    .getTask(taskId)
     .apply {
       if (!isAuthorized(this, user)) {
         // if the user is not allowed to access, behave if the task is not found

diff --git a/.../src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt b/.../src/test/kotlin/io/holunda/polyflow/example/tasklist/adapter/rest/impl/TaskResourceIT.kt
@@ -2,25 +2,23 @@ package io.holunda.polyflow.example.tasklist.adapter.rest.impl
 
 import com.fasterxml.jackson.databind.ObjectMapper
 import io.holunda.camunda.taskpool.api.task.*
+import io.holunda.polyflow.example.tasklist.adapter.rest.Rest.REQUEST_PATH
 import io.holunda.polyflow.example.tasklist.itest.ITestApplication
 import io.holunda.polyflow.example.tasklist.itest.ITestApplication.Companion.ITEST
-import io.holunda.polyflow.example.tasklist.adapter.rest.Rest.REQUEST_PATH
 import io.holunda.polyflow.view.Task
-import org.junit.jupiter.api.BeforeEach
 import org.junit.jupiter.api.Test
 import org.mockito.kotlin.any
 import org.mockito.kotlin.verify
 import org.mockito.kotlin.whenever
 import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
 import org.springframework.boot.test.context.SpringBootTest
 import org.springframework.boot.test.mock.mockito.MockBean
 import org.springframework.http.MediaType
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.request.MockMvcRequestBuilders.post
 import org.springframework.test.web.servlet.result.MockMvcResultMatchers.status
-import org.springframework.test.web.servlet.setup.MockMvcBuilders
-import org.springframework.web.context.WebApplicationContext
 import java.time.Instant
 import java.time.OffsetDateTime
 import java.time.ZoneOffset.UTC
@@ -29,27 +27,18 @@ import java.util.*
 
 @SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT, classes = [ITestApplication::class])
 @ActiveProfiles(ITEST)
+@AutoConfigureMockMvc
 internal class TaskResourceIT {
 
+  @Autowired
   private lateinit var mockMvc: MockMvc
 
   @MockBean
   private lateinit var taskServiceGateway: TaskServiceGateway
 
-  @Autowired
-  private lateinit var webApplicationContext: WebApplicationContext
-
-  @Autowired
-  private lateinit var resource: TaskResource
-
   @Autowired
   private lateinit var objectMapper: ObjectMapper
 
-  @BeforeEach
-  fun setup() {
-    this.mockMvc = MockMvcBuilders.webAppContextSetup(webApplicationContext).build()
-  }
-
   @Test
   fun `should not allow to claim without the user header`() {
     val taskId = UUID.randomUUID().toString()
@@ -59,7 +48,7 @@ internal class TaskResourceIT {
     this.mockMvc
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/claim", taskId)
-          .servletPath(REQUEST_PATH)
+          .contentType(MediaType.APPLICATION_JSON)
       )
       .andExpect(status().isBadRequest)
   }
@@ -73,8 +62,8 @@ internal class TaskResourceIT {
     this.mockMvc
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/claim", taskId)
+          .contentType(MediaType.APPLICATION_JSON)
           .header("X-Current-User-ID", "id1")
-          .servletPath(REQUEST_PATH)
       )
       .andExpect(status().isNotFound)
   }
@@ -91,8 +80,8 @@ internal class TaskResourceIT {
     this.mockMvc
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/claim", taskId)
+          .contentType(MediaType.APPLICATION_JSON)
           .header("X-Current-User-ID", "id1")
-          .servletPath(REQUEST_PATH)
       )
       .andExpect(status().isNoContent)
 
@@ -110,8 +99,8 @@ internal class TaskResourceIT {
     this.mockMvc
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/unclaim", taskId)
+          .contentType(MediaType.APPLICATION_JSON)
           .header("X-Current-User-ID", "id1")
-          .servletPath(REQUEST_PATH)
       )
       .andExpect(status().isNoContent)
 
@@ -132,7 +121,6 @@ internal class TaskResourceIT {
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/defer", taskId)
           .header("X-Current-User-ID", "id1")
-          .servletPath(REQUEST_PATH)
           .contentType(MediaType.APPLICATION_JSON)
           .content(json)
       )
@@ -152,8 +140,8 @@ internal class TaskResourceIT {
     this.mockMvc
       .perform(
         post("${REQUEST_PATH}/task/{taskId}/undefer", taskId)
+          .contentType(MediaType.APPLICATION_JSON)
           .header("X-Current-User-ID", "id1")
-          .servletPath(REQUEST_PATH)
       )
       .andExpect(status().isNoContent)
 

diff --git a/components/tasklist-backend/src/test/resources/application-itest.yml b/components/tasklist-backend/src/test/resources/application-itest.yml
@@ -2,3 +2,4 @@ logging:
   level:
     root: INFO
     org.springframework.test.util.ReflectionTestUtils: INFO
+    # org.springframework.web: TRACE
diff --git a/pom.xml b/pom.xml
@@ -249,7 +249,7 @@
           <!-- Open API generator -->
           <groupId>org.openapitools</groupId>
           <artifactId>openapi-generator-maven-plugin</artifactId>
-          <version>6.5.0</version>
+          <version>7.0.1</version>
         </plugin>
 
         <plugin>