root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Adapt tests changed in 5.1.x to master

This commit is contained in:
Rossen Stoyanchev 2019-08-21 10:23:25 +03:00
parent 364c7c459d
commit ff6ccd0d04
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
spring-web/src/test/java/org/springframework/http/server/reactive/HttpHeadResponseDecoratorTests.java
View File

@ -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<DataBuffer> 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);
}

2
spring-webflux/src/test/java/org/springframework/web/reactive/resource/PathResourceResolverTests.java
View File

@ -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

2
spring-webmvc/src/test/java/org/springframework/web/servlet/resource/PathResourceResolverTests.java
View File

@ -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