From 1bb723b9e0d5baa47fb4c3469202fe6f74d88f82 Mon Sep 17 00:00:00 2001 From: Sam Brannen Date: Mon, 28 Nov 2022 17:43:39 +0100 Subject: [PATCH] Rename to AbstractReactiveWebSocketIntegrationTests to avoid duplicate class names --- ...ts.java => AbstractReactiveWebSocketIntegrationTests.java} | 4 ++-- .../web/reactive/socket/WebSocketIntegrationTests.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) rename spring-webflux/src/test/java/org/springframework/web/reactive/socket/{AbstractWebSocketIntegrationTests.java => AbstractReactiveWebSocketIntegrationTests.java} (98%) diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java similarity index 98% rename from spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java rename to spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java index c0eca102eb..971e16d47b 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractWebSocketIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/AbstractReactiveWebSocketIntegrationTests.java @@ -69,7 +69,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Tomcat import org.springframework.web.testfixture.http.server.reactive.bootstrap.UndertowHttpServer; /** - * Base class for WebSocket integration tests. Subclasses must implement + * Base class for reactive WebSocket integration tests. Subclasses must implement * {@link #getWebConfigClass()} to return Spring config class with (server-side) * handler mappings to {@code WebSocketHandler}'s. * @@ -77,7 +77,7 @@ import org.springframework.web.testfixture.http.server.reactive.bootstrap.Undert * @author Sam Brannen */ @SuppressWarnings({"unused", "WeakerAccess"}) -abstract class AbstractWebSocketIntegrationTests { +abstract class AbstractReactiveWebSocketIntegrationTests { private static final File TMP_DIR = new File(System.getProperty("java.io.tmpdir")); diff --git a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java index ec81cab03e..d739a3af1c 100644 --- a/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java +++ b/spring-webflux/src/test/java/org/springframework/web/reactive/socket/WebSocketIntegrationTests.java @@ -50,7 +50,7 @@ import static org.assertj.core.api.Assertions.assertThat; * @author Sam Brannen * @author Brian Clozel */ -class WebSocketIntegrationTests extends AbstractWebSocketIntegrationTests { +class WebSocketIntegrationTests extends AbstractReactiveWebSocketIntegrationTests { private static final Log logger = LogFactory.getLog(WebSocketIntegrationTests.class);