Browse Source

Clean up "abstract" test issues

- Deleted empty AbstractWebSocketClientTests class.

 - AbstractServletHandlerMethodTests and AbstractHttpRequestTests are
   now actually declared as abstract.

 - The following classes are not abstract but currently have an
   "Abstract" prefix and therefore get ignored by the Gradle build.
   This commit renames each of these by deleting the "Abstract" prefix.

   - AbstractFlashMapManagerTests
   - AbstractMappingContentNegotiationStrategyTests
   - AbstractSockJsServiceTests
   - AbstractWebSocketHandlerRegistrationTests
pull/483/head
Sam Brannen 12 years ago
parent
commit
9891bdc7b4
  1. 5
      spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java
  2. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/mvc/method/annotation/AbstractServletHandlerMethodTests.java
  3. 2
      spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java
  4. 4
      spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java
  5. 2
      spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java
  6. 26
      spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java
  7. 6
      spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java
  8. 4
      spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java

5
spring-web/src/test/java/org/springframework/web/accept/AbstractMappingContentNegotiationStrategyTests.java → spring-web/src/test/java/org/springframework/web/accept/MappingContentNegotiationStrategyTests.java

@ -1,5 +1,5 @@ @@ -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 @@ @@ -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; @@ -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() {

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

2
spring-webmvc/src/test/java/org/springframework/web/servlet/support/AbstractFlashMapManagerTests.java → spring-webmvc/src/test/java/org/springframework/web/servlet/support/FlashMapManagerTests.java

@ -40,7 +40,7 @@ import static org.junit.Assert.*; @@ -40,7 +40,7 @@ import static org.junit.Assert.*;
*
* @author Rossen Stoyanchev
*/
public class AbstractFlashMapManagerTests {
public class FlashMapManagerTests {
private TestFlashMapManager flashMapManager;

4
spring-websocket/src/test/java/org/springframework/web/socket/AbstractHttpRequestTests.java

@ -1,5 +1,5 @@ @@ -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; @@ -30,7 +30,7 @@ import org.springframework.mock.web.test.MockHttpServletResponse;
*
* @author Rossen Stoyanchev
*/
public class AbstractHttpRequestTests {
public abstract class AbstractHttpRequestTests {
protected ServerHttpRequest request;

2
spring-websocket/src/test/java/org/springframework/web/socket/WebSocketIntegrationTests.java

@ -5,7 +5,7 @@ @@ -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,

26
spring-websocket/src/test/java/org/springframework/web/socket/client/AbstractWebSocketClientTests.java

@ -1,26 +0,0 @@ @@ -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 {
}

6
spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/AbstractWebSocketHandlerRegistrationTests.java → spring-websocket/src/test/java/org/springframework/web/socket/config/annotation/WebSocketHandlerRegistrationTests.java

@ -1,11 +1,11 @@ @@ -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.*; @@ -42,7 +42,7 @@ import static org.junit.Assert.*;
*
* @author Rossen Stoyanchev
*/
public class AbstractWebSocketHandlerRegistrationTests {
public class WebSocketHandlerRegistrationTests {
private TestWebSocketHandlerRegistration registration;

4
spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/AbstractSockJsServiceTests.java → spring-websocket/src/test/java/org/springframework/web/socket/sockjs/support/SockJsServiceTests.java

@ -5,7 +5,7 @@ @@ -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.*; @@ -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;
Loading…
Cancel
Save