ソースを参照

@Test to JUnit 5 for kotlin

rg -g "*.kt" "import org.junit.Test" -l | xargs sed -i 's/import org.junit.Test/import org.junit.jupiter.api.Test/'
Rob Winch 4 年 前
コミット
2bd55f0f62
66 ファイル変更66 行追加66 行削除
  1. 1 1
      config/src/test/kotlin/org/springframework/security/config/annotation/method/configuration/KotlinEnableReactiveMethodSecurityTests.kt
  2. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt
  3. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerAnonymousDslTests.kt
  4. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerCacheControlDslTests.kt
  5. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerContentSecurityPolicyDslTests.kt
  6. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerContentTypeOptionsDslTests.kt
  7. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerCorsDslTests.kt
  8. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerCsrfDslTests.kt
  9. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt
  10. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt
  11. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerFrameOptionsDslTests.kt
  12. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerHeadersDslTests.kt
  13. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt
  14. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpSecurityDslTests.kt
  15. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpStrictTransportSecurityDslTests.kt
  16. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpsRedirectDslTests.kt
  17. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt
  18. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerLogoutDslTests.kt
  19. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ClientDslTests.kt
  20. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2LoginDslTests.kt
  21. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ResourceServerDslTests.kt
  22. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt
  23. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerPasswordManagementDslTests.kt
  24. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerPermissionsPolicyDslTests.kt
  25. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerReferrerPolicyDslTests.kt
  26. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt
  27. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt
  28. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/server/ServerXssProtectionDslTests.kt
  29. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/AnonymousDslTests.kt
  30. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDslTests.kt
  31. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/CorsDslTests.kt
  32. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/CsrfDslTests.kt
  33. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDslTests.kt
  34. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/FormLoginDslTests.kt
  35. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/HeadersDslTests.kt
  36. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpBasicDslTests.kt
  37. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDslTests.kt
  38. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/LogoutDslTests.kt
  39. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDslTests.kt
  40. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDslTests.kt
  41. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDslTests.kt
  42. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDslTests.kt
  43. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/PortMapperDslTests.kt
  44. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/RememberMeDslTests.kt
  45. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/RequestCacheDslTests.kt
  46. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDslTests.kt
  47. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/Saml2DslTests.kt
  48. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/SessionManagementDslTests.kt
  49. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/X509DslTests.kt
  50. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDslTests.kt
  51. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDslTests.kt
  52. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDslTests.kt
  53. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDslTests.kt
  54. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDslTests.kt
  55. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDslTests.kt
  56. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDslTests.kt
  57. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDslTests.kt
  58. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDslTests.kt
  59. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDslTests.kt
  60. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDslTests.kt
  61. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDslTests.kt
  62. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDslTests.kt
  63. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDslTests.kt
  64. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt
  65. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDslTests.kt
  66. 1 1
      config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDslTests.kt

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/annotation/method/configuration/KotlinEnableReactiveMethodSecurityTests.kt

@@ -26,7 +26,7 @@ import kotlinx.coroutines.runBlocking
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.assertj.core.api.Assertions.assertThatExceptionOfType
 import org.junit.After
 import org.junit.After
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.runner.RunWith
 import org.junit.runner.RunWith
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/AuthorizeExchangeDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerAnonymousDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerCacheControlDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerContentSecurityPolicyDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerContentTypeOptionsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerCorsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerCsrfDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerExceptionHandlingDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerFormLoginDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerFrameOptionsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerHeadersDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpBasicDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import java.util.Base64
 import java.util.Base64
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpSecurityDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpStrictTransportSecurityDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server.headers
 package org.springframework.security.config.web.server.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerHttpsRedirectDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerJwtDslTests.kt

@@ -27,7 +27,7 @@ import javax.annotation.PreDestroy
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.MockWebServer
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerLogoutDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ClientDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2LoginDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOAuth2ResourceServerDslTests.kt

@@ -23,7 +23,7 @@ import java.math.BigInteger
 import java.security.KeyFactory
 import java.security.KeyFactory
 import java.security.interfaces.RSAPublicKey
 import java.security.interfaces.RSAPublicKey
 import java.security.spec.RSAPublicKeySpec
 import java.security.spec.RSAPublicKeySpec
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerOpaqueTokenDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockResponse
 import okhttp3.mockwebserver.MockWebServer
 import okhttp3.mockwebserver.MockWebServer
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerPasswordManagementDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
 import org.apache.http.HttpHeaders
 import org.apache.http.HttpHeaders
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerPermissionsPolicyDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerReferrerPolicyDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerRequestCacheDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.server
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerX509DslTests.kt

@@ -21,7 +21,7 @@ import io.mockk.mockk
 import java.security.cert.Certificate
 import java.security.cert.Certificate
 import java.security.cert.CertificateFactory
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.security.cert.X509Certificate
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/server/ServerXssProtectionDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.server
 package org.springframework.security.config.web.server
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.ApplicationContext
 import org.springframework.context.ApplicationContext
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/AnonymousDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.authentication.AnonymousAuthenticationToken
 import org.springframework.security.authentication.AnonymousAuthenticationToken
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/AuthorizeRequestsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/CorsDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
 import org.assertj.core.api.Assertions.assertThatThrownBy
 import org.assertj.core.api.Assertions.assertThatThrownBy
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/CsrfDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.servlet
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/ExceptionHandlingDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.access.AccessDeniedException
 import org.springframework.security.access.AccessDeniedException
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/FormLoginDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder
 import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/HeadersDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpHeaders
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpBasicDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletRequest
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/HttpSecurityDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/LogoutDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.mock.web.MockHttpSession
 import org.springframework.mock.web.MockHttpSession
 import org.springframework.security.authentication.TestingAuthenticationToken
 import org.springframework.security.authentication.TestingAuthenticationToken

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ClientDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.servlet
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2LoginDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/OAuth2ResourceServerDslTests.kt

@@ -22,7 +22,7 @@ import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletRequest
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/PasswordManagementDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/PortMapperDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/RememberMeDslTests.kt

@@ -25,7 +25,7 @@ import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletRequest
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.junit.jupiter.api.fail
 import org.junit.jupiter.api.fail
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/RequestCacheDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet
 package org.springframework.security.config.web.servlet
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/RequiresChannelDslTests.kt

@@ -18,7 +18,7 @@ package org.springframework.security.config.web.servlet
 
 
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.access.ConfigAttribute
 import org.springframework.security.access.ConfigAttribute
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/Saml2DslTests.kt

@@ -21,7 +21,7 @@ import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.BeanCreationException
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/SessionManagementDslTests.kt

@@ -22,7 +22,7 @@ import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.mock.web.MockHttpSession
 import org.springframework.mock.web.MockHttpSession

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/X509DslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.mockk
 import java.security.cert.Certificate
 import java.security.cert.Certificate
 import java.security.cert.CertificateFactory
 import java.security.cert.CertificateFactory
 import java.security.cert.X509Certificate
 import java.security.cert.X509Certificate
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.core.io.ClassPathResource
 import org.springframework.core.io.ClassPathResource

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/CacheControlDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpHeaders
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentSecurityPolicyDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ContentTypeOptionsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/FrameOptionsDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpPublicKeyPinningDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/HttpStrictTransportSecurityDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
 import org.assertj.core.api.Assertions
 import org.assertj.core.api.Assertions
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/ReferrerPolicyDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/headers/XssProtectionConfigDslTests.kt

@@ -16,7 +16,7 @@
 
 
 package org.springframework.security.config.web.servlet.headers
 package org.springframework.security.config.web.servlet.headers
 
 
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.builders.HttpSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/client/AuthorizationCodeGrantDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/AuthorizationEndpointDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
 import javax.servlet.http.HttpServletRequest
 import javax.servlet.http.HttpServletRequest
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/RedirectionEndpointDslTests.kt

@@ -18,7 +18,7 @@ package org.springframework.security.config.web.servlet.oauth2.login
 
 
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/TokenEndpointDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.servlet.oauth2.login
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/login/UserInfoEndpointDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/JwtDslTests.kt

@@ -20,7 +20,7 @@ import io.mockk.every
 import io.mockk.mockk
 import io.mockk.mockk
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.core.convert.converter.Converter
 import org.springframework.core.convert.converter.Converter

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/oauth2/resourceserver/OpaqueTokenDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.servlet.oauth2.resourceserver
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import io.mockk.verify
 import io.mockk.verify
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpHeaders

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionConcurrencyDslTests.kt

@@ -19,7 +19,7 @@ package org.springframework.security.config.web.servlet.session
 import io.mockk.every
 import io.mockk.every
 import io.mockk.mockkObject
 import io.mockk.mockkObject
 import java.util.Date
 import java.util.Date
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration

+ 1 - 1
config/src/test/kotlin/org/springframework/security/config/web/servlet/session/SessionFixationDslTests.kt

@@ -17,7 +17,7 @@
 package org.springframework.security.config.web.servlet.session
 package org.springframework.security.config.web.servlet.session
 
 
 import org.assertj.core.api.Assertions.assertThat
 import org.assertj.core.api.Assertions.assertThat
-import org.junit.Test
+import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Bean
 import org.springframework.context.annotation.Configuration
 import org.springframework.context.annotation.Configuration