From 265960f09cae6d8e1d347d5cb66c5854668350e8 Mon Sep 17 00:00:00 2001 From: Sebastien Deleuze Date: Tue, 15 May 2018 15:31:45 +0200 Subject: [PATCH] Add StatusResultMatchers.isEqualTo Kotlin extension Issue: SPR-16429 --- .../servlet/result/StatusResultMatchers.java | 4 +- .../result/StatusResultMatchersExtensions.kt | 38 +++++++++++++++ .../StatusResultMatchersExtensionsTests.kt | 48 +++++++++++++++++++ 3 files changed, 89 insertions(+), 1 deletion(-) create mode 100644 spring-test/src/main/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensions.kt create mode 100644 spring-test/src/test/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensionsTests.kt diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java index 232c84f9b3..289fe3a369 100644 --- a/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java +++ b/spring-test/src/main/java/org/springframework/test/web/servlet/result/StatusResultMatchers.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2017 the original author or authors. + * Copyright 2002-2018 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. @@ -49,6 +49,7 @@ public class StatusResultMatchers { /** * Assert the response status code with the given Hamcrest {@link Matcher}. + * Use the {@code StatusResultMatchers.isEqualTo} extension in Kotlin. */ public ResultMatcher is(final Matcher matcher) { return result -> assertThat("Response status", result.getResponse().getStatus(), matcher); @@ -56,6 +57,7 @@ public class StatusResultMatchers { /** * Assert the response status code is equal to an integer value. + * Use the {@code StatusResultMatchers.isEqualTo} extension in Kotlin. */ public ResultMatcher is(final int status) { return result -> assertEquals("Response status", status, result.getResponse().getStatus()); diff --git a/spring-test/src/main/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensions.kt b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensions.kt new file mode 100644 index 0000000000..66f2b2d31a --- /dev/null +++ b/spring-test/src/main/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensions.kt @@ -0,0 +1,38 @@ +/* + * Copyright 2002-2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.test.web.servlet.result + +import org.hamcrest.Matcher +import org.springframework.test.web.servlet.ResultMatcher + +/** + * Extension for [StatusResultMatchers.is] providing an `isEqualTo` alias since `is` is + * a reserved keyword in Kotlin. + * + * @author Sebastien Deleuze + * @since 5.0.7 + */ +fun StatusResultMatchers.isEqualTo(matcher: Matcher): ResultMatcher = `is`(matcher) + +/** + * Extension for [StatusResultMatchers.is] providing an `isEqualTo` alias since `is` is + * a reserved keyword in Kotlin. + * + * @author Sebastien Deleuze + * @since 5.0.7 + */ +fun StatusResultMatchers.isEqualTo(status: Int): ResultMatcher = `is`(status) diff --git a/spring-test/src/test/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensionsTests.kt b/spring-test/src/test/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensionsTests.kt new file mode 100644 index 0000000000..af40da691e --- /dev/null +++ b/spring-test/src/test/kotlin/org/springframework/test/web/servlet/result/StatusResultMatchersExtensionsTests.kt @@ -0,0 +1,48 @@ +/* + * Copyright 2002-2018 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.springframework.test.web.servlet.result + +import com.nhaarman.mockito_kotlin.mock +import com.nhaarman.mockito_kotlin.times +import com.nhaarman.mockito_kotlin.verify +import org.hamcrest.Matcher +import org.junit.Test +import org.junit.runner.RunWith +import org.mockito.Answers +import org.mockito.Mock +import org.mockito.junit.MockitoJUnitRunner + +@RunWith(MockitoJUnitRunner::class) +class StatusResultMatchersExtensionsTests { + + @Mock(answer = Answers.RETURNS_MOCKS) + lateinit var matchers: StatusResultMatchers + + @Test + fun `StatusResultMatchers#is with Matcher parameter is called as expected when using isEqualTo extension`() { + val matcher = mock>() + matchers.isEqualTo(matcher) + verify(matchers, times(1)).`is`(matcher) + } + + @Test + fun `StatusResultMatchers#is with int parameter is called as expected when using isEqualTo extension`() { + matchers.isEqualTo(200) + verify(matchers, times(1)).`is`(200) + } + +}