Spring/spring-framework
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add Kotlin DSL support for MockMVC andExpectAll (#29727)

Browse Source 
As the DSL internally calls `ResultActions.andExpect`, this is done with
a trick where a synthetic `ResultActions` is provided at top level which
stores each `ResultMatcher` in a mutable list.

Once the DSL usage is done, the top level DSL `andExpectAll` turns that
list into a `vararg` passed down to the actual `actions.andExpectAll`.

Closes gh-27317
This commit is contained in:
Simon Baslé
2023-01-03 18:26:26 +01:00
committed by GitHub
parent 42b16591ec
commit 74f58198fd
3 changed files with 73 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
spring-test/src/test/kotlin/org/springframework/test/web/servlet/MockMvcExtensionsTests.kt
View File

@@ -17,6 +17,7 @@
package org.springframework.test.web.servlet
import org.assertj.core.api.Assertions.assertThat
import org.assertj.core.api.Assertions.assertThatCode
import org.assertj.core.api.Assertions.assertThatExceptionOfType
import org.hamcrest.CoreMatchers
import org.junit.jupiter.api.Test
@@ -25,6 +26,7 @@ import org.springframework.http.HttpStatus
import org.springframework.http.MediaType.APPLICATION_ATOM_XML
import org.springframework.http.MediaType.APPLICATION_JSON
import org.springframework.http.MediaType.APPLICATION_XML
import org.springframework.http.MediaType.TEXT_PLAIN
import org.springframework.test.web.Person
import org.springframework.test.web.servlet.setup.MockMvcBuilders
import org.springframework.web.bind.annotation.GetMapping
@@ -97,6 +99,24 @@ class MockMvcExtensionsTests {
assertThat(handlerInvoked).isTrue()
}
@Test
fun `request with two custom matchers and matchAll`() {
var matcher1Invoked = false
var matcher2Invoked = false
val matcher1 = ResultMatcher { matcher1Invoked = true; throw AssertionError("expected") }
val matcher2 = ResultMatcher { matcher2Invoked = true }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy {
mockMvc.request(HttpMethod.GET, "/person/{name}", "Lee")
.andExpect {
matchAll(matcher1, matcher2)
}
}
.withMessage("expected")
assertThat(matcher1Invoked).describedAs("matcher1").isTrue()
assertThat(matcher2Invoked).describedAs("matcher2").isTrue()
}
@Test
fun get() {
mockMvc.get("/person/{name}", "Lee") {
@@ -183,6 +203,22 @@ class MockMvcExtensionsTests {
}
}
@Test
fun `andExpectAll reports multiple assertion errors`() {
assertThatCode {
mockMvc.request(HttpMethod.GET, "/person/{name}", "Lee") {
accept = APPLICATION_JSON
}.andExpectAll {
status { is4xxClientError() }
content { contentType(TEXT_PLAIN) }
jsonPath("$.name") { value("Lee") }
}
}
.hasMessage("Multiple Exceptions (2):\n" +
"Range for response status value 200 expected:<CLIENT_ERROR> but was:<SUCCESSFUL>\n" +
"Content type expected:<text/plain> but was:<application/json>")
}
@RestController
private class PersonController {