From 62b5b1a77ca147b500e7bb6dd10e1915dd371f40 Mon Sep 17 00:00:00 2001 From: Rob Winch <362503+rwinch@users.noreply.github.com> Date: Thu, 21 Aug 2025 10:39:12 -0500 Subject: [PATCH] import Assertions.assertThat This adds a static import for assertThat in the Kotlin docs code --- .../docs/servlet/test/testmethod/HelloServiceTests.kt | 4 ++-- .../testmethodmetaannotations/WithMockAdminTests.kt | 4 ++-- .../testmethodmetaannotations/WithMockUserTests.kt | 4 ++-- .../test/testmethodsetup/WithMockUserSampleTests.kt | 4 ++-- .../test/testmethodwithmockuser/WithMockUserTests.kt | 10 +++++----- .../WithCustomUserDetailsTests.kt | 6 +++--- .../testmethodwithuserdetails/WithUserDetailsTests.kt | 6 +++--- 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt index b25cdfc647..eac21fce37 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethod -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.BeforeEach import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith @@ -50,7 +50,7 @@ class HelloServiceTests { @Test fun helloServiceTest() { - Assertions.assertThat(messageService.message) + assertThat(messageService.message) .contains("user") .contains("ROLE_USER") } diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt index d03b01844f..fef018fa42 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -39,7 +39,7 @@ class WithMockAdminTests { @WithMockAdmin fun getMessageWithMockUserAdminRoles() { val message = messageService.message - Assertions.assertThat(message) + assertThat(message) .contains("rob") .contains("ROLE_ADMIN") .contains("ROLE_USER") diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt index 524d5be19d..f97938ccbb 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -42,7 +42,7 @@ class WithMockUserTests { // end::snippet[] fun getMessageWithMockUserAdminRoles() { val message = messageService.message - Assertions.assertThat(message) + assertThat(message) .contains("admin") .contains("ROLE_ADMIN") .contains("ROLE_USER") diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt index efec4f5eae..454c7188ff 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodsetup -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThatExceptionOfType import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -39,7 +39,7 @@ class WithMockUserSampleTests { // tag::snippet[] @Test fun getMessageUnauthenticated() { - Assertions.assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java) + assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java) .isThrownBy { messageService.getMessage() } } // end::snippet[] diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt index ee595cafc9..c043951e19 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodwithmockuser -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -41,7 +41,7 @@ class WithMockUserTests { @WithMockUser fun getMessageWithMockUser() { val message = messageService.message - Assertions.assertThat(message).contains("user") + assertThat(message).contains("user") } // end::mock-user[] @@ -50,7 +50,7 @@ class WithMockUserTests { @WithMockUser("customUser") fun getMessageWithMockUserCustomUsername() { val message = messageService.message - Assertions.assertThat(message).contains("customUser") + assertThat(message).contains("customUser") } // end::custom-user[] @@ -59,7 +59,7 @@ class WithMockUserTests { @WithMockUser(username = "admin", roles = ["USER", "ADMIN"]) fun getMessageWithMockUserCustomRoles() { val message = messageService.message - Assertions.assertThat(message) + assertThat(message) .contains("admin") .contains("ROLE_ADMIN") .contains("ROLE_USER") @@ -71,7 +71,7 @@ class WithMockUserTests { @WithMockUser(username = "admin", authorities = ["ADMIN", "USER"]) fun getMessageWithMockUserCustomAuthorities() { val message = messageService.message - Assertions.assertThat(message) + assertThat(message) .contains("admin") .contains("ADMIN") .contains("USER") diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt index 0f0add9487..31409fb843 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -46,9 +46,9 @@ class WithCustomUserDetailsTests { @WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService") fun getMessageWithUserDetailsServiceBeanName() { val message: String = messageService.getMessage() - Assertions.assertThat(message).contains("customUsername"); + assertThat(message).contains("customUsername"); val principal = SecurityContextHolder.getContext().authentication.principal - Assertions.assertThat(principal).isInstanceOf(CustomUserDetails::class.java) + assertThat(principal).isInstanceOf(CustomUserDetails::class.java) } // end::custom-user-details-service[] diff --git a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt index e08c2f395c..0c77028880 100644 --- a/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt +++ b/docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt @@ -16,7 +16,7 @@ package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails -import org.assertj.core.api.Assertions +import org.assertj.core.api.Assertions.assertThat import org.junit.jupiter.api.Test import org.junit.jupiter.api.extension.ExtendWith import org.springframework.beans.factory.annotation.Autowired @@ -44,7 +44,7 @@ class WithUserDetailsTests { @WithUserDetails fun getMessageWithUserDetails() { val message: String = messageService.message - Assertions.assertThat(message).contains("user") + assertThat(message).contains("user") } // end::user-details[] @@ -53,7 +53,7 @@ class WithUserDetailsTests { @WithUserDetails("customUsername") fun getMessageWithUserDetailsCustomUsername() { val message: String = messageService.message - Assertions.assertThat(message).contains("customUsername") + assertThat(message).contains("customUsername") } // end::user-details-custom-username[]