Skip to content

Commit 62b5b1a

Browse files
committed
import Assertions.assertThat
This adds a static import for assertThat in the Kotlin docs code
1 parent 523222c commit 62b5b1a

File tree

7 files changed

+19
-19
lines changed

7 files changed

+19
-19
lines changed

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethod
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.BeforeEach
2121
import org.junit.jupiter.api.Test
2222
import org.junit.jupiter.api.extension.ExtendWith
@@ -50,7 +50,7 @@ class HelloServiceTests {
5050

5151
@Test
5252
fun helloServiceTest() {
53-
Assertions.assertThat(messageService.message)
53+
assertThat(messageService.message)
5454
.contains("user")
5555
.contains("ROLE_USER")
5656
}

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -39,7 +39,7 @@ class WithMockAdminTests {
3939
@WithMockAdmin
4040
fun getMessageWithMockUserAdminRoles() {
4141
val message = messageService.message
42-
Assertions.assertThat(message)
42+
assertThat(message)
4343
.contains("rob")
4444
.contains("ROLE_ADMIN")
4545
.contains("ROLE_USER")

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -42,7 +42,7 @@ class WithMockUserTests {
4242
// end::snippet[]
4343
fun getMessageWithMockUserAdminRoles() {
4444
val message = messageService.message
45-
Assertions.assertThat(message)
45+
assertThat(message)
4646
.contains("admin")
4747
.contains("ROLE_ADMIN")
4848
.contains("ROLE_USER")

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodsetup
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThatExceptionOfType
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -39,7 +39,7 @@ class WithMockUserSampleTests {
3939
// tag::snippet[]
4040
@Test
4141
fun getMessageUnauthenticated() {
42-
Assertions.assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java)
42+
assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java)
4343
.isThrownBy { messageService.getMessage() }
4444
}
4545
// end::snippet[]

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithmockuser
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -41,7 +41,7 @@ class WithMockUserTests {
4141
@WithMockUser
4242
fun getMessageWithMockUser() {
4343
val message = messageService.message
44-
Assertions.assertThat(message).contains("user")
44+
assertThat(message).contains("user")
4545
}
4646
// end::mock-user[]
4747

@@ -50,7 +50,7 @@ class WithMockUserTests {
5050
@WithMockUser("customUser")
5151
fun getMessageWithMockUserCustomUsername() {
5252
val message = messageService.message
53-
Assertions.assertThat(message).contains("customUser")
53+
assertThat(message).contains("customUser")
5454
}
5555
// end::custom-user[]
5656

@@ -59,7 +59,7 @@ class WithMockUserTests {
5959
@WithMockUser(username = "admin", roles = ["USER", "ADMIN"])
6060
fun getMessageWithMockUserCustomRoles() {
6161
val message = messageService.message
62-
Assertions.assertThat(message)
62+
assertThat(message)
6363
.contains("admin")
6464
.contains("ROLE_ADMIN")
6565
.contains("ROLE_USER")
@@ -71,7 +71,7 @@ class WithMockUserTests {
7171
@WithMockUser(username = "admin", authorities = ["ADMIN", "USER"])
7272
fun getMessageWithMockUserCustomAuthorities() {
7373
val message = messageService.message
74-
Assertions.assertThat(message)
74+
assertThat(message)
7575
.contains("admin")
7676
.contains("ADMIN")
7777
.contains("USER")

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -46,9 +46,9 @@ class WithCustomUserDetailsTests {
4646
@WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService")
4747
fun getMessageWithUserDetailsServiceBeanName() {
4848
val message: String = messageService.getMessage()
49-
Assertions.assertThat(message).contains("customUsername");
49+
assertThat(message).contains("customUsername");
5050
val principal = SecurityContextHolder.getContext().authentication.principal
51-
Assertions.assertThat(principal).isInstanceOf(CustomUserDetails::class.java)
51+
assertThat(principal).isInstanceOf(CustomUserDetails::class.java)
5252
}
5353
// end::custom-user-details-service[]
5454

docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails
1818

19-
import org.assertj.core.api.Assertions
19+
import org.assertj.core.api.Assertions.assertThat
2020
import org.junit.jupiter.api.Test
2121
import org.junit.jupiter.api.extension.ExtendWith
2222
import org.springframework.beans.factory.annotation.Autowired
@@ -44,7 +44,7 @@ class WithUserDetailsTests {
4444
@WithUserDetails
4545
fun getMessageWithUserDetails() {
4646
val message: String = messageService.message
47-
Assertions.assertThat(message).contains("user")
47+
assertThat(message).contains("user")
4848
}
4949
// end::user-details[]
5050

@@ -53,7 +53,7 @@ class WithUserDetailsTests {
5353
@WithUserDetails("customUsername")
5454
fun getMessageWithUserDetailsCustomUsername() {
5555
val message: String = messageService.message
56-
Assertions.assertThat(message).contains("customUsername")
56+
assertThat(message).contains("customUsername")
5757
}
5858
// end::user-details-custom-username[]
5959

0 commit comments

Comments
 (0)