diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java index b97cc3de94d..641a75bfb63 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/embedded/netty/NettyReactiveWebServerFactoryTests.java @@ -16,7 +16,6 @@ package org.springframework.boot.web.embedded.netty; -import java.time.Duration; import java.util.Arrays; import org.junit.Test; @@ -25,10 +24,7 @@ import reactor.netty.http.server.HttpServer; import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactory; import org.springframework.boot.web.reactive.server.AbstractReactiveWebServerFactoryTests; -import org.springframework.boot.web.server.Compression; import org.springframework.boot.web.server.PortInUseException; -import org.springframework.http.ResponseEntity; -import org.springframework.web.reactive.function.client.WebClient; import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.assertThatExceptionOfType; @@ -87,15 +83,4 @@ public class NettyReactiveWebServerFactoryTests extends AbstractReactiveWebServe assertForwardHeaderIsUsed(factory); } - @Test - public void noCompressionForResponseWithInvalidContentType() { - Compression compression = new Compression(); - compression.setEnabled(true); - compression.setMimeTypes(new String[] { "application/json" }); - WebClient client = prepareCompressionTest(compression, "test~plain"); - ResponseEntity response = client.get().exchange().flatMap((res) -> res.toEntity(Void.class)) - .block(Duration.ofSeconds(30)); - assertResponseIsNotCompressed(response); - } - } diff --git a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java index d6ae411e2b9..d23e9a3168d 100644 --- a/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java +++ b/spring-boot-project/spring-boot/src/test/java/org/springframework/boot/web/reactive/server/AbstractReactiveWebServerFactoryTests.java @@ -278,6 +278,17 @@ public abstract class AbstractReactiveWebServerFactoryTests { assertResponseIsNotCompressed(response); } + @Test + public void noCompressionForResponseWithInvalidContentType() { + Compression compression = new Compression(); + compression.setEnabled(true); + compression.setMimeTypes(new String[] { "application/json" }); + WebClient client = prepareCompressionTest(compression, "test~plain"); + ResponseEntity response = client.get().exchange().flatMap((res) -> res.toEntity(Void.class)) + .block(Duration.ofSeconds(30)); + assertResponseIsNotCompressed(response); + } + @Test public void whenSslIsEnabledAndNoKeyStoreIsConfiguredThenServerFailsToStart() { assertThatThrownBy(() -> testBasicSslWithKeyStore(null, null))