Clean up warnings and tests in spring-core

sbrannen · sbrannen · commit a3e7848a30f2 · 2015-08-20T15:49:33.000+02:00
diff --git a/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java b/spring-core/src/main/java/org/springframework/core/env/AbstractEnvironment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -364,7 +364,7 @@ public MutablePropertySources getPropertySources() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Map<String, Object> getSystemEnvironment() {
 		if (suppressGetenvAccess()) {
 			return Collections.emptyMap();
@@ -408,7 +408,7 @@ protected boolean suppressGetenvAccess() {
 	}
 
 	@Override
-	@SuppressWarnings("unchecked")
+	@SuppressWarnings({ "unchecked", "rawtypes" })
 	public Map<String, Object> getSystemProperties() {
 		try {
 			return (Map) System.getProperties();
diff --git a/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java b/spring-core/src/main/java/org/springframework/util/concurrent/ListenableFutureCallbackRegistry.java
@@ -91,7 +91,6 @@ public void addSuccessCallback(SuccessCallback<? super T> callback) {
 	 * @param callback the failure callback to add
 	 * @since 4.1
 	 */
-	@SuppressWarnings("unchecked")
 	public void addFailureCallback(FailureCallback callback) {
 		Assert.notNull(callback, "'callback' must not be null");
 		synchronized (this.mutex) {
diff --git a/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java b/spring-core/src/test/java/org/springframework/core/BridgeMethodResolverTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -42,6 +42,7 @@
  * @author Juergen Hoeller
  * @author Chris Beams
  */
+@SuppressWarnings("rawtypes")
 public class BridgeMethodResolverTests {
 
 	private static TypeVariable<?> findTypeVariable(Class<?> clazz, String name) {
diff --git a/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java b/spring-core/src/test/java/org/springframework/core/ExceptionDepthComparatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -26,6 +26,7 @@
  * @author Juergen Hoeller
  * @author Chris Shepperd
  */
+@SuppressWarnings("unchecked")
 public class ExceptionDepthComparatorTests {
 
 	@Test
diff --git a/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java b/spring-core/src/test/java/org/springframework/core/GenericTypeResolverTests.java
@@ -36,6 +36,7 @@
  * @author Juergen Hoeller
  * @author Sam Brannen
  */
+@SuppressWarnings({ "unchecked", "rawtypes" })
 public class GenericTypeResolverTests {
 
 	@Test
@@ -160,15 +161,15 @@ public void getGenericsOnArrayFromParamCannotBeResolved() throws Exception {
 		MethodParameter methodParameter = MethodParameter.forMethodOrConstructor(
 				WithArrayBase.class.getDeclaredMethod("array", Object[].class), 0);
 		Class<?> resolved = GenericTypeResolver.resolveParameterType(methodParameter, WithArray.class);
-		assertThat(resolved, equalTo((Class) Object[].class));
+		assertThat(resolved, equalTo((Class<?>) Object[].class));
 	}
 
 	@Test
 	public void getGenericsOnArrayFromReturnCannotBeResolved() throws Exception {
 		// SPR-11044
 		Class<?> resolved = GenericTypeResolver.resolveReturnType(
 				WithArrayBase.class.getDeclaredMethod("array", Object[].class), WithArray.class);
-		assertThat(resolved, equalTo((Class) Object[].class));
+		assertThat(resolved, equalTo((Class<?>) Object[].class));
 	}
 
 	@Test
@@ -214,7 +215,6 @@ public Object object() {
 			return null;
 		}
 
-		@SuppressWarnings("rawtypes")
 		public MyInterfaceType raw() {
 			return null;
 		}
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -343,7 +343,7 @@ public static enum MyEnum {A, B, C}
 
 	public List<String> strings;
 
-	public List list = Collections.emptyList();
+	public List<?> list = Collections.emptyList();
 
 	public Collection<?> wildcardCollection = Collections.emptyList();
 
diff --git a/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java b/spring-core/src/test/java/org/springframework/core/convert/support/MapToMapConverterTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2014 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -278,6 +278,7 @@ public static enum MyEnum {A, B, C}
 
 	public MultiValueMap<String, String> multiValueMapTarget;
 
+	@SuppressWarnings("rawtypes")
 	public Map notGenericMapSource;
 
 	public EnumMap<MyEnum, Integer> enumMap;
diff --git a/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/spring-core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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,6 +30,7 @@
 /**
  * @author Keith Donald
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class ToStringCreatorTests extends TestCase {
 
 	private SomeObject s1, s2, s3;
diff --git a/spring-core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java b/spring-core/src/test/java/org/springframework/core/type/ClassloadingAssertions.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2007 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -17,29 +17,27 @@
 
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
-
 import org.springframework.util.ClassUtils;
 import org.springframework.util.ReflectionUtils;
 
+import static org.junit.Assert.*;
+
 /**
- *
  * @author Ramnivas Laddad
- *
+ * @author Sam Brannen
  */
-public class ClassloadingAssertions {
-	public static boolean isClassLoaded(String className) {
+abstract class ClassloadingAssertions {
+
+	private static boolean isClassLoaded(String className) {
 		ClassLoader cl = ClassUtils.getDefaultClassLoader();
-		Method findLoadeClassMethod = ReflectionUtils.findMethod(cl.getClass(), "findLoadedClass", new Class[]{String.class});
-		findLoadeClassMethod.setAccessible(true);
-		Class loadedClass = (Class)ReflectionUtils.invokeMethod(findLoadeClassMethod, cl, new Object[]{className});
+		Method findLoadeClassMethod = ReflectionUtils.findMethod(cl.getClass(), "findLoadedClass", new Class[] { String.class });
+		ReflectionUtils.makeAccessible(findLoadeClassMethod);
+		Class<?> loadedClass = (Class<?>) ReflectionUtils.invokeMethod(findLoadeClassMethod, cl, new Object[] { className });
 		return loadedClass != null;
 	}
 
-	public static void assertClassLoaded(String className) {
-	}
-
 	public static void assertClassNotLoaded(String className) {
-		TestCase.assertFalse("Class shouldn't have been loaded", isClassLoaded(className));
+		assertFalse("Class [" + className + "] should not have been loaded", isClassLoaded(className));
 	}
+
 }
diff --git a/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java b/spring-core/src/test/java/org/springframework/util/AutoPopulatingListTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -18,29 +18,35 @@
 
 import java.util.LinkedList;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 import org.springframework.tests.sample.objects.TestObject;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
-public class AutoPopulatingListTests extends TestCase {
+public class AutoPopulatingListTests {
 
-	public void testWithClass() throws Exception {
+	@Test
+	public void withClass() throws Exception {
 		doTestWithClass(new AutoPopulatingList<Object>(TestObject.class));
 	}
 
-	public void testWithClassAndUserSuppliedBackingList() throws Exception {
+	@Test
+	public void withClassAndUserSuppliedBackingList() throws Exception {
 		doTestWithClass(new AutoPopulatingList<Object>(new LinkedList<Object>(), TestObject.class));
 	}
 
-	public void testWithElementFactory() throws Exception {
+	@Test
+	public void withElementFactory() throws Exception {
 		doTestWithElementFactory(new AutoPopulatingList<Object>(new MockElementFactory()));
 	}
 
-	public void testWithElementFactoryAndUserSuppliedBackingList() throws Exception {
+	@Test
+	public void withElementFactoryAndUserSuppliedBackingList() throws Exception {
 		doTestWithElementFactory(new AutoPopulatingList<Object>(new LinkedList<Object>(), new MockElementFactory()));
 	}
 
@@ -76,13 +82,14 @@ private void doTestWithElementFactory(AutoPopulatingList<Object> list) {
 		}
 	}
 
-	public void testSerialization() throws Exception {
+	@Test
+	public void serialization() throws Exception {
 		AutoPopulatingList<?> list = new AutoPopulatingList<Object>(TestObject.class);
 		assertEquals(list, SerializationTestUtils.serializeAndDeserialize(list));
 	}
 
 
-	private static class MockElementFactory implements AutoPopulatingList.ElementFactory {
+	private static class MockElementFactory implements AutoPopulatingList.ElementFactory<Object> {
 
 		@Override
 		public Object createElement(int index) {
diff --git a/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java b/spring-core/src/test/java/org/springframework/util/ClassUtilsTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2013 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -44,6 +44,7 @@
  * @author Rob Harrop
  * @author Rick Evans
  */
+@SuppressWarnings({ "rawtypes", "unchecked" })
 public class ClassUtilsTests {
 
 	private ClassLoader classLoader = getClass().getClassLoader();
diff --git a/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/spring-core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2015 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.
@@ -19,49 +19,62 @@
 import java.io.FileNotFoundException;
 import java.net.URL;
 
-import junit.framework.TestCase;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
+
+import static org.junit.Assert.*;
 
 /**
  * @author Alef Arendsen
  * @author Juergen Hoeller
+ * @author Sam Brannen
  */
-public class Log4jConfigurerTests extends TestCase {
+public class Log4jConfigurerTests {
 
-	public void testInitLoggingWithClasspath() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithClasspath() throws FileNotFoundException {
 		doTestInitLogging("classpath:org/springframework/util/testlog4j.properties", false);
 	}
 
-	public void testInitLoggingWithRelativeFilePath() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithRelativeFilePath() throws FileNotFoundException {
 		doTestInitLogging("src/test/resources/org/springframework/util/testlog4j.properties", false);
 	}
 
-	public void testInitLoggingWithAbsoluteFilePath() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithAbsoluteFilePath() throws FileNotFoundException {
 		URL url = getClass().getResource("testlog4j.properties");
 		doTestInitLogging(url.toString(), false);
 	}
 
-	public void testInitLoggingWithClasspathAndRefreshInterval() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithClasspathAndRefreshInterval() throws FileNotFoundException {
 		doTestInitLogging("classpath:org/springframework/util/testlog4j.properties", true);
 	}
 
-	public void testInitLoggingWithRelativeFilePathAndRefreshInterval() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithRelativeFilePathAndRefreshInterval() throws FileNotFoundException {
 		doTestInitLogging("src/test/resources/org/springframework/util/testlog4j.properties", true);
 	}
 
-	/* only works on Windows
-	public void testInitLoggingWithAbsoluteFilePathAndRefreshInterval() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithAbsoluteFilePathAndRefreshInterval() throws FileNotFoundException {
 		URL url = getClass().getResource("testlog4j.properties");
 		doTestInitLogging(url.getFile(), true);
 	}
-	*/
 
-	public void testInitLoggingWithFileUrlAndRefreshInterval() throws FileNotFoundException {
+	@Test
+	public void initLoggingWithFileUrlAndRefreshInterval() throws FileNotFoundException {
 		URL url = getClass().getResource("testlog4j.properties");
 		doTestInitLogging(url.toString(), true);
 	}
 
+	@Test(expected = FileNotFoundException.class)
+	public void initLoggingWithRefreshIntervalAndFileNotFound() throws FileNotFoundException {
+		Log4jConfigurer.initLogging("test/org/springframework/util/bla.properties", 10);
+	}
+
 	private void doTestInitLogging(String location, boolean refreshInterval) throws FileNotFoundException {
 		if (refreshInterval) {
 			Log4jConfigurer.initLogging(location, 10);
@@ -87,14 +100,5 @@ private void doTestInitLogging(String location, boolean refreshInterval) throws
 		assertTrue(MockLog4jAppender.closeCalled);
 	}
 
-	public void testInitLoggingWithRefreshIntervalAndFileNotFound() throws FileNotFoundException {
-		try {
-			Log4jConfigurer.initLogging("test/org/springframework/util/bla.properties", 10);
-			fail("Exception should have been thrown, file does not exist!");
-		}
-		catch (FileNotFoundException ex) {
-			// OK
-		}
-	}
-
 }
+
diff --git a/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java b/spring-core/src/test/java/org/springframework/util/MockLog4jAppender.java
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/ListenableFutureTaskTests.java
diff --git a/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java b/spring-core/src/test/java/org/springframework/util/concurrent/SettableListenableFutureTests.java
diff --git a/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java b/spring-core/src/test/java/org/springframework/util/xml/SimpleNamespaceContextTests.java
