From ff6ccd0d0433ff5f192d74590a63e3b8929220b5 Mon Sep 17 00:00:00 2001 From: Rossen Stoyanchev Date: Wed, 21 Aug 2019 10:23:25 +0300 Subject: [PATCH] Adapt tests changed in 5.1.x to master --- .../reactive/HttpHeadResponseDecoratorTests.java | 10 +++++----- .../reactive/resource/PathResourceResolverTests.java | 2 +- .../servlet/resource/PathResourceResolverTests.java | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java b/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java index 8231bc4789c..6c1465b31b4 100644 --- a/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java +++ b/spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java @@ -19,7 +19,7 @@ import java.nio.charset.StandardCharsets; import io.netty.buffer.PooledByteBufAllocator; import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.Test; import reactor.core.publisher.Flux; import org.springframework.core.io.buffer.DataBuffer; @@ -27,7 +27,7 @@ import org.springframework.core.io.buffer.LeakAwareDataBufferFactory; import org.springframework.core.io.buffer.NettyDataBufferFactory; import org.springframework.mock.http.server.reactive.test.MockServerHttpResponse; -import static org.junit.Assert.assertEquals; +import static org.assertj.core.api.Assertions.assertThat; /** * Unit tests for {@link HttpHeadResponseDecorator}. @@ -51,8 +51,8 @@ public class HttpHeadResponseDecoratorTests { @Test public void write() { Flux body = Flux.just(toDataBuffer("data1"), toDataBuffer("data2")); - response.writeWith(body).block(); - assertEquals(10, response.getHeaders().getContentLength()); + this.response.writeWith(body).block(); + assertThat(this.response.getHeaders().getContentLength()).isEqualTo(10); } @Test // gh-23484 @@ -60,7 +60,7 @@ public class HttpHeadResponseDecoratorTests { int length = 15; this.response.getHeaders().setContentLength(length); this.response.writeWith(Flux.empty()).block(); - assertEquals(length, this.response.getHeaders().getContentLength()); + assertThat(this.response.getHeaders().getContentLength()).isEqualTo(length); } diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java index bf6532537c4..a0019afc02a 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java @@ -110,7 +110,7 @@ public class PathResourceResolverTests { public void ignoreInvalidEscapeSequence() throws IOException { UrlResource location = new UrlResource(getClass().getResource("./test/")); Resource resource = location.createRelative("test%file.txt"); - assertTrue(this.resolver.checkResource(resource, location)); + assertThat(this.resolver.checkResource(resource, location)).isTrue(); } @Test diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java index 59286e6bf03..c6810fbee1e 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java @@ -95,7 +95,7 @@ public class PathResourceResolverTests { public void ignoreInvalidEscapeSequence() throws IOException { UrlResource location = new UrlResource(getClass().getResource("./test/")); Resource resource = location.createRelative("test%file.txt"); - assertTrue(this.resolver.checkResource(resource, location)); + assertThat(this.resolver.checkResource(resource, location)).isTrue(); } @Test