diff --git a/org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java b/org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
index 62a22cbf5c..6d38318b21 100644
--- a/org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
+++ b/org.springframework.context/src/test/java/org/springframework/context/annotation/ImportAwareTests.java
@@ -121,12 +121,10 @@ public class ImportAwareTests {
 	static class BPP implements BeanFactoryAware, BeanPostProcessor {
 
 		public Object postProcessBeforeInitialization(Object bean, String beanName) throws BeansException {
-			// TODO Auto-generated method stub
 			return bean;
 		}
 
 		public Object postProcessAfterInitialization(Object bean, String beanName) throws BeansException {
-			// TODO Auto-generated method stub
 			return bean;
 		}
 
diff --git a/org.springframework.context/src/test/java/test/beans/Colour.java b/org.springframework.context/src/test/java/test/beans/Colour.java
index 140a4dee31..193531bcbd 100644
--- a/org.springframework.context/src/test/java/test/beans/Colour.java
+++ b/org.springframework.context/src/test/java/test/beans/Colour.java
@@ -17,13 +17,10 @@ package test.beans;
 
 import org.springframework.core.enums.ShortCodedLabeledEnum;
 
-
 /**
- * TODO: JAVADOC
- * 
  * @author Rob Harrop
  */
-@SuppressWarnings("serial")
+@SuppressWarnings({ "serial", "deprecation" })
 public class Colour extends ShortCodedLabeledEnum {
 
 	public static final Colour RED = new Colour(0, "RED");
diff --git a/org.springframework.context/src/test/java/test/beans/CustomScope.java b/org.springframework.context/src/test/java/test/beans/CustomScope.java
index fe9ee5c5af..b047ae29c0 100644
--- a/org.springframework.context/src/test/java/test/beans/CustomScope.java
+++ b/org.springframework.context/src/test/java/test/beans/CustomScope.java
@@ -21,7 +21,6 @@ import java.util.Map;
 import org.springframework.beans.factory.ObjectFactory;
 import org.springframework.beans.factory.config.Scope;
 
-
 /**
  * Simple scope implementation which creates object based on a flag.
  *
@@ -34,11 +33,6 @@ public class CustomScope implements Scope {
 
 	private Map<String, Object> beans = new HashMap<String, Object>();
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#get(java.lang.String,
-	 * org.springframework.beans.factory.ObjectFactory)
-	 */
 	public Object get(String name, ObjectFactory<?> objectFactory) {
 		if (createNewScope) {
 			beans.clear();
@@ -56,33 +50,19 @@ public class CustomScope implements Scope {
 		return beans.get(name);
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#getConversationId()
-	 */
 	public String getConversationId() {
 		return null;
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#registerDestructionCallback(java.lang.String,
-	 * java.lang.Runnable)
-	 */
 	public void registerDestructionCallback(String name, Runnable callback) {
 		// do nothing
 	}
 
-	/*
-	 * (non-Javadoc)
-	 * @see org.springframework.beans.factory.config.Scope#remove(java.lang.String)
-	 */
 	public Object remove(String name) {
 		return beans.remove(name);
 	}
 
 	public Object resolveContextualObject(String key) {
-		// TODO Auto-generated method stub
 		return null;
 	}
 
diff --git a/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java b/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java
index 9ef108f017..d784bae712 100644
--- a/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java
+++ b/org.springframework.context/src/test/java/test/beans/DependsOnTestBean.java
@@ -15,9 +15,8 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public class DependsOnTestBean {
+
 	public TestBean tb;
 
 	private int state;
diff --git a/org.springframework.context/src/test/java/test/beans/INestedTestBean.java b/org.springframework.context/src/test/java/test/beans/INestedTestBean.java
index 0d47fb8fe8..4cdf0cfc5c 100644
--- a/org.springframework.context/src/test/java/test/beans/INestedTestBean.java
+++ b/org.springframework.context/src/test/java/test/beans/INestedTestBean.java
@@ -15,8 +15,6 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public interface INestedTestBean {
 
 	String getCompany();
diff --git a/org.springframework.context/src/test/java/test/beans/IOther.java b/org.springframework.context/src/test/java/test/beans/IOther.java
index b3cc9fff15..cfd81f2bad 100644
--- a/org.springframework.context/src/test/java/test/beans/IOther.java
+++ b/org.springframework.context/src/test/java/test/beans/IOther.java
@@ -15,8 +15,6 @@
  */
 package test.beans;
 
-
-/** TODO: JAVADOC */
 public interface IOther {
 
 	void absquatulate();
diff --git a/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java b/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java
index 95ea56d519..8cef5b2321 100644
--- a/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java
+++ b/org.springframework.context/src/test/java/test/beans/IndexedTestBean.java
@@ -27,8 +27,6 @@ import java.util.TreeSet;
 
 
 /**
- * TODO: JAVADOC
- * 
  * @author Juergen Hoeller
  * @since 11.11.2003
  */
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java b/org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
index 141b86515c..d302855119 100644
--- a/org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/core/convert/TypeDescriptorTests.java
@@ -41,6 +41,7 @@ import static org.junit.Assert.assertNull;
  * @author Keith Donald
  * @author Andy Clement
  */
+@SuppressWarnings("rawtypes")
 public class TypeDescriptorTests {
 
 	public List<String> listOfString;
@@ -204,7 +205,7 @@ public class TypeDescriptorTests {
 
 	@Test
 	public void propertyComplex() throws Exception {
-		Property property = new Property(getClass(), getClass().getMethod("getComplexProperty", null), getClass().getMethod("setComplexProperty", Map.class));		
+		Property property = new Property(getClass(), getClass().getMethod("getComplexProperty"), getClass().getMethod("setComplexProperty", Map.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(String.class, desc.getMapKeyTypeDescriptor().getType());
 		assertEquals(Integer.class, desc.getMapValueTypeDescriptor().getElementTypeDescriptor().getElementTypeDescriptor().getType());
@@ -221,7 +222,7 @@ public class TypeDescriptorTests {
 	@Test
 	public void propertyGenericType() throws Exception {
 		GenericType<Integer> genericBean = new IntegerType();
-		Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty", null), genericBean.getClass().getMethod("setProperty", Integer.class));		
+		Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty"), genericBean.getClass().getMethod("setProperty", Integer.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(Integer.class, desc.getType());
 	}
@@ -229,7 +230,7 @@ public class TypeDescriptorTests {
 	@Test
 	public void propertyTypeCovariance() throws Exception {
 		GenericType<Number> genericBean = new NumberType();
-		Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty", null), genericBean.getClass().getMethod("setProperty", Number.class));		
+		Property property = new Property(getClass(), genericBean.getClass().getMethod("getProperty"), genericBean.getClass().getMethod("setProperty", Number.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(Integer.class, desc.getType());
 	}
@@ -237,7 +238,7 @@ public class TypeDescriptorTests {
 	@Test
 	public void propertyGenericTypeList() throws Exception {
 		GenericType<Integer> genericBean = new IntegerType();
-		Property property = new Property(getClass(), genericBean.getClass().getMethod("getListProperty", null), genericBean.getClass().getMethod("setListProperty", List.class));		
+		Property property = new Property(getClass(), genericBean.getClass().getMethod("getListProperty"), genericBean.getClass().getMethod("setListProperty", List.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(List.class, desc.getType());
 		assertEquals(Integer.class, desc.getElementTypeDescriptor().getType());
@@ -257,25 +258,18 @@ public class TypeDescriptorTests {
 	public class IntegerType implements GenericType<Integer> {
 
 		public Integer getProperty() {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public void setProperty(Integer t) {
-			// TODO Auto-generated method stub
-			
 		}
 
 		public List<Integer> getListProperty() {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public void setListProperty(List<Integer> t) {
-			// TODO Auto-generated method stub
-			
 		}
-		
 	}
 
 	public class NumberType implements GenericType<Number> {
@@ -298,7 +292,7 @@ public class TypeDescriptorTests {
 	@Test
 	public void propertyGenericClassList() throws Exception {
 		IntegerClass genericBean = new IntegerClass();
-		Property property = new Property(genericBean.getClass(), genericBean.getClass().getMethod("getListProperty", null), genericBean.getClass().getMethod("setListProperty", List.class));		
+		Property property = new Property(genericBean.getClass(), genericBean.getClass().getMethod("getListProperty"), genericBean.getClass().getMethod("setListProperty", List.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(List.class, desc.getType());
 		assertEquals(Integer.class, desc.getElementTypeDescriptor().getType());
@@ -330,7 +324,7 @@ public class TypeDescriptorTests {
 
 	@Test
 	public void property() throws Exception {
-		Property property = new Property(getClass(), getClass().getMethod("getProperty", null), getClass().getMethod("setProperty", Map.class));		
+		Property property = new Property(getClass(), getClass().getMethod("getProperty"), getClass().getMethod("setProperty", Map.class));		
 		TypeDescriptor desc = new TypeDescriptor(property);
 		assertEquals(Map.class, desc.getType());
 		assertEquals(Integer.class, desc.getMapKeyTypeDescriptor().getElementTypeDescriptor().getType());
@@ -600,7 +594,7 @@ public class TypeDescriptorTests {
 
 	@Test
 	public void nestedPropertyTypeMapTwoLevels() throws Exception {
-		Property property = new Property(getClass(), getClass().getMethod("getTest4", null), getClass().getMethod("setTest4", List.class));
+		Property property = new Property(getClass(), getClass().getMethod("getTest4"), getClass().getMethod("setTest4", List.class));
 		TypeDescriptor t1 = TypeDescriptor.nested(property, 2);
 		assertEquals(String.class, t1.getType());
 	}
@@ -804,22 +798,4 @@ public class TypeDescriptorTests {
 
 	public Map<CharSequence, Number> isAssignableMapKeyValueTypes;
 
-	private void assignabilityExamples() {
-		Number num = null;
-		Integer integer = null;
-		num = integer;
-		
-		List list = null;
-		List<String> listString = null;
-		list = listString;
-		listString = list;
-
-		Map map = null;
-		Map<String, String> mapString = null;
-		map = mapString;
-		mapString = map;
-
-		Map<String, String> mapString2 = null;
-		mapString = mapString2;
-	}
 }
diff --git a/org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java b/org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
index aad03be80f..85061cdbd2 100644
--- a/org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/core/convert/support/CollectionToCollectionConverterTests.java
@@ -116,6 +116,7 @@ public class CollectionToCollectionConverterTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void arrayCollectionToObjectInteraction() throws Exception {
 		List<String>[] array = new List[2];
 		array[0] = Arrays.asList("9", "12");
@@ -127,6 +128,7 @@ public class CollectionToCollectionConverterTests {
 	}
 
 	@Test
+	@SuppressWarnings("unchecked")
 	public void objectToCollection() throws Exception {
 		List<List<String>> list = new ArrayList<List<String>>();
 		list.add(Arrays.asList("9", "12"));
@@ -147,6 +149,7 @@ public class CollectionToCollectionConverterTests {
 	public List<List<List<Integer>>> objectToCollection;
 	
 	@Test
+	@SuppressWarnings("unchecked")
 	public void stringToCollection() throws Exception {
 		List<List<String>> list = new ArrayList<List<String>>();
 		list.add(Arrays.asList("9,12"));
@@ -220,62 +223,50 @@ public class CollectionToCollectionConverterTests {
 	public static abstract class BaseResource implements Resource {
 
 		public InputStream getInputStream() throws IOException {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public boolean exists() {
-			// TODO Auto-generated method stub
 			return false;
 		}
 
 		public boolean isReadable() {
-			// TODO Auto-generated method stub
 			return false;
 		}
 
 		public boolean isOpen() {
-			// TODO Auto-generated method stub
 			return false;
 		}
 
 		public URL getURL() throws IOException {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public URI getURI() throws IOException {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public File getFile() throws IOException {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public long contentLength() throws IOException {
-			// TODO Auto-generated method stub
 			return 0;
 		}
 
 		public long lastModified() throws IOException {
-			// TODO Auto-generated method stub
 			return 0;
 		}
 
 		public Resource createRelative(String relativePath) throws IOException {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public String getFilename() {
-			// TODO Auto-generated method stub
 			return null;
 		}
 
 		public String getDescription() {
-			// TODO Auto-generated method stub
 			return null;
 		}
 	}
@@ -298,6 +289,7 @@ public class CollectionToCollectionConverterTests {
 		testCollectionConversionToArrayList(vector);
 	}
 
+	@SuppressWarnings("rawtypes")
 	private void testCollectionConversionToArrayList(Collection<String> aSource) {
 		Object myConverted = (new CollectionToCollectionConverter(new GenericConversionService())).convert(
 				aSource, TypeDescriptor.forObject(aSource), TypeDescriptor.forObject(new ArrayList()));