Browse Source

import Assertions.assertThat

This adds a static import for assertThat in the Kotlin docs code
pull/17749/head
Rob Winch 4 months ago
parent
commit
62b5b1a77c
No known key found for this signature in database
  1. 4
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethod/HelloServiceTests.kt
  2. 4
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockAdminTests.kt
  3. 4
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodmetaannotations/WithMockUserTests.kt
  4. 4
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodsetup/WithMockUserSampleTests.kt
  5. 10
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithmockuser/WithMockUserTests.kt
  6. 6
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithCustomUserDetailsTests.kt
  7. 6
      docs/src/test/kotlin/org/springframework/security/kt/docs/servlet/test/testmethodwithuserdetails/WithUserDetailsTests.kt

4
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 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.BeforeEach
import org.junit.jupiter.api.Test import org.junit.jupiter.api.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
@ -50,7 +50,7 @@ class HelloServiceTests {
@Test @Test
fun helloServiceTest() { fun helloServiceTest() {
Assertions.assertThat(messageService.message) assertThat(messageService.message)
.contains("user") .contains("user")
.contains("ROLE_USER") .contains("ROLE_USER")
} }

4
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -39,7 +39,7 @@ class WithMockAdminTests {
@WithMockAdmin @WithMockAdmin
fun getMessageWithMockUserAdminRoles() { fun getMessageWithMockUserAdminRoles() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message) assertThat(message)
.contains("rob") .contains("rob")
.contains("ROLE_ADMIN") .contains("ROLE_ADMIN")
.contains("ROLE_USER") .contains("ROLE_USER")

4
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -42,7 +42,7 @@ class WithMockUserTests {
// end::snippet[] // end::snippet[]
fun getMessageWithMockUserAdminRoles() { fun getMessageWithMockUserAdminRoles() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message) assertThat(message)
.contains("admin") .contains("admin")
.contains("ROLE_ADMIN") .contains("ROLE_ADMIN")
.contains("ROLE_USER") .contains("ROLE_USER")

4
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -39,7 +39,7 @@ class WithMockUserSampleTests {
// tag::snippet[] // tag::snippet[]
@Test @Test
fun getMessageUnauthenticated() { fun getMessageUnauthenticated() {
Assertions.assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java) assertThatExceptionOfType(AuthenticationCredentialsNotFoundException::class.java)
.isThrownBy { messageService.getMessage() } .isThrownBy { messageService.getMessage() }
} }
// end::snippet[] // end::snippet[]

10
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -41,7 +41,7 @@ class WithMockUserTests {
@WithMockUser @WithMockUser
fun getMessageWithMockUser() { fun getMessageWithMockUser() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message).contains("user") assertThat(message).contains("user")
} }
// end::mock-user[] // end::mock-user[]
@ -50,7 +50,7 @@ class WithMockUserTests {
@WithMockUser("customUser") @WithMockUser("customUser")
fun getMessageWithMockUserCustomUsername() { fun getMessageWithMockUserCustomUsername() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message).contains("customUser") assertThat(message).contains("customUser")
} }
// end::custom-user[] // end::custom-user[]
@ -59,7 +59,7 @@ class WithMockUserTests {
@WithMockUser(username = "admin", roles = ["USER", "ADMIN"]) @WithMockUser(username = "admin", roles = ["USER", "ADMIN"])
fun getMessageWithMockUserCustomRoles() { fun getMessageWithMockUserCustomRoles() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message) assertThat(message)
.contains("admin") .contains("admin")
.contains("ROLE_ADMIN") .contains("ROLE_ADMIN")
.contains("ROLE_USER") .contains("ROLE_USER")
@ -71,7 +71,7 @@ class WithMockUserTests {
@WithMockUser(username = "admin", authorities = ["ADMIN", "USER"]) @WithMockUser(username = "admin", authorities = ["ADMIN", "USER"])
fun getMessageWithMockUserCustomAuthorities() { fun getMessageWithMockUserCustomAuthorities() {
val message = messageService.message val message = messageService.message
Assertions.assertThat(message) assertThat(message)
.contains("admin") .contains("admin")
.contains("ADMIN") .contains("ADMIN")
.contains("USER") .contains("USER")

6
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -46,9 +46,9 @@ class WithCustomUserDetailsTests {
@WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService") @WithUserDetails(value = "customUsername", userDetailsServiceBeanName = "myUserDetailsService")
fun getMessageWithUserDetailsServiceBeanName() { fun getMessageWithUserDetailsServiceBeanName() {
val message: String = messageService.getMessage() val message: String = messageService.getMessage()
Assertions.assertThat(message).contains("customUsername"); assertThat(message).contains("customUsername");
val principal = SecurityContextHolder.getContext().authentication.principal val principal = SecurityContextHolder.getContext().authentication.principal
Assertions.assertThat(principal).isInstanceOf(CustomUserDetails::class.java) assertThat(principal).isInstanceOf(CustomUserDetails::class.java)
} }
// end::custom-user-details-service[] // end::custom-user-details-service[]

6
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 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.Test
import org.junit.jupiter.api.extension.ExtendWith import org.junit.jupiter.api.extension.ExtendWith
import org.springframework.beans.factory.annotation.Autowired import org.springframework.beans.factory.annotation.Autowired
@ -44,7 +44,7 @@ class WithUserDetailsTests {
@WithUserDetails @WithUserDetails
fun getMessageWithUserDetails() { fun getMessageWithUserDetails() {
val message: String = messageService.message val message: String = messageService.message
Assertions.assertThat(message).contains("user") assertThat(message).contains("user")
} }
// end::user-details[] // end::user-details[]
@ -53,7 +53,7 @@ class WithUserDetailsTests {
@WithUserDetails("customUsername") @WithUserDetails("customUsername")
fun getMessageWithUserDetailsCustomUsername() { fun getMessageWithUserDetailsCustomUsername() {
val message: String = messageService.message val message: String = messageService.message
Assertions.assertThat(message).contains("customUsername") assertThat(message).contains("customUsername")
} }
// end::user-details-custom-username[] // end::user-details-custom-username[]

Loading…
Cancel
Save