Polishing
This commit is contained in:
Sebastien Deleuze
@@ -5,8 +5,7 @@ import org.junit.Test
|
||||
import org.junit.runner.RunWith
|
||||
import org.mockito.Answers
|
||||
import org.mockito.Mock
|
||||
import org.mockito.Mockito
|
||||
import org.mockito.Mockito.verify
|
||||
import org.mockito.Mockito.*
|
||||
import org.mockito.junit.MockitoJUnitRunner
|
||||
import org.springframework.http.HttpEntity
|
||||
import org.springframework.http.HttpMethod
|
||||
@@ -21,134 +20,133 @@ import java.net.URI
|
||||
@RunWith(MockitoJUnitRunner::class)
|
||||
class RestOperationsExtensionsTests {
|
||||
|
||||
@Mock(answer = Answers.RETURNS_MOCKS)
|
||||
lateinit var template: RestOperations
|
||||
@Mock(answer = Answers.RETURNS_MOCKS)
|
||||
lateinit var template: RestOperations
|
||||
|
||||
@Test
|
||||
fun `getForObject with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.getForObject<Foo>(url, var1, var2)
|
||||
verify(template, Mockito.times(1)).getForObject(url, Foo::class.java, var1, var2)
|
||||
}
|
||||
@Test
|
||||
fun `getForObject with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.getForObject<Foo>(url, var1, var2)
|
||||
verify(template, times(1)).getForObject(url, Foo::class.java, var1, var2)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getForObject with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.getForObject<Foo>(url, vars)
|
||||
verify(template, Mockito.times(1)).getForObject(url, Foo::class.java, vars)
|
||||
}
|
||||
@Test
|
||||
fun `getForObject with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.getForObject<Foo>(url, vars)
|
||||
verify(template, times(1)).getForObject(url, Foo::class.java, vars)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getForObject with reified type parameters and URI`() {
|
||||
val url = URI("https://spring.io")
|
||||
template.getForObject<Foo>(url)
|
||||
verify(template, Mockito.times(1)).getForObject(url, Foo::class.java)
|
||||
}
|
||||
@Test
|
||||
fun `getForObject with reified type parameters and URI`() {
|
||||
val url = URI("https://spring.io")
|
||||
template.getForObject<Foo>(url)
|
||||
verify(template, times(1)).getForObject(url, Foo::class.java)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `getForEntity with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.getForEntity<Foo>(url, var1, var2)
|
||||
verify(template, Mockito.times(1)).getForEntity(url, Foo::class.java, var1, var2)
|
||||
}
|
||||
@Test
|
||||
fun `getForEntity with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.getForEntity<Foo>(url, var1, var2)
|
||||
verify(template, times(1)).getForEntity(url, Foo::class.java, var1, var2)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForObject with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.postForObject<Foo>(url, body, var1, var2)
|
||||
verify(template, Mockito.times(1)).postForObject(url, body, Foo::class.java, var1, var2)
|
||||
}
|
||||
@Test
|
||||
fun `postForObject with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.postForObject<Foo>(url, body, var1, var2)
|
||||
verify(template, times(1)).postForObject(url, body, Foo::class.java, var1, var2)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForObject with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.postForObject<Foo>(url, body, vars)
|
||||
verify(template, Mockito.times(1)).postForObject(url, body, Foo::class.java, vars)
|
||||
}
|
||||
@Test
|
||||
fun `postForObject with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.postForObject<Foo>(url, body, vars)
|
||||
verify(template, times(1)).postForObject(url, body, Foo::class.java, vars)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForObject with reified type parameters`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
template.postForObject<Foo>(url, body)
|
||||
verify(template, Mockito.times(1)).postForObject(url, body, Foo::class.java)
|
||||
}
|
||||
@Test
|
||||
fun `postForObject with reified type parameters`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
template.postForObject<Foo>(url, body)
|
||||
verify(template, times(1)).postForObject(url, body, Foo::class.java)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.postForEntity<Foo>(url, body, var1, var2)
|
||||
verify(template, Mockito.times(1)).postForEntity(url, body, Foo::class.java, var1, var2)
|
||||
}
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters, String and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.postForEntity<Foo>(url, body, var1, var2)
|
||||
verify(template, times(1)).postForEntity(url, body, Foo::class.java, var1, var2)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.postForEntity<Foo>(url, body, vars)
|
||||
verify(template, Mockito.times(1)).postForEntity(url, body, Foo::class.java, vars)
|
||||
}
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters, String and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.postForEntity<Foo>(url, body, vars)
|
||||
verify(template, times(1)).postForEntity(url, body, Foo::class.java, vars)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
template.postForEntity<Foo>(url, body)
|
||||
verify(template, Mockito.times(1)).postForEntity(url, body, Foo::class.java)
|
||||
}
|
||||
@Test
|
||||
fun `postForEntity with reified type parameters`() {
|
||||
val url = "https://spring.io"
|
||||
val body: Any = "body"
|
||||
template.postForEntity<Foo>(url, body)
|
||||
verify(template, times(1)).postForEntity(url, body, Foo::class.java)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.exchange<Foo>(url, method, entity, var1, var2)
|
||||
verify(template, Mockito.times(1)).exchange(url, method, entity, Foo::class.java, var1, var2)
|
||||
}
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity and varargs`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
val var1 = "var1"
|
||||
val var2 = "var2"
|
||||
template.exchange<Foo>(url, method, entity, var1, var2)
|
||||
verify(template, times(1)).exchange(url, method, entity, Foo::class.java, var1, var2)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.exchange<Foo>(url, method, entity, vars)
|
||||
verify(template, Mockito.times(1)).exchange(url, method, entity, Foo::class.java, vars)
|
||||
}
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity and Map`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
val vars = mapOf(Pair("key1", "value1"), Pair("key2", "value2"))
|
||||
template.exchange<Foo>(url, method, entity, vars)
|
||||
verify(template, times(1)).exchange(url, method, entity, Foo::class.java, vars)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
template.exchange<Foo>(url, method, entity)
|
||||
verify(template, Mockito.times(1)).exchange(url, method, entity, Foo::class.java)
|
||||
}
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpMethod, HttpEntity`() {
|
||||
val url = "https://spring.io"
|
||||
val method = HttpMethod.GET
|
||||
val entity = mock<HttpEntity<Foo>>()
|
||||
template.exchange<Foo>(url, method, entity)
|
||||
verify(template, times(1)).exchange(url, method, entity, Foo::class.java)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpEntity`() {
|
||||
val url = "https://spring.io"
|
||||
val entity = mock<RequestEntity<Foo>>()
|
||||
template.exchange<Foo>(entity)
|
||||
verify(template, Mockito.times(1)).exchange(entity, Foo::class.java)
|
||||
}
|
||||
@Test
|
||||
fun `exchange with reified type parameters, String, HttpEntity`() {
|
||||
val entity = mock<RequestEntity<Foo>>()
|
||||
template.exchange<Foo>(entity)
|
||||
verify(template, times(1)).exchange(entity, Foo::class.java)
|
||||
}
|
||||
|
||||
class Foo
|
||||
class Foo
|
||||
|
||||
}
|
||||
|
||||
@@ -32,187 +32,187 @@ import org.springframework.web.multipart.support.MissingServletRequestPartExcept
|
||||
*/
|
||||
class RequestParamMethodArgumentResolverKotlinTests {
|
||||
|
||||
lateinit var resolver: RequestParamMethodArgumentResolver
|
||||
lateinit var webRequest: NativeWebRequest
|
||||
lateinit var binderFactory: WebDataBinderFactory
|
||||
lateinit var request: MockHttpServletRequest
|
||||
lateinit var resolver: RequestParamMethodArgumentResolver
|
||||
lateinit var webRequest: NativeWebRequest
|
||||
lateinit var binderFactory: WebDataBinderFactory
|
||||
lateinit var request: MockHttpServletRequest
|
||||
|
||||
lateinit var nullableParamRequired: MethodParameter
|
||||
lateinit var nullableParamNotRequired: MethodParameter
|
||||
lateinit var nonNullableParamRequired: MethodParameter
|
||||
lateinit var nonNullableParamNotRequired: MethodParameter
|
||||
lateinit var nullableParamRequired: MethodParameter
|
||||
lateinit var nullableParamNotRequired: MethodParameter
|
||||
lateinit var nonNullableParamRequired: MethodParameter
|
||||
lateinit var nonNullableParamNotRequired: MethodParameter
|
||||
|
||||
lateinit var nullableMultipartParamRequired: MethodParameter
|
||||
lateinit var nullableMultipartParamNotRequired: MethodParameter
|
||||
lateinit var nonNullableMultipartParamRequired: MethodParameter
|
||||
lateinit var nonNullableMultipartParamNotRequired: MethodParameter
|
||||
lateinit var nullableMultipartParamRequired: MethodParameter
|
||||
lateinit var nullableMultipartParamNotRequired: MethodParameter
|
||||
lateinit var nonNullableMultipartParamRequired: MethodParameter
|
||||
lateinit var nonNullableMultipartParamNotRequired: MethodParameter
|
||||
|
||||
|
||||
@Before
|
||||
fun setup() {
|
||||
resolver = RequestParamMethodArgumentResolver(null, true)
|
||||
request = MockHttpServletRequest()
|
||||
val initializer = ConfigurableWebBindingInitializer()
|
||||
initializer.conversionService = DefaultConversionService()
|
||||
binderFactory = DefaultDataBinderFactory(initializer)
|
||||
webRequest = ServletWebRequest(request, MockHttpServletResponse())
|
||||
@Before
|
||||
fun setup() {
|
||||
resolver = RequestParamMethodArgumentResolver(null, true)
|
||||
request = MockHttpServletRequest()
|
||||
val initializer = ConfigurableWebBindingInitializer()
|
||||
initializer.conversionService = DefaultConversionService()
|
||||
binderFactory = DefaultDataBinderFactory(initializer)
|
||||
webRequest = ServletWebRequest(request, MockHttpServletResponse())
|
||||
|
||||
val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java,
|
||||
String::class.java, String::class.java, String::class.java,
|
||||
MultipartFile::class.java, MultipartFile::class.java,
|
||||
MultipartFile::class.java, MultipartFile::class.java)
|
||||
val method = ReflectionUtils.findMethod(javaClass, "handle", String::class.java,
|
||||
String::class.java, String::class.java, String::class.java,
|
||||
MultipartFile::class.java, MultipartFile::class.java,
|
||||
MultipartFile::class.java, MultipartFile::class.java)
|
||||
|
||||
nullableParamRequired = SynthesizingMethodParameter(method, 0)
|
||||
nullableParamNotRequired = SynthesizingMethodParameter(method, 1)
|
||||
nonNullableParamRequired = SynthesizingMethodParameter(method, 2)
|
||||
nonNullableParamNotRequired = SynthesizingMethodParameter(method, 3)
|
||||
nullableParamRequired = SynthesizingMethodParameter(method, 0)
|
||||
nullableParamNotRequired = SynthesizingMethodParameter(method, 1)
|
||||
nonNullableParamRequired = SynthesizingMethodParameter(method, 2)
|
||||
nonNullableParamNotRequired = SynthesizingMethodParameter(method, 3)
|
||||
|
||||
nullableMultipartParamRequired = SynthesizingMethodParameter(method, 4)
|
||||
nullableMultipartParamNotRequired = SynthesizingMethodParameter(method, 5)
|
||||
nonNullableMultipartParamRequired = SynthesizingMethodParameter(method, 6)
|
||||
nonNullableMultipartParamNotRequired = SynthesizingMethodParameter(method, 7)
|
||||
}
|
||||
nullableMultipartParamRequired = SynthesizingMethodParameter(method, 4)
|
||||
nullableMultipartParamNotRequired = SynthesizingMethodParameter(method, 5)
|
||||
nonNullableMultipartParamRequired = SynthesizingMethodParameter(method, 6)
|
||||
nonNullableMultipartParamNotRequired = SynthesizingMethodParameter(method, 7)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nullableParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNullableRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nullableParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableRequiredWithoutParameter() {
|
||||
var result = resolver.resolveArgument(nullableParamRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNullableRequiredWithoutParameter() {
|
||||
var result = resolver.resolveArgument(nullableParamRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithoutParameter() {
|
||||
var result = resolver.resolveArgument(nullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithoutParameter() {
|
||||
var result = resolver.resolveArgument(nullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNonNullableRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nonNullableParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNonNullableRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nonNullableParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
|
||||
@Test(expected = MissingServletRequestParameterException::class)
|
||||
fun resolveNonNullableRequiredWithoutParameter() {
|
||||
resolver.resolveArgument(nonNullableParamRequired, null, webRequest, binderFactory)
|
||||
}
|
||||
@Test(expected = MissingServletRequestParameterException::class)
|
||||
fun resolveNonNullableRequiredWithoutParameter() {
|
||||
resolver.resolveArgument(nonNullableParamRequired, null, webRequest, binderFactory)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNonNullableNotRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nonNullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
@Test
|
||||
fun resolveNonNullableNotRequiredWithParameter() {
|
||||
request.addParameter("name", "123")
|
||||
var result = resolver.resolveArgument(nonNullableParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals("123", result)
|
||||
}
|
||||
|
||||
@Test(expected = TypeCastException::class)
|
||||
fun resolveNonNullableNotRequiredWithoutParameter() {
|
||||
resolver.resolveArgument(nonNullableParamNotRequired, null, webRequest, binderFactory) as String
|
||||
}
|
||||
@Test(expected = TypeCastException::class)
|
||||
fun resolveNonNullableNotRequiredWithoutParameter() {
|
||||
resolver.resolveArgument(nonNullableParamNotRequired, null, webRequest, binderFactory) as String
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
fun resolveNullableRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
@Test
|
||||
fun resolveNullableRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
|
||||
var result = resolver.resolveArgument(nullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
@Test
|
||||
fun resolveNullableRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
|
||||
var result = resolver.resolveArgument(nullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
|
||||
var result = resolver.resolveArgument(nullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
@Test
|
||||
fun resolveNullableNotRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
|
||||
var result = resolver.resolveArgument(nullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertNull(result)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNonNullableRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
@Test
|
||||
fun resolveNonNullableRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
|
||||
var result = resolver.resolveArgument(nonNullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nonNullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
|
||||
@Test(expected = MissingServletRequestPartException::class)
|
||||
fun resolveNonNullableRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
resolver.resolveArgument(nonNullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
}
|
||||
@Test(expected = MissingServletRequestPartException::class)
|
||||
fun resolveNonNullableRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
resolver.resolveArgument(nonNullableMultipartParamRequired, null, webRequest, binderFactory)
|
||||
}
|
||||
|
||||
@Test
|
||||
fun resolveNonNullableNotRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
@Test
|
||||
fun resolveNonNullableNotRequiredWithMultipartParameter() {
|
||||
val request = MockMultipartHttpServletRequest()
|
||||
val expected = MockMultipartFile("mfile", "Hello World".toByteArray())
|
||||
request.addFile(expected)
|
||||
webRequest = ServletWebRequest(request)
|
||||
|
||||
var result = resolver.resolveArgument(nonNullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
var result = resolver.resolveArgument(nonNullableMultipartParamNotRequired, null, webRequest, binderFactory)
|
||||
assertEquals(expected, result)
|
||||
}
|
||||
|
||||
@Test(expected = TypeCastException::class)
|
||||
fun resolveNonNullableNotRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
resolver.resolveArgument(nonNullableMultipartParamNotRequired, null, webRequest, binderFactory) as MultipartFile
|
||||
}
|
||||
@Test(expected = TypeCastException::class)
|
||||
fun resolveNonNullableNotRequiredWithoutMultipartParameter() {
|
||||
request.method = HttpMethod.POST.name
|
||||
request.contentType = MediaType.MULTIPART_FORM_DATA_VALUE
|
||||
resolver.resolveArgument(nonNullableMultipartParamNotRequired, null, webRequest, binderFactory) as MultipartFile
|
||||
}
|
||||
|
||||
|
||||
@Suppress("unused_parameter")
|
||||
fun handle(
|
||||
@RequestParam("name") nullableParamRequired: String?,
|
||||
@RequestParam("name", required = false) nullableParamNotRequired: String?,
|
||||
@RequestParam("name") nonNullableParamRequired: String,
|
||||
@RequestParam("name", required = false) nonNullableParamNotRequired: String,
|
||||
@Suppress("unused_parameter")
|
||||
fun handle(
|
||||
@RequestParam("name") nullableParamRequired: String?,
|
||||
@RequestParam("name", required = false) nullableParamNotRequired: String?,
|
||||
@RequestParam("name") nonNullableParamRequired: String,
|
||||
@RequestParam("name", required = false) nonNullableParamNotRequired: String,
|
||||
|
||||
@RequestParam("mfile") nullableMultipartParamRequired: MultipartFile?,
|
||||
@RequestParam("mfile", required = false) nullableMultipartParamNotRequired: MultipartFile?,
|
||||
@RequestParam("mfile") nonNullableMultipartParamRequired: MultipartFile,
|
||||
@RequestParam("mfile", required = false) nonNullableMultipartParamNotRequired: MultipartFile) {
|
||||
}
|
||||
@RequestParam("mfile") nullableMultipartParamRequired: MultipartFile?,
|
||||
@RequestParam("mfile", required = false) nullableMultipartParamNotRequired: MultipartFile?,
|
||||
@RequestParam("mfile") nonNullableMultipartParamRequired: MultipartFile,
|
||||
@RequestParam("mfile", required = false) nonNullableMultipartParamNotRequired: MultipartFile) {
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user