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

Support multiple matchers in MockMvc Kotlin DSL

Browse Source 
Previous incarnation of MockMvc Kotlin DSL tried to reuse directly
Java APIs like ModelResultMatchers or StatusResultMatchers, but
when using multiple matchers in DSL blocks like model { } or
status { }, only the last statement was taken in account which
was very confusing.

This refactoring provides dedicated Kotlin DSLs for matchers.

The main API breaking changes is that functions like isOk() need to be
invoked with the parenthesis, isOk is not supported anymore (on purpose).

Closes gh-24103
This commit is contained in:
Sébastien Deleuze
2020-10-26 18:13:39 +01:00
parent 41247d49ba
commit d04c5f8b2c
16 changed files with 1483 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -18,6 +18,8 @@ package org.springframework.test.web.servlet
import org.assertj.core.api.Assertions.*
import org.hamcrest.CoreMatchers
import org.hamcrest.Matcher
import org.hamcrest.Matchers
import org.junit.jupiter.api.Test
import org.springframework.http.HttpMethod
import org.springframework.http.HttpStatus
@@ -25,6 +27,7 @@ import org.springframework.http.MediaType.*
import org.springframework.test.web.Person
import org.springframework.test.web.servlet.setup.MockMvcBuilders
import org.springframework.web.bind.annotation.*
import org.springframework.web.servlet.ModelAndView
import reactor.core.publisher.Mono
import java.security.Principal
import java.util.*
@@ -50,7 +53,7 @@ class MockMvcExtensionsTests {
}
principal = Principal { "foo" }
}.andExpect {
status { isOk }
status { isOk() }
content { contentType(APPLICATION_JSON) }
jsonPath("$.name") { value("Lee") }
content { json("""{"someBoolean": false}""", false) }
@@ -62,7 +65,7 @@ class MockMvcExtensionsTests {
@Test
fun `request without MockHttpServletRequestDsl`() {
mockMvc.request(HttpMethod.GET, "/person/{name}", "Lee").andExpect {
status { isOk }
status { isOk() }
}.andDo {
print()
}
@@ -75,7 +78,7 @@ class MockMvcExtensionsTests {
val matcher = ResultMatcher { matcherInvoked = true }
val handler = ResultHandler { handlerInvoked = true }
mockMvc.request(HttpMethod.GET, "/person/{name}", "Lee").andExpect {
status { isOk }
status { isOk() }
}.andExpect {
match(matcher)
}.andDo {
@@ -98,7 +101,7 @@ class MockMvcExtensionsTests {
}
principal = Principal { "foo" }
}.andExpect {
status { isOk }
status { isOk() }
content { contentType(APPLICATION_JSON) }
jsonPath("$.name") { value("Lee") }
content { json("""{"someBoolean": false}""", false) }
@@ -117,7 +120,7 @@ class MockMvcExtensionsTests {
}
}.andExpect {
status {
isCreated
isCreated()
}
}
}
@@ -139,7 +142,7 @@ class MockMvcExtensionsTests {
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { model { attributeExists("name", "wrong") } }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { redirectedUrl("wrong/Url") }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { redirectedUrlPattern("wrong/Url") }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { status { isAccepted } }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { status { isAccepted() } }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { view { name("wrongName") } }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { jsonPath("name") { value("wrong") } }
}
@@ -150,7 +153,7 @@ class MockMvcExtensionsTests {
mockMvc.get("/person/Clint") {
accept = APPLICATION_XML
}.andExpect {
status { isOk }
status { isOk() }
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { xpath("//wrong") { nodeCount(1) } }
}.andDo {
print()
@@ -160,7 +163,17 @@ class MockMvcExtensionsTests {
@Test
fun asyncDispatch() {
mockMvc.get("/async").asyncDispatch().andExpect {
status { isOk }
status { isOk() }
}
}
@Test
fun modelAndView() {
mockMvc.get("/").andExpect {
model {
assertThatExceptionOfType(AssertionError::class.java).isThrownBy { attribute("foo", "bar") }
attribute("foo", "foo")
}
}
}
@@ -182,5 +195,8 @@ class MockMvcExtensionsTests {
fun getAsync(): Mono<Person> {
return Mono.just(Person("foo"))
}
@GetMapping("/")
fun index() = ModelAndView("index", mapOf("foo" to "foo", "bar" to "bar"))
}
}