Skip to content

Commit 34543e8

Browse files
committed
import Assertions.assertThat
This adds a static import for assertThat in the Kotlin docs code
1 parent 8e374a4 commit 34543e8

File tree

7 files changed

+19
-12
lines changed

7 files changed

+19
-12
lines changed

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethod
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -37,7 +38,7 @@ class HelloMessageServiceTests {
3738

3839
@Test
3940
fun helloServiceTest() {
40-
Assertions.assertThat(messageService.getMessage())
41+
assertThat(messageService.getMessage())
4142
.contains("user")
4243
.contains("ROLE_USER")
4344
}

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -39,7 +40,7 @@ class WithMockAdminTests {
3940
@WithMockAdmin
4041
fun getMessageWithMockUserAdminRoles() {
4142
val message = messageService.getMessage()
42-
Assertions.assertThat(message)
43+
assertThat(message)
4344
.contains("rob")
4445
.contains("ROLE_ADMIN")
4546
.contains("ROLE_USER")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodmetaannotations
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -42,7 +43,7 @@ class WithMockUserTests {
4243
// end::snippet[]
4344
fun getMessageWithMockUserAdminRoles() {
4445
val message = messageService.getMessage()
45-
Assertions.assertThat(message)
46+
assertThat(message)
4647
.contains("admin")
4748
.contains("ROLE_ADMIN")
4849
.contains("ROLE_USER")

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodsetup
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThatExceptionOfType
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -39,7 +40,7 @@ class WithMockUserSampleTests {
3940
// tag::snippet[]
4041
@Test
4142
fun getMessageUnauthenticated() {
42-
Assertions.assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java)
43+
assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java)
4344
.isThrownBy { messageService.getMessage() }
4445
}
4546
// end::snippet[]

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithmockuser
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -41,7 +42,7 @@ class WithMockUserTests {
4142
@WithMockUser
4243
fun getMessageWithMockUser() {
4344
val message = messageService.getMessage()
44-
Assertions.assertThat(message).contains("user")
45+
assertThat(message).contains("user")
4546
}
4647
// end::mock-user[]
4748

@@ -50,7 +51,7 @@ class WithMockUserTests {
5051
@WithMockUser("customUser")
5152
fun getMessageWithMockUserCustomUsername() {
5253
val message = messageService.getMessage()
53-
Assertions.assertThat(message).contains("customUser")
54+
assertThat(message).contains("customUser")
5455
}
5556
// end::custom-user[]
5657

@@ -59,7 +60,7 @@ class WithMockUserTests {
5960
@WithMockUser(username = "admin", roles = ["USER", "ADMIN"])
6061
fun getMessageWithMockUserCustomRoles() {
6162
val message = messageService.getMessage()
62-
Assertions.assertThat(message)
63+
assertThat(message)
6364
.contains("admin")
6465
.contains("ROLE_ADMIN")
6566
.contains("ROLE_USER")
@@ -71,7 +72,7 @@ class WithMockUserTests {
7172
@WithMockUser(username = "admin", authorities = ["ADMIN", "USER"])
7273
fun getMessageWithMockUserCustomAuthorities() {
7374
val message = messageService.getMessage()
74-
Assertions.assertThat(message)
75+
assertThat(message)
7576
.contains("admin")
7677
.contains("ADMIN")
7778
.contains("USER")

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -46,9 +47,9 @@ class WithCustomUserDetailsTests {
4647
@WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService")
4748
fun getMessageWithUserDetailsServiceBeanName() {
4849
val message: String = messageService.getMessage()
49-
Assertions.assertThat(message).contains("customUsername");
50+
assertThat(message).contains("customUsername");
5051
val principal = SecurityContextHolder.getContext().authentication.principal
51-
Assertions.assertThat(principal).isInstanceOf(CustomUserDetails::class.java)
52+
assertThat(principal).isInstanceOf(CustomUserDetails::class.java)
5253
}
5354
// end::custom-user-details-service[]
5455

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package org.springframework.security.kt.docs.servlet.test.testmethodwithuserdetails
1818

1919
import org.assertj.core.api.Assertions
20+
import org.assertj.core.api.Assertions.assertThat
2021
import org.junit.jupiter.api.Test
2122
import org.junit.jupiter.api.extension.ExtendWith
2223
import org.springframework.beans.factory.annotation.Autowired
@@ -44,7 +45,7 @@ class WithUserDetailsTests {
4445
@WithUserDetails
4546
fun getMessageWithUserDetails() {
4647
val message: String = messageService.getMessage()
47-
Assertions.assertThat(message).contains("user")
48+
assertThat(message).contains("user")
4849
}
4950
// end::user-details[]
5051

@@ -53,7 +54,7 @@ class WithUserDetailsTests {
5354
@WithUserDetails("customUsername")
5455
fun getMessageWithUserDetailsCustomUsername() {
5556
val message: String = messageService.getMessage()
56-
Assertions.assertThat(message).contains("customUsername")
57+
assertThat(message).contains("customUsername")
5758
}
5859
// end::user-details-custom-username[]
5960

0 commit comments

Comments
 (0)