increase timeout

jhipster · Aug 2, 2024 · 9d0f586 · 9d0f586
1 parent 1450b3d
commit 9d0f586
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 9 deletions.
diff --git a/generators/spring-boot/templates/src/test/kotlin/package/IntegrationTest.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/package/IntegrationTest.kt.ejs
@@ -94,13 +94,8 @@ annotation class IntegrationTest {
      <%_ if (reactive) { _%>
       companion object {
         // 5s is the spring default https://github.com/spring-projects/spring-framework/blob/29185a3d28fa5e9c1b4821ffe519ef6f56b51962/spring-test/src/main/java/org/springframework/test/web/reactive/server/DefaultWebTestClient.java#L106
-        <%_ if (databaseTypeMongodb && reactive) { _%>
-          const val DEFAULT_TIMEOUT: String = "PT10S"
-          const val DEFAULT_ENTITY_TIMEOUT: String = "PT10S"
-        <%_ } else { _%>
           const val DEFAULT_TIMEOUT: String = "PT5S"
           const val DEFAULT_ENTITY_TIMEOUT: String = "PT5S"
-        <%_ } _%>
       }
      <%_ } _%>
 }
diff --git a/generators/spring-boot/templates/src/test/kotlin/package/web/rest/EntityResourceIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/package/web/rest/EntityResourceIT.kt.ejs
@@ -62,6 +62,9 @@ _%>
 import <%= packageName %>.web.rest.*
 <% } %>
 import <%= packageName %>.IntegrationTest
+<%_ if (reactive) { _%>
+import <%= packageName %>.IntegrationTest.Companion.DEFAULT_TIMEOUT
+<%_ } _%>
 import <%= entityAbsolutePackage %>.domain.<%= persistClass %>
 <%_
     var imported = [];
@@ -236,7 +239,7 @@ import <%= packageName %>.domain.enumeration.<%= field.fieldType %>
 )
 <%_ } _%>
 <%_ if (reactive) { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>

diff --git a/...rators/spring-boot/templates/src/test/kotlin/package/web/rest/PublicUserResourceIT.kt.ejs b/...rators/spring-boot/templates/src/test/kotlin/package/web/rest/PublicUserResourceIT.kt.ejs
@@ -19,6 +19,9 @@ This file is part of the JHipster project, see https://jhipster.github.io/
 package <%= packageName %>.web.rest
 
 import <%= packageName %>.IntegrationTest
+<%_ if (reactive) { _%>
+import <%= packageName %>.IntegrationTest.Companion.DEFAULT_TIMEOUT
+<%_ } _%>
 import <%= packageName %>.security.ADMIN
 import <%= packageName %>.security.USER
 <%_ if (authenticationTypeOauth2) { _%>
@@ -97,7 +100,7 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers.*
  * Integration tests for the {@link UserResource} REST controller.
  */
 <%_ if (reactive) { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>

diff --git a/generators/spring-boot/templates/src/test/kotlin/package/web/rest/UserJWTControllerIT.kt.ejs b/generators/spring-boot/templates/src/test/kotlin/package/web/rest/UserJWTControllerIT.kt.ejs
@@ -63,7 +63,7 @@ import org.hamcrest.Matchers.*
  * Integration tests for the [UserJWTController] REST controller.
  */
  <%_ if (reactive) { _%>
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 <%_ } else { _%>
 @AutoConfigureMockMvc
 <%_ } _%>

diff --git a/...t/templates/src/test/kotlin/package/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs b/...t/templates/src/test/kotlin/package/web/rest/errors/ExceptionTranslatorIT_reactive.kt.ejs
@@ -19,6 +19,9 @@
 package <%= packageName %>.web.rest.errors
 
 import <%= packageName %>.IntegrationTest
+<%_ if (reactive) { _%>
+import <%= packageName %>.IntegrationTest.Companion.DEFAULT_TIMEOUT
+<%_ } _%>
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.context.SpringBootTest
@@ -39,7 +42,7 @@ import org.springframework.security.test.web.reactive.server.SecurityMockServerC
  * Integration tests [ExceptionTranslator] controller advice.
  */
 @WithMockUser
-@AutoConfigureWebTestClient
+@AutoConfigureWebTestClient(timeout = IntegrationTest.DEFAULT_TIMEOUT)
 @IntegrationTest
 class ExceptionTranslatorIT {