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

Migrate to AssertJ in Kotlin tests

Browse Source 
Closes gh-23475
This commit is contained in:
Sebastien Deleuze
2019-09-02 15:59:26 +02:00
parent 3fcf4233a2
commit ca02cc1194
35 changed files with 336 additions and 403 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/RouterFunctionDslTests.kt
View File

@@ -16,9 +16,7 @@
package org.springframework.web.servlet.function
import org.junit.jupiter.api.Assertions.assertFalse
import org.junit.jupiter.api.Assertions.assertTrue
import org.junit.jupiter.api.fail
import org.assertj.core.api.Assertions.*
import org.junit.jupiter.api.Test
import org.springframework.core.io.ClassPathResource
import org.springframework.http.HttpHeaders.*
@@ -38,7 +36,7 @@ class RouterFunctionDslTests {
val servletRequest = MockHttpServletRequest()
servletRequest.addHeader("bar", "bar")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
@@ -46,7 +44,7 @@ class RouterFunctionDslTests {
val servletRequest = MockHttpServletRequest("GET", "/content")
servletRequest.addHeader(ACCEPT, APPLICATION_ATOM_XML_VALUE)
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
@@ -54,7 +52,7 @@ class RouterFunctionDslTests {
val servletRequest = MockHttpServletRequest("POST", "/api/foo/")
servletRequest.addHeader(ACCEPT, APPLICATION_JSON_VALUE)
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
@@ -62,35 +60,35 @@ class RouterFunctionDslTests {
val servletRequest = MockHttpServletRequest("GET", "/content")
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_OCTET_STREAM_VALUE)
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun resourceByPath() {
val servletRequest = MockHttpServletRequest("GET", "/org/springframework/web/servlet/function/response.txt")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun method() {
val servletRequest = MockHttpServletRequest("PATCH", "/")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun path() {
val servletRequest = MockHttpServletRequest("GET", "/baz")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
fun resource() {
val servletRequest = MockHttpServletRequest("GET", "/response.txt")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isTrue()
}
@Test
@@ -100,24 +98,20 @@ class RouterFunctionDslTests {
servletRequest.addHeader(ACCEPT, APPLICATION_PDF_VALUE)
servletRequest.addHeader(CONTENT_TYPE, APPLICATION_PDF_VALUE)
val request = DefaultServerRequest(servletRequest, emptyList())
assertFalse(sampleRouter().route(request).isPresent)
assertThat(sampleRouter().route(request).isPresent).isFalse()
}
@Test
fun rendering() {
val servletRequest = MockHttpServletRequest("GET", "/rendering")
val request = DefaultServerRequest(servletRequest, emptyList())
assertTrue(sampleRouter().route(request).get().handle(request) is RenderingResponse)
assertThat(sampleRouter().route(request).get().handle(request) is RenderingResponse).isTrue()
}
@Test
fun emptyRouter() {
try {
assertThatExceptionOfType(IllegalStateException::class.java).isThrownBy {
router { }
fail("should have thrown an IllegalStateException")
}
catch (e: IllegalStateException) {
// expected
}
}

31
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/ServerRequestExtensionsTests.kt
View File

@@ -19,8 +19,7 @@ package org.springframework.web.servlet.function
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import org.junit.jupiter.api.Assertions.assertEquals
import org.junit.jupiter.api.Assertions.assertNull
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.core.ParameterizedTypeReference
import org.springframework.http.MediaType
@@ -43,23 +42,23 @@ class ServerRequestExtensionsTests {
fun `remoteAddressOrNull with value`() {
val remoteAddress = mockk<InetSocketAddress>()
every { request.remoteAddress() } returns Optional.of(remoteAddress)
assertEquals(remoteAddress, request.remoteAddressOrNull())
assertThat(remoteAddress).isEqualTo(request.remoteAddressOrNull())
verify { request.remoteAddress() }
}
@Test
fun `remoteAddressOrNull with null`() {
every { request.remoteAddress() } returns Optional.empty()
assertNull(request.remoteAddressOrNull())
assertThat(request.remoteAddressOrNull()).isNull()
verify { request.remoteAddress() }
}
@Test
fun body() {
val body = Arrays.asList("foo", "bar")
val body = listOf("foo", "bar")
val typeReference = object: ParameterizedTypeReference<List<String>>() {}
every { request.body(typeReference) } returns body
assertEquals(body, request.body<List<String>>())
assertThat(request.body<List<String>>()).isEqualTo(body)
verify { request.body(typeReference) }
}
@@ -67,14 +66,14 @@ class ServerRequestExtensionsTests {
fun `attributeOrNull with value`() {
val attribute = mockk<Any>()
every { request.attribute("foo") } returns Optional.of(attribute)
assertEquals(attribute, request.attributeOrNull("foo"))
assertThat(request.attributeOrNull("foo")).isEqualTo(attribute)
verify { request.attribute("foo") }
}
@Test
fun `attributeOrNull with null`() {
every { request.attribute("foo") } returns Optional.empty()
assertNull(request.attributeOrNull("foo"))
assertThat(request.attributeOrNull("foo")).isNull()
verify { request.attribute("foo") }
}
@@ -82,14 +81,14 @@ class ServerRequestExtensionsTests {
fun `paramOrNull with value`() {
val param = "bar"
every { request.param("foo") } returns Optional.of(param)
assertEquals(param, request.paramOrNull("foo"))
assertThat(request.paramOrNull("foo")).isEqualTo(param)
verify { request.param("foo") }
}
@Test
fun `paramOrNull with null`() {
every { request.param("foo") } returns Optional.empty()
assertNull(request.paramOrNull("foo"))
assertThat(request.paramOrNull("foo")).isNull()
verify { request.param("foo") }
}
@@ -97,14 +96,14 @@ class ServerRequestExtensionsTests {
fun `principalOrNull with value`() {
val principal = mockk<Principal>()
every { request.principal() } returns Optional.of(principal)
assertEquals(principal, request.principalOrNull())
assertThat(request.principalOrNull()).isEqualTo(principal)
verify { request.principal() }
}
@Test
fun `principalOrNull with null`() {
every { request.principal() } returns Optional.empty()
assertNull(request.principalOrNull())
assertThat(request.principalOrNull()).isNull()
verify { request.principal() }
}
@@ -112,14 +111,14 @@ class ServerRequestExtensionsTests {
fun `contentLengthOrNull with value`() {
val contentLength: Long = 123
every { headers.contentLength() } returns OptionalLong.of(contentLength)
assertEquals(contentLength, headers.contentLengthOrNull())
assertThat(headers.contentLengthOrNull()).isEqualTo(contentLength)
verify { headers.contentLength() }
}
@Test
fun `contentLengthOrNull with null`() {
every { headers.contentLength() } returns OptionalLong.empty()
assertNull(headers.contentLengthOrNull())
assertThat(headers.contentLengthOrNull()).isNull()
verify { headers.contentLength() }
}
@@ -127,14 +126,14 @@ class ServerRequestExtensionsTests {
fun `contentTypeOrNull with value`() {
val contentType = mockk<MediaType>()
every { headers.contentType() } returns Optional.of(contentType)
assertEquals(contentType, headers.contentTypeOrNull())
assertThat(headers.contentTypeOrNull()).isEqualTo(contentType)
verify { headers.contentType() }
}
@Test
fun `contentTypeOrNull with null`() {
every { headers.contentType() } returns Optional.empty()
assertNull(headers.contentTypeOrNull())
assertThat(headers.contentTypeOrNull()).isNull()
verify { headers.contentType() }
}
}

7
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/function/ServerResponseExtensionsTests.kt
View File

@@ -19,10 +19,9 @@ package org.springframework.web.servlet.function
import io.mockk.every
import io.mockk.mockk
import io.mockk.verify
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.core.ParameterizedTypeReference
import java.util.*
import org.junit.jupiter.api.Assertions.assertEquals
/**
* Tests for WebMvc.fn [ServerResponse] extensions.
@@ -35,10 +34,10 @@ class ServerResponseExtensionsTests {
fun bodyWithType() {
val builder = mockk<ServerResponse.BodyBuilder>()
val response = mockk<ServerResponse>()
val body = Arrays.asList("foo", "bar")
val body = listOf("foo", "bar")
val typeReference = object: ParameterizedTypeReference<List<String>>() {}
every { builder.body(body, typeReference) } returns response
assertEquals(response, builder.bodyWithType<List<String>>(body))
assertThat(builder.bodyWithType<List<String>>(body)).isEqualTo(response)
verify { builder.body(body, typeReference) }
}
}

10
spring-webmvc/src/test/kotlin/org/springframework/web/servlet/mvc/method/annotation/ServletAnnotationControllerHandlerMethodKotlinTests.kt
View File

@@ -1,5 +1,5 @@
/*
* Copyright 2002-2017 the original author or authors.
* Copyright 2002-2019 the original author or authors.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
package org.springframework.web.servlet.mvc.method.annotation
import org.junit.jupiter.api.Assertions.*
import org.assertj.core.api.Assertions.assertThat
import org.junit.jupiter.api.Test
import org.springframework.mock.web.test.MockHttpServletRequest
import org.springframework.mock.web.test.MockHttpServletResponse
@@ -37,7 +37,7 @@ class ServletAnnotationControllerHandlerMethodKotlinTests : AbstractServletHandl
request.addParameter("param2", "2")
val response = MockHttpServletResponse()
servlet.service(request, response)
assertEquals("value1-2", response.contentAsString)
assertThat(response.contentAsString).isEqualTo("value1-2")
}
@Test
@@ -49,7 +49,7 @@ class ServletAnnotationControllerHandlerMethodKotlinTests : AbstractServletHandl
request.addParameter("param2", "2")
val response = MockHttpServletResponse()
servlet.service(request, response)
assertEquals("value1-2", response.contentAsString)
assertThat(response.contentAsString).isEqualTo("value1-2")
}
@Test
@@ -60,7 +60,7 @@ class ServletAnnotationControllerHandlerMethodKotlinTests : AbstractServletHandl
request.addParameter("param1", "value1")
val response = MockHttpServletResponse()
servlet.service(request, response)
assertEquals("value1-12", response.contentAsString)
assertThat(response.contentAsString).isEqualTo("value1-12")
}