Adapt tests changed in 5.1.x to master

Author: rstoyanchev

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

@@ -19,15 +19,15 @@
 
 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;
 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,16 +51,16 @@ public void tearDown() {
 	@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
 	public void writeWithGivenContentLength() {
 		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);
 	}
 
 

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

@@ -110,7 +110,7 @@ private void testCheckResource(Resource location, String requestPath) throws IOE
 	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

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

@@ -95,7 +95,7 @@ private void testCheckResource(Resource location, String requestPath) throws IOE
 	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