diff --git a/spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java b/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java similarity index 96% rename from spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java rename to spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java index 9888177413d..f4b9f25bc9d 100644 --- a/spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java +++ b/spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2012 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,6 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ + package org.springframework.web.accept; import static org.junit.Assert.assertEquals; @@ -31,7 +32,7 @@ import org.springframework.web.context.request.NativeWebRequest; * @author Rossen Stoyanchev * @since 3.2 */ -public class AbstractMappingContentNegotiationStrategyTests { +public class MappingContentNegotiationStrategyTests { @Test public void resolveMediaTypes() { diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java index 228ead8c9ba..3bf7e5e0290 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java @@ -40,7 +40,7 @@ import org.springframework.web.servlet.mvc.support.DefaultHandlerExceptionResolv * * @author Rossen Stoyanchev */ -public class AbstractServletHandlerMethodTests { +public abstract class AbstractServletHandlerMethodTests { private DispatcherServlet servlet; diff --git a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java similarity index 99% rename from spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java rename to spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java index 7385f52da8b..a76dd3b1caa 100644 --- a/spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java +++ b/spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java @@ -40,7 +40,7 @@ import static org.junit.Assert.*; * * @author Rossen Stoyanchev */ -public class AbstractFlashMapManagerTests { +public class FlashMapManagerTests { private TestFlashMapManager flashMapManager; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java index 10a2c051c60..dfe4aa2c3c7 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -30,7 +30,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse; * * @author Rossen Stoyanchev */ -public class AbstractHttpRequestTests { +public abstract class AbstractHttpRequestTests { protected ServerHttpRequest request; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java index b5b35c4c8a1..c41708f044f 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java deleted file mode 100644 index f229172529a..00000000000 --- a/spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java +++ /dev/null @@ -1,26 +0,0 @@ -/* - * Copyright 2002-2013 the original author or authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.springframework.web.socket.client; - - -/** - * Test fixture for {@link AbstractWebSocketClient}. - * @author Rossen Stoyanchev - */ -public class AbstractWebSocketClientTests { - -} diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java similarity index 97% rename from spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java index 745b9b7b5f5..4d96a531f65 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java @@ -1,11 +1,11 @@ /* - * Copyright 2002-2013 the original author or authors. + * Copyright 2002-2014 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -42,7 +42,7 @@ import static org.junit.Assert.*; * * @author Rossen Stoyanchev */ -public class AbstractWebSocketHandlerRegistrationTests { +public class WebSocketHandlerRegistrationTests { private TestWebSocketHandlerRegistration registration; diff --git a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java similarity index 98% rename from spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java rename to spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java index 51788967d81..aa6f95b5fe1 100644 --- a/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java +++ b/spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java @@ -5,7 +5,7 @@ * you may not use this file except in compliance with the License. * You may obtain a copy of the License at * - * http://www.apache.org/licenses/LICENSE-2.0 + * http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by applicable law or agreed to in writing, software * distributed under the License is distributed on an "AS IS" BASIS, @@ -36,7 +36,7 @@ import static org.junit.Assert.*; * * @author Rossen Stoyanchev */ -public class AbstractSockJsServiceTests extends AbstractHttpRequestTests { +public class SockJsServiceTests extends AbstractHttpRequestTests { private TestSockJsService service;