Upgrade Web Flow tests from JUnit 3 to 4

Remove `extends TestCase` from all test classes and add `@Before`,
`@After`, and `@Test` method annotations.

Note that class `JsfUtilsTests` still indirectly inherits from
`TestCase` via `org.apache.myfaces.test.base.AbstractJsfTestCase`.

Issue: SWF-1739

spring-binding/src/test/java/org/springframework/binding/collection/MapAccessorTests.java

@@ -1,14 +1,18 @@
 package org.springframework.binding.collection;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.HashMap;
 import java.util.Map;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
 
-public class MapAccessorTests extends TestCase {
+public class MapAccessorTests {
 	private MapAccessor<String, Object> accessor;
 
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() {
 		Map<String, Object> map = new HashMap<>();
 		map.put("string", "hello");
 		map.put("integer", 9);
@@ -16,6 +20,7 @@ public class MapAccessorTests extends TestCase {
 		this.accessor = new MapAccessor<>(map);
 	}
 
+	@Test
 	public void testAccessNullAttribute() {
 		assertEquals(null, accessor.get("null"));
 		assertEquals(null, accessor.get("null", "something else"));
@@ -28,16 +33,19 @@ public class MapAccessorTests extends TestCase {
 		assertEquals(null, accessor.getRequiredCollection("null"));
 	}
 
+	@Test
 	public void testGetString() {
 		assertEquals("hello", accessor.getString("string"));
 		assertEquals("hello", accessor.getRequiredString("string"));
 	}
 
+	@Test
 	public void testGetInteger() {
 		assertEquals(new Integer(9), accessor.getInteger("integer"));
 		assertEquals(new Integer(9), accessor.getRequiredInteger("integer"));
 	}
 
+	@Test
 	public void testGetRequiredMissingKey() {
 		try {
 			accessor.getRequired("bogus");

spring-binding/src/test/java/org/springframework/binding/collection/SharedMapDecoratorTests.java

@@ -15,21 +15,28 @@
  */
 package org.springframework.binding.collection;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Unit tests for {@link org.springframework.binding.collection.SharedMapDecorator}.
  */
-public class SharedMapDecoratorTests extends TestCase {
+public class SharedMapDecoratorTests {
 
 	private SharedMapDecorator<String, String> map = new SharedMapDecorator<>(
 			new HashMap<>());
 
+	@Test
 	public void testGetPutRemove() {
 		assertTrue(map.size() == 0);
 		assertTrue(map.isEmpty());
@@ -47,6 +54,7 @@ public class SharedMapDecoratorTests extends TestCase {
 		assertNull(map.get("foo"));
 	}
 
+	@Test
 	public void testPutAll() {
 		Map<String, String> all = new HashMap<>();
 		all.put("foo", "bar");
@@ -55,6 +63,7 @@ public class SharedMapDecoratorTests extends TestCase {
 		assertTrue(map.size() == 2);
 	}
 
+	@Test
 	public void testEntrySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
@@ -62,6 +71,7 @@ public class SharedMapDecoratorTests extends TestCase {
 		assertTrue(entrySet.size() == 2);
 	}
 
+	@Test
 	public void testKeySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
@@ -69,6 +79,7 @@ public class SharedMapDecoratorTests extends TestCase {
 		assertTrue(keySet.size() == 2);
 	}
 
+	@Test
 	public void testValues() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");

spring-binding/src/test/java/org/springframework/binding/collection/StringKeyedMapAdapterTests.java

@@ -15,18 +15,24 @@
  */
 package org.springframework.binding.collection;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Unit tests for {@link org.springframework.binding.collection.StringKeyedMapAdapter}.
  */
-public class StringKeyedMapAdapterTests extends TestCase {
+public class StringKeyedMapAdapterTests {
 
 	private Map<String, String> contents = new HashMap<>();
 
@@ -49,6 +55,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
 		}
 	};
 
+	@Test
 	public void testGetPutRemove() {
 		assertTrue(map.size() == 0);
 		assertTrue(map.isEmpty());
@@ -66,6 +73,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
 		assertNull(map.get("foo"));
 	}
 
+	@Test
 	public void testPutAll() {
 		Map<String, String> all = new HashMap<>();
 		all.put("foo", "bar");
@@ -74,6 +82,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
 		assertTrue(map.size() == 2);
 	}
 
+	@Test
 	public void testEntrySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
@@ -81,6 +90,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
 		assertTrue(entrySet.size() == 2);
 	}
 
+	@Test
 	public void testKeySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
@@ -88,6 +98,7 @@ public class StringKeyedMapAdapterTests extends TestCase {
 		assertTrue(keySet.size() == 2);
 	}
 
+	@Test
 	public void testValues() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");

spring-binding/src/test/java/org/springframework/binding/convert/service/DefaultConversionServiceTests.java

@@ -15,6 +15,11 @@
  */
 package org.springframework.binding.convert.service;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.security.Principal;
 import java.util.AbstractList;
 import java.util.ArrayList;
@@ -27,8 +32,7 @@ import java.util.Locale;
 import java.util.Set;
 import java.util.StringTokenizer;
 
-import junit.framework.TestCase;
-
+import org.junit.Test;
 import org.springframework.binding.convert.ConversionException;
 import org.springframework.binding.convert.ConversionExecutionException;
 import org.springframework.binding.convert.ConversionExecutor;
@@ -45,14 +49,16 @@ import org.springframework.binding.format.DefaultNumberFormatFactory;
  * 
  * @author Keith Donald
  */
-public class DefaultConversionServiceTests extends TestCase {
+public class DefaultConversionServiceTests {
 
+	@Test
 	public void testConvertCompatibleTypes() {
 		DefaultConversionService service = new DefaultConversionService();
 		List<Object> lst = new ArrayList<>();
 		assertSame(lst, service.getConversionExecutor(ArrayList.class, List.class).execute(lst));
 	}
 
+	@Test
 	public void testOverrideConverter() {
 		Converter customConverter = new StringToBoolean("ja", "nee");
 		DefaultConversionService service = new DefaultConversionService();
@@ -69,6 +75,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertTrue(((Boolean) executor.execute("ja")));
 	}
 
+	@Test
 	public void testTargetClassNotSupported() {
 		DefaultConversionService service = new DefaultConversionService();
 		try {
@@ -78,6 +85,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testValidConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String.class, Integer.class);
@@ -89,6 +97,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", threeString);
 	}
 
+	@Test
 	public void testRegisterConverter() {
 		GenericConversionService service = new GenericConversionService();
 		FormattedStringToNumber converter = new FormattedStringToNumber();
@@ -104,6 +113,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3,000", string);
 	}
 
+	@Test
 	public void testRegisterCustomConverter() {
 		DefaultConversionService service = new DefaultConversionService();
 		FormattedStringToNumber converter = new FormattedStringToNumber();
@@ -119,6 +129,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3,000", string);
 	}
 
+	@Test
 	public void testRegisterCustomConverterForSameType() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("trimmer", new Trimmer());
@@ -126,6 +137,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("a string", executor.execute("a string   "));
 	}
 
+	@Test
 	public void testRegisterCustomConverterForSameTypeNotCompatibleSource() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("trimmer", new Trimmer());
@@ -136,6 +148,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testRegisterCustomConverterForSameTypeNotCompatibleTarget() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("trimmer", new Trimmer());
@@ -146,6 +159,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testRegisterCustomConverterReverseComparsion() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -157,6 +171,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}));
 	}
 
+	@Test
 	public void testRegisterCustomConverterReverseNotCompatibleSource() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -167,6 +182,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testRegisterCustomConverterArrayToArray() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -176,6 +192,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", p[1].getName());
 	}
 
+	@Test
 	public void testRegisterCustomConverterArrayToArrayReverse() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -195,6 +212,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", p[1]);
 	}
 
+	@Test
 	public void testRegisterCustomConverterArrayToArrayBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -205,6 +223,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterArrayToList() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -215,6 +234,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", (list.get(1)).getName());
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterArrayToListReverse() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -227,6 +247,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", p.get(1));
 	}
 
+	@Test
 	public void testRegisterCustomConverterArrayToListBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -238,6 +259,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testRegisterCustomConverterListToArray() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -250,6 +272,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", p[1].getName());
 	}
 
+	@Test
 	public void testRegisterCustomConverterListToArrayReverse() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -264,6 +287,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", p[1]);
 	}
 
+	@Test
 	public void testRegisterCustomConverterListToArrayBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -275,6 +299,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testRegisterCustomConverterObjectToArray() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -283,6 +308,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy1", p[0].getName());
 	}
 
+	@Test
 	public void testRegisterCustomConverterObjectToArrayReverse() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -292,6 +318,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy1", p[0]);
 	}
 
+	@Test
 	public void testRegisterCustomConverterObjectToArrayBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -303,6 +330,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterObjectToList() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -312,6 +340,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy1", list.get(0).getName());
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterCsvStringToList() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -322,6 +351,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", list.get(1).getName());
 	}
 
+	@Test
 	public void testRegisterCustomConverterObjectToListBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -334,6 +364,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterObjectToListReverse() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -344,6 +375,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy1", list.get(0));
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterListToList() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -357,6 +389,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", list.get(1).getName());
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testRegisterCustomConverterListToListReverse() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -372,6 +405,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("princy2", list.get(1));
 	}
 
+	@Test
 	public void testRegisterCustomConverterListToListBogus() {
 		DefaultConversionService service = new DefaultConversionService();
 		service.addConverter("princy", new CustomTwoWayConverter());
@@ -386,6 +420,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testConversionPrimitive() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String.class, int.class);
@@ -393,6 +428,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals(new Integer(3), three);
 	}
 
+	@Test
 	public void testArrayToArrayConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String[].class, Integer[].class);
@@ -402,6 +438,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals(new Integer(3), result[2]);
 	}
 
+	@Test
 	public void testArrayToArrayPrimitiveConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String[].class, int[].class);
@@ -411,6 +448,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals(3, result[2]);
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testArrayToListConversion() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -421,6 +459,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result.get(2));
 	}
 
+	@Test
 	public void testListToArrayConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(Collection.class, String[].class);
@@ -434,6 +473,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result[2]);
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testSetToListConversion() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -448,6 +488,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result.get(2));
 	}
 
+	@Test
 	public void testListToArrayConversionWithComponentConversion() {
 		try {
 			DefaultConversionService service = new DefaultConversionService();
@@ -470,6 +511,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testArrayToLinkedListConversion() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -480,6 +522,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result.get(2));
 	}
 
+	@Test
 	public void testArrayAbstractListConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		try {
@@ -489,6 +532,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testStringToArrayConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String.class, String[].class);
@@ -499,6 +543,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result[2]);
 	}
 
+	@Test
 	@SuppressWarnings("unchecked")
 	public void testStringToListConversion() {
 		DefaultConversionService service = new DefaultConversionService();
@@ -510,6 +555,7 @@ public class DefaultConversionServiceTests extends TestCase {
 		assertEquals("3", result.get(2));
 	}
 
+	@Test
 	public void testStringToArrayConversionWithElementConversion() {
 		DefaultConversionService service = new DefaultConversionService();
 		ConversionExecutor executor = service.getConversionExecutor(String.class, Integer[].class);

spring-binding/src/test/java/org/springframework/binding/convert/service/StaticConversionExecutorImplTests.java

@@ -15,26 +15,34 @@
  */
 package org.springframework.binding.convert.service;
 
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
 import java.util.Date;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.convert.ConversionExecutionException;
 import org.springframework.binding.convert.converters.StringToDate;
 
-public class StaticConversionExecutorImplTests extends TestCase {
+public class StaticConversionExecutorImplTests {
 
 	private StaticConversionExecutor conversionExecutor;
 
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		StringToDate stringToDate = new StringToDate();
 		conversionExecutor = new StaticConversionExecutor(String.class, Date.class, stringToDate);
 	}
 
+	@Test
 	public void testTypeConversion() {
 		assertTrue(conversionExecutor.execute("2008-10-10").getClass().equals(Date.class));
 	}
 
+	@Test
 	public void testAssignmentCompatibleTypeConversion() {
 		java.sql.Date date = new java.sql.Date(123L);
 		try {
@@ -45,10 +53,12 @@ public class StaticConversionExecutorImplTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testConvertNull() {
 		assertNull(conversionExecutor.execute(null));
 	}
 
+	@Test
 	public void testIllegalType() {
 		try {
 			conversionExecutor.execute(new StringBuilder());

spring-binding/src/test/java/org/springframework/binding/expression/beanwrapper/BeanWrapperExpressionParserTests.java

@@ -15,8 +15,13 @@
  */
 package org.springframework.binding.expression.beanwrapper;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import org.junit.Test;
 import org.springframework.beans.TypeMismatchException;
 import org.springframework.binding.convert.converters.StringToDate;
 import org.springframework.binding.convert.service.GenericConversionService;
@@ -25,12 +30,13 @@ import org.springframework.binding.expression.ParserException;
 import org.springframework.binding.expression.ValueCoercionException;
 import org.springframework.binding.expression.support.FluentParserContext;
 
-public class BeanWrapperExpressionParserTests extends TestCase {
+public class BeanWrapperExpressionParserTests {
 
 	private BeanWrapperExpressionParser parser = new BeanWrapperExpressionParser();
 
 	private TestBean bean = new TestBean();
 
+	@Test
 	public void testParseSimple() {
 		String exp = "flag";
 		Expression e = parser.parseExpression(exp, null);
@@ -39,6 +45,7 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		assertFalse(b);
 	}
 
+	@Test
 	public void testParseSimpleAllowDelimited() {
 		parser.setAllowDelimitedEvalExpressions(true);
 		String exp = "${flag}";
@@ -48,6 +55,7 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		assertFalse(b);
 	}
 
+	@Test
 	public void testParseSimpleDelimitedNotAllowed() {
 		String exp = "${flag}";
 		try {
@@ -57,6 +65,7 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseTemplateSimpleLiteral() {
 		String exp = "flag";
 		Expression e = parser.parseExpression(exp, new FluentParserContext().template());
@@ -64,12 +73,14 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		assertEquals("flag", e.getValue(bean));
 	}
 
+	@Test
 	public void testParseTemplateEmpty() {
 		Expression e = parser.parseExpression("", new FluentParserContext().template());
 		assertNotNull(e);
 		assertEquals("", e.getValue(bean));
 	}
 
+	@Test
 	public void testParseTemplateComposite() {
 		String exp = "hello ${flag} ${flag} ${flag}";
 		Expression e = parser.parseExpression(exp, new FluentParserContext().template());
@@ -78,6 +89,7 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		assertEquals("hello false false false", str);
 	}
 
+	@Test
 	public void testTemplateEnclosedCompositeNotSupported() {
 		String exp = "${hello ${flag} ${flag} ${flag}}";
 		try {
@@ -87,18 +99,21 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testGetValueType() {
 		String exp = "flag";
 		Expression e = parser.parseExpression(exp, null);
 		assertEquals(boolean.class, e.getValueType(bean));
 	}
 
+	@Test
 	public void testGetValueTypeNullCollectionValue() {
 		String exp = "list[0]";
 		Expression e = parser.parseExpression(exp, null);
 		assertEquals(null, e.getValueType(bean));
 	}
 
+	@Test
 	public void testSetValueWithCoersion() {
 		GenericConversionService cs = (GenericConversionService) parser.getConversionService();
 		StringToDate converter = new StringToDate();
@@ -108,6 +123,7 @@ public class BeanWrapperExpressionParserTests extends TestCase {
 		e.setValue(bean, "2008-9-15");
 	}
 
+	@Test
 	public void testSetBogusValueWithCoersion() {
 		Expression e = parser.parseExpression("date", null);
 		try {

spring-binding/src/test/java/org/springframework/binding/expression/el/ELExpressionParserTests.java

@@ -1,5 +1,8 @@
 package org.springframework.binding.expression.el;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
 import java.beans.FeatureDescriptor;
 import java.util.Iterator;
 
@@ -8,9 +11,9 @@ import javax.el.ELResolver;
 import javax.el.FunctionMapper;
 import javax.el.VariableMapper;
 
-import junit.framework.TestCase;
-
 import org.apache.el.ExpressionFactoryImpl;
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.ExpressionVariable;
@@ -18,20 +21,23 @@ import org.springframework.binding.expression.ParserException;
 import org.springframework.binding.expression.ValueCoercionException;
 import org.springframework.binding.expression.support.FluentParserContext;
 
-public class ELExpressionParserTests extends TestCase {
+public class ELExpressionParserTests {
 
 	private ELExpressionParser parser = new ELExpressionParser(new ExpressionFactoryImpl());
 
+	@Before
 	public void setUp() {
 		parser.putContextFactory(TestBean.class, new TestELContextFactory());
 	}
 
+	@Test
 	public void testParseSimpleEvalExpressionNoParserContext() {
 		String expressionString = "3 + 4";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals(7L, exp.getValue(null));
 	}
 
+	@Test
 	public void testParseNullExpressionString() {
 		String expressionString = null;
 		try {
@@ -42,11 +48,13 @@ public class ELExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseNull() {
 		Expression exp = parser.parseExpression("null", null);
 		assertEquals(null, exp.getValue(null));
 	}
 
+	@Test
 	public void testParseEmptyExpressionString() {
 		String expressionString = "";
 		try {
@@ -57,6 +65,7 @@ public class ELExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseSimpleEvalExpressionNoEvalContextWithTypeCoersion() {
 		String expressionString = "3 + 4";
 		Expression exp = parser
@@ -64,24 +73,28 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals(7, exp.getValue(null));
 	}
 
+	@Test
 	public void testParseBeanEvalExpressionNoParserContext() {
 		String expressionString = "value";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("foo", exp.getValue(new TestBean()));
 	}
 
+	@Test
 	public void testParseEvalExpressionWithContextTypeCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().expectResult(Long.class));
 		assertEquals(2L, exp.getValue(new TestBean()));
 	}
 
+	@Test
 	public void testParseEvalExpressionWithContextCustomELVariableResolver() {
 		String expressionString = "specialProperty";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().evaluate(TestBean.class));
 		assertEquals("Custom resolver resolved this special property!", exp.getValue(new TestBean()));
 	}
 
+	@Test
 	public void testParseBeanEvalExpressionInvalidELVariable() {
 		try {
 			String expressionString = "bogus";
@@ -94,12 +107,14 @@ public class ELExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseLiteralExpression() {
 		String expressionString = "'value'";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("value", exp.getValue(null));
 	}
 
+	@Test
 	public void testParseTemplateExpression() {
 		String expressionString = "text text text #{value} text text text#{value}";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().template());
@@ -107,6 +122,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals("text text text foo text text textfoo", exp.getValue(target));
 	}
 
+	@Test
 	public void testParseTemplateExpressionWithVariables() {
 		String expressionString = "#{value}#{max}";
 		Expression exp = parser.parseExpression(expressionString,
@@ -115,6 +131,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals("foo2", exp.getValue(target));
 	}
 
+	@Test
 	public void testVariablesWithCoersion() {
 		Expression exp = parser.parseExpression("max", new FluentParserContext().variable(new ExpressionVariable("max",
 				"maximum", new FluentParserContext().expectResult(Long.class))));
@@ -122,6 +139,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals(2L, exp.getValue(target));
 	}
 
+	@Test
 	public void testTemplateNestedVariables() {
 		String expressionString = "#{value}#{max}";
 		Expression exp = parser.parseExpression(
@@ -140,12 +158,14 @@ public class ELExpressionParserTests extends TestCase {
 	// assertEquals(null, e.getValueType(target));
 	// }
 
+	@Test
 	public void testGetExpressionString() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("maximum", exp.getExpressionString());
 	}
 
+	@Test
 	public void testGetExpressionType() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -153,6 +173,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals(int.class, exp.getValueType(context));
 	}
 
+	@Test
 	public void testGetValueWithCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().expectResult(String.class));
@@ -160,6 +181,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals("2", exp.getValue(context));
 	}
 
+	@Test
 	public void testGetValueCoersionError() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString,
@@ -172,6 +194,7 @@ public class ELExpressionParserTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testSetValue() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -180,6 +203,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals(5, context.getMaximum());
 	}
 
+	@Test
 	public void testSetValueWithTypeCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -188,6 +212,7 @@ public class ELExpressionParserTests extends TestCase {
 		assertEquals(5, context.getMaximum());
 	}
 
+	@Test
 	public void testSetValueCoersionError() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);

spring-binding/src/test/java/org/springframework/binding/expression/el/MapAdaptableELResolverTests.java

@@ -1,46 +1,55 @@
 package org.springframework.binding.expression.el;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
 import java.util.HashMap;
 import java.util.Map;
 
 import javax.el.ELContext;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.collection.MapAdaptable;
 
-public class MapAdaptableELResolverTests extends TestCase {
+public class MapAdaptableELResolverTests {
 
 	private ELContext context;
 
+	@Before
 	public void setUp() {
 		context = new DefaultELContext(new MapAdaptableELResolver(), null, null);
 	}
 
+	@Test
 	public void testGetType() {
 		Class<?> type = context.getELResolver().getType(context, new TestMapAdaptable(), "bar");
 		assertTrue(context.isPropertyResolved());
 		assertEquals(String.class, type);
 	}
 
+	@Test
 	public void testGetType_UnknownProperty() {
 		Class<?> type = context.getELResolver().getType(context, new TestMapAdaptable(), "foo");
 		assertTrue(context.isPropertyResolved());
 		assertEquals(null, type);
 	}
 
+	@Test
 	public void testGetValue() {
 		Object value = context.getELResolver().getValue(context, new TestMapAdaptable(), "bar");
 		assertTrue(context.isPropertyResolved());
 		assertEquals("bar", value);
 	}
 
+	@Test
 	public void testGetValue_UnknownProperty() {
 		Object value = context.getELResolver().getValue(context, new TestMapAdaptable(), "foo");
 		assertTrue(context.isPropertyResolved());
 		assertEquals(null, value);
 	}
 
+	@Test
 	public void testSetValue() {
 		MapAdaptable<String, String> testMap = new TestMapAdaptable();
 		context.getELResolver().setValue(context, testMap, "foo", "foo");
@@ -48,6 +57,7 @@ public class MapAdaptableELResolverTests extends TestCase {
 		assertEquals("foo", testMap.asMap().get("foo"));
 	}
 
+	@Test
 	public void testSetValue_OverWrite() {
 		MapAdaptable<String, String> testMap = new TestMapAdaptable();
 		context.getELResolver().setValue(context, testMap, "bar", "foo");

spring-binding/src/test/java/org/springframework/binding/expression/spel/ELExpressionParserCompatibilityTests.java

@@ -15,8 +15,12 @@
  */
 package org.springframework.binding.expression.spel;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.expression.EvaluationException;
 import org.springframework.binding.expression.Expression;
 import org.springframework.binding.expression.ExpressionVariable;
@@ -40,20 +44,23 @@ import org.springframework.expression.spel.standard.SpelExpressionParser;
  * 
  * @author Rossen Stoyanchev
  */
-public class ELExpressionParserCompatibilityTests extends TestCase {
+public class ELExpressionParserCompatibilityTests {
 
 	private SpringELExpressionParser parser = new SpringELExpressionParser(new SpelExpressionParser());
 
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		parser.addPropertyAccessor(new SpecialPropertyAccessor());
 	}
 
+	@Test
 	public void testParseSimpleEvalExpressionNoParserContext() {
 		String expressionString = "3 + 4";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals(7, exp.getValue(null)); // Unified EL returns Long
 	}
 
+	@Test
 	public void testParseNullExpressionString() {
 		String expressionString = null;
 		try {
@@ -64,11 +71,13 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseNull() {
 		Expression exp = parser.parseExpression("null", null);
 		assertEquals(null, exp.getValue(null));
 	}
 
+	@Test
 	public void testParseEmptyExpressionString() {
 		String expressionString = "";
 		try {
@@ -79,18 +88,21 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseSimpleEvalExpressionNoEvalContextWithTypeCoersion() {
 		String expressionString = "3 + 4";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().expectResult(Long.class));
 		assertEquals(7L, exp.getValue(null));
 	}
 
+	@Test
 	public void testParseBeanEvalExpressionNoParserContext() {
 		String expressionString = "value";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("foo", exp.getValue(new TestBean()));
 	}
 
+	@Test
 	public void testParseEvalExpressionWithContextTypeCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser
@@ -98,12 +110,14 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals(2, exp.getValue(new TestBean()));
 	}
 
+	@Test
 	public void testParseEvalExpressionWithContextCustomELVariableResolver() {
 		String expressionString = "specialProperty";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().evaluate(TestBean.class));
 		assertEquals("Custom resolver resolved this special property!", exp.getValue(null));
 	}
 
+	@Test
 	public void testParseBeanEvalExpressionInvalidELVariable() {
 		try {
 			String expressionString = "bogus";
@@ -116,12 +130,14 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testParseLiteralExpression() {
 		String expressionString = "'value'";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("value", exp.getValue(null));
 	}
 
+	@Test
 	public void testParseTemplateExpression() {
 		String expressionString = "text text text #{value} text text text#{value}";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().template());
@@ -129,6 +145,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals("text text text foo text text textfoo", exp.getValue(target));
 	}
 
+	@Test
 	public void testParseTemplateExpressionWithVariables() {
 		String expressionString = "#{value}#{#max}";
 		Expression exp = parser.parseExpression(expressionString,
@@ -137,12 +154,14 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals("foo2", exp.getValue(target)); // TODO:
 	}
 
+	@Test
 	public void testGetExpressionString() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
 		assertEquals("maximum", exp.getExpressionString());
 	}
 
+	@Test
 	public void testGetExpressionType() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -151,6 +170,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertTrue(int.class.equals(clazz) || Integer.class.equals(clazz));
 	}
 
+	@Test
 	public void testGetValueWithCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, new FluentParserContext().expectResult(String.class));
@@ -158,6 +178,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals("2", exp.getValue(context));
 	}
 
+	@Test
 	public void testGetValueCoersionError() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString,
@@ -170,6 +191,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testSetValue() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -178,6 +200,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals(5, context.getMaximum());
 	}
 
+	@Test
 	public void testSetValueWithTypeCoersion() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);
@@ -186,6 +209,7 @@ public class ELExpressionParserCompatibilityTests extends TestCase {
 		assertEquals(5, context.getMaximum());
 	}
 
+	@Test
 	public void testSetValueCoersionError() {
 		String expressionString = "maximum";
 		Expression exp = parser.parseExpression(expressionString, null);

spring-binding/src/test/java/org/springframework/binding/mapping/DefaultMapperTests.java

@@ -1,21 +1,25 @@
 package org.springframework.binding.mapping;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+
 import java.util.HashMap;
 import java.util.Locale;
 import java.util.Map;
 
-import junit.framework.TestCase;
-
+import org.junit.Test;
 import org.springframework.binding.expression.ExpressionParser;
 import org.springframework.binding.expression.spel.SpringELExpressionParser;
 import org.springframework.binding.mapping.impl.DefaultMapper;
 import org.springframework.binding.mapping.impl.DefaultMapping;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 
-public class DefaultMapperTests extends TestCase {
+public class DefaultMapperTests {
 	private DefaultMapper mapper = new DefaultMapper();
 	private ExpressionParser parser = new SpringELExpressionParser(new SpelExpressionParser());
 
+	@Test
 	public void testMapping() {
 		DefaultMapping mapping1 = new DefaultMapping(parser.parseExpression("foo", null), parser.parseExpression("bar",
 				null));
@@ -43,6 +47,7 @@ public class DefaultMapperTests extends TestCase {
 		}).size());
 	}
 
+	@Test
 	public void testMappingConversion() {
 		DefaultMapping mapping1 = new DefaultMapping(parser.parseExpression("beep", null), parser.parseExpression(
 				"beep", null));
@@ -55,6 +60,7 @@ public class DefaultMapperTests extends TestCase {
 		assertEquals(Locale.ENGLISH, bean2.beep);
 	}
 
+	@Test
 	public void testMappingConversionError() {
 		DefaultMapping mapping1 = new DefaultMapping(parser.parseExpression("boop", null), parser.parseExpression(
 				"boop", null));

spring-binding/src/test/java/org/springframework/binding/message/DefaultMessageContextTests.java

@@ -1,22 +1,26 @@
 package org.springframework.binding.message;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.Serializable;
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.StaticMessageSource;
 
-public class DefaultMessageContextTests extends TestCase {
+public class DefaultMessageContextTests {
 	private DefaultMessageContext context;
 
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		StaticMessageSource messageSource = new StaticMessageSource();
 		messageSource.addMessage("message", Locale.getDefault(), "Hello world resolved!");
 		messageSource.addMessage("argmessage", Locale.getDefault(), "Hello world {0}!");
 		context = new DefaultMessageContext(messageSource);
 	}
 
+	@Test
 	public void testCreateMessageContext() {
 		context.addMessage(new MessageBuilder().defaultText("Hello world!").build());
 		Message[] messages = context.getAllMessages();
@@ -26,6 +30,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(null, messages[0].getSource());
 	}
 
+	@Test
 	public void testResolveMessage() {
 		context.addMessage(new MessageBuilder().warning().source(this).code("message").build());
 		Message[] messages = context.getMessagesBySource(this);
@@ -35,6 +40,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(this, messages[0].getSource());
 	}
 
+	@Test
 	public void testResolveMessageDefaultText() {
 		context.addMessage(new MessageBuilder().error().code("bogus").defaultText("Hello world fallback!").build());
 		Message[] messages = context.getAllMessages();
@@ -44,6 +50,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(null, messages[0].getSource());
 	}
 
+	@Test
 	public void testResolveMessageWithArgs() {
 		context.addMessage(new MessageBuilder().error().source(this).code("argmessage").arg("Keith")
 				.defaultText("Hello world fallback!").build());
@@ -54,6 +61,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(this, messages[0].getSource());
 	}
 
+	@Test
 	public void testResolveMessageWithMultipleCodes() {
 		context.addMessage(new MessageBuilder().error().source(this).code("bogus").code("argmessage").arg("Keith")
 				.defaultText("Hello world fallback!").build());
@@ -64,6 +72,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(this, messages[0].getSource());
 	}
 
+	@Test
 	public void testSaveRestoreMessages() {
 		context.addMessage(new MessageBuilder().defaultText("Info").build());
 		context.addMessage(new MessageBuilder().error().defaultText("Error").build());
@@ -80,6 +89,7 @@ public class DefaultMessageContextTests extends TestCase {
 		assertEquals(1, context.getMessagesBySource(this).length);
 	}
 
+	@Test
 	public void testMessageSequencing() {
 		context.addMessage(new MessageBuilder().defaultText("Info").build());
 		context.addMessage(new MessageBuilder().warning().source(this).code("message").build());

spring-binding/src/test/java/org/springframework/binding/message/MessageBuilderTests.java

@@ -1,23 +1,29 @@
 package org.springframework.binding.message;
 
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.fail;
+
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.NoSuchMessageException;
 import org.springframework.context.support.StaticMessageSource;
 
-public class MessageBuilderTests extends TestCase {
+public class MessageBuilderTests {
 	private StaticMessageSource messageSource = new StaticMessageSource();
 	private Locale locale = Locale.getDefault();
 	private MessageBuilder builder = new MessageBuilder();
 
+	@Before
 	public void setUp() {
 		messageSource.addMessage("foo", locale, "bar");
 		messageSource.addMessage("bar", locale, "{0}");
 		messageSource.addMessage("baz", locale, "boop");
 	}
 
+	@Test
 	public void testBuildDefaultText() {
 		MessageResolver resolver = builder.defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -26,6 +32,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildFatal() {
 		MessageResolver resolver = builder.fatal().defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -34,6 +41,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildError() {
 		MessageResolver resolver = builder.error().defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -42,6 +50,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildWarning() {
 		MessageResolver resolver = builder.warning().defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -50,6 +59,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildNothing() {
 		MessageResolver resolver = builder.build();
 		try {
@@ -60,6 +70,7 @@ public class MessageBuilderTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBuildCode() {
 		MessageResolver resolver = builder.error().code("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -68,6 +79,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildCodes() {
 		MessageResolver resolver = builder.error().codes("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -76,6 +88,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildArg() {
 		MessageResolver resolver = builder.error().code("bar").arg("baz").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -84,6 +97,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildArgs() {
 		MessageResolver resolver = builder.error().codes("bar").args("baz").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -92,6 +106,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildCodesNull() {
 		MessageResolver resolver = builder.codes().build();
 		try {
@@ -102,6 +117,7 @@ public class MessageBuilderTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBuildArgsNull() {
 		MessageResolver resolver = builder.args().build();
 		try {
@@ -112,6 +128,7 @@ public class MessageBuilderTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBuildArgsWithNullCodes() {
 		MessageResolver resolver = builder.error().args("baz").build();
 		try {
@@ -121,12 +138,14 @@ public class MessageBuilderTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBuildArgsWithNullCodesDefaultText() {
 		MessageResolver resolver = builder.error().args("baz").defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
 		assertEquals("foo", message.getText());
 	}
 
+	@Test
 	public void testBuildWithSource() {
 		MessageResolver resolver = builder.source("foo").defaultText("foo").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -135,6 +154,7 @@ public class MessageBuilderTests extends TestCase {
 		assertEquals(Severity.INFO, message.getSeverity());
 	}
 
+	@Test
 	public void testBuildResolvableArg() {
 		MessageResolver resolver = builder.error().code("bar").resolvableArg("baz").build();
 		Message message = resolver.resolveMessage(messageSource, locale);
@@ -143,6 +163,7 @@ public class MessageBuilderTests extends TestCase {
 		assertNull(message.getSource());
 	}
 
+	@Test
 	public void testBuildResolvableArgs() {
 		MessageResolver resolver = builder.error().codes("bar").resolvableArgs("baz")
 				.build();

spring-binding/src/test/java/org/springframework/binding/message/MessageContextErrorsMessageCodesTests.java

@@ -2,13 +2,13 @@ package org.springframework.binding.message;
 
 import java.util.Locale;
 
-import junit.framework.TestCase;
 import org.easymock.EasyMock;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.validation.MessageCodesResolver;
 
-public class MessageContextErrorsMessageCodesTests extends TestCase {
+public class MessageContextErrorsMessageCodesTests {
 
 	private DefaultMessageContext context;
 
@@ -18,8 +18,8 @@ public class MessageContextErrorsMessageCodesTests extends TestCase {
 
 	private MessageCodesResolver resolver;
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		StaticMessageSource messageSource = new StaticMessageSource();
 		messageSource.addMessage(errorCode, Locale.getDefault(), "doesntmatter");
 		context = new DefaultMessageContext(messageSource);
@@ -27,6 +27,7 @@ public class MessageContextErrorsMessageCodesTests extends TestCase {
 		resolver = EasyMock.createMock(MessageCodesResolver.class);
 	}
 
+	@Test
 	public void testRejectUsesObjectName() {
 		EasyMock.expect(resolver.resolveMessageCodes(errorCode, objectName)).andReturn(new String[] {});
 		EasyMock.replay(resolver);
@@ -38,6 +39,7 @@ public class MessageContextErrorsMessageCodesTests extends TestCase {
 		EasyMock.verify(resolver);
 	}
 
+	@Test
 	public void testRejectValueUsesObjectName() {
 		EasyMock.expect(resolver.resolveMessageCodes(errorCode, objectName, "field", null)).andReturn(new String[] {});
 		EasyMock.replay(resolver);
@@ -48,6 +50,7 @@ public class MessageContextErrorsMessageCodesTests extends TestCase {
 		EasyMock.verify(resolver);
 	}
 
+	@Test
 	public void testRejectValueEmptyField() {
 		EasyMock.expect(resolver.resolveMessageCodes(errorCode, objectName)).andReturn(new String[] {});
 		EasyMock.replay(resolver);

spring-binding/src/test/java/org/springframework/binding/message/MessageContextErrorsTests.java

@@ -1,23 +1,25 @@
 package org.springframework.binding.message;
 
+import static org.junit.Assert.assertEquals;
+
 import java.util.HashMap;
 import java.util.Locale;
 
-import junit.framework.TestCase;
-
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.expression.spel.SpringELExpressionParser;
 import org.springframework.context.support.StaticMessageSource;
 import org.springframework.expression.spel.standard.SpelExpressionParser;
 import org.springframework.validation.DefaultMessageCodesResolver;
 import org.springframework.validation.MapBindingResult;
 
-public class MessageContextErrorsTests extends TestCase {
+public class MessageContextErrorsTests {
 
 	private DefaultMessageContext context;
 	private MessageContextErrors errors;
 
-	@Override
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		StaticMessageSource messageSource = new StaticMessageSource();
 		messageSource.addMessage("foo", Locale.getDefault(), "bar");
 		messageSource.addMessage("bar", Locale.getDefault(), "{0}");
@@ -29,6 +31,7 @@ public class MessageContextErrorsTests extends TestCase {
 		errors = new MessageContextErrors(context, "object", new Object(), parser, resolver, null);
 	}
 
+	@Test
 	public void testReject() {
 		errors.reject("foo");
 		errors.reject("bogus", "baz");
@@ -50,6 +53,7 @@ public class MessageContextErrorsTests extends TestCase {
 		assertEquals(Severity.ERROR, msg.getSeverity());
 	}
 
+	@Test
 	public void testRejectValue() {
 		errors.rejectValue("class", "foo");
 		errors.rejectValue("class", "bogus", "baz");
@@ -71,6 +75,7 @@ public class MessageContextErrorsTests extends TestCase {
 		assertEquals(Severity.ERROR, msg.getSeverity());
 	}
 
+	@Test
 	public void testGlobalError() {
 		errors.rejectValue(null, "bar", new Object[] { "boop" }, null);
 		Message msg = context.getAllMessages()[0];
@@ -79,6 +84,7 @@ public class MessageContextErrorsTests extends TestCase {
 		assertEquals(Severity.ERROR, msg.getSeverity());
 	}
 
+	@Test
 	public void testAddAllErrors() {
 		MapBindingResult result = new MapBindingResult(new HashMap<>(), "object");
 		result.reject("bar", new Object[] { "boop" }, null);
@@ -96,14 +102,17 @@ public class MessageContextErrorsTests extends TestCase {
 		assertEquals(Severity.ERROR, msg.getSeverity());
 	}
 
+	@Test
 	public void testGetGlobalErrors() {
 
 	}
 
+	@Test
 	public void testGetFieldErrors() {
 
 	}
 
+	@Test
 	public void testGetFieldValue() {
 
 	}

spring-binding/src/test/java/org/springframework/binding/method/MethodInvocationExceptionTests.java

@@ -15,18 +15,21 @@
  */
 package org.springframework.binding.method;
 
+import static org.junit.Assert.assertSame;
+
 import java.io.IOException;
 import java.lang.reflect.InvocationTargetException;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * Test case for {@link MethodInvocationException}.
  * 
  * @author Erwin Vervaet
  */
-public class MethodInvocationExceptionTests extends TestCase {
+public class MethodInvocationExceptionTests {
 
+	@Test
 	public void testGetTargetException() {
 		// runtime exception
 		IllegalArgumentException iae = new IllegalArgumentException("test");

spring-binding/src/test/java/org/springframework/binding/method/MethodInvokerTests.java

@@ -15,8 +15,13 @@
  */
 package org.springframework.binding.method;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.binding.expression.support.StaticExpression;
 
 /**
@@ -25,14 +30,16 @@ import org.springframework.binding.expression.support.StaticExpression;
  * @author Erwin Vervaet
  * @author Jeremy Grelle
  */
-public class MethodInvokerTests extends TestCase {
+public class MethodInvokerTests {
 
 	private MethodInvoker methodInvoker;
 
-	protected void setUp() {
+	@Before
+	public void setUp() {
 		this.methodInvoker = new MethodInvoker();
 	}
 
+	@Test
 	public void testInvocationTargetException() {
 		try {
 			methodInvoker.invoke(new MethodSignature("test"), new TestObject(), null);
@@ -43,6 +50,7 @@ public class MethodInvokerTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testInvalidMethod() {
 		try {
 			methodInvoker.invoke(new MethodSignature("bogus"), new TestObject(), null);
@@ -52,6 +60,7 @@ public class MethodInvokerTests extends TestCase {
 		}
 	}
 
+	@Test
 	public void testBeanArg() {
 		Parameters parameters = new Parameters();
 		Bean bean = new Bean();
@@ -60,6 +69,7 @@ public class MethodInvokerTests extends TestCase {
 		assertSame(bean, methodInvoker.invoke(method, new TestObject(), null));
 	}
 
+	@Test
 	public void testPrimitiveArg() {
 		Parameters parameters = new Parameters();
 		parameters.add(new Parameter(Boolean.class, new StaticExpression(true)));

spring-binding/src/test/java/org/springframework/binding/method/MethodKeyTests.java

@@ -15,46 +15,53 @@
  */
 package org.springframework.binding.method;
 
+import static org.junit.Assert.assertEquals;
+
 import java.io.File;
 import java.io.FilenameFilter;
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
+import org.junit.Test;
 
 /**
  * @author Rob Harrop
  * @since 1.0
  */
-public class MethodKeyTests extends TestCase {
+public class MethodKeyTests {
 
 	private static final Method LIST_NO_ARGS = safeGetMethod(File.class, "list", null);
 
 	private static final Method LIST_FILENAME_FILTER = safeGetMethod(File.class, "list",
 			new Class[] { FilenameFilter.class });
 
+	@Test
 	public void testGetMethodWithNoArgs() {
 		MethodKey key = new MethodKey(File.class, "list");
 		Method m = key.getMethod();
 		assertEquals(LIST_NO_ARGS, m);
 	}
 
+	@Test
 	public void testGetMoreGenericMethod() {
 		MethodKey key = new MethodKey(Object.class, "equals", Long.class);
 		assertEquals(safeGetMethod(Object.class, "equals", new Class[] { Object.class }), key.getMethod());
 	}
 
+	@Test
 	public void testGetMethodWithSingleArg() {
 		MethodKey key = new MethodKey(File.class, "list", FilenameFilter.class);
 		Method m = key.getMethod();
 		assertEquals(LIST_FILENAME_FILTER, m);
 	}
 
+	@Test
 	public void testGetMethodWithSingleNullArgAndValidMatch() {
 		MethodKey key = new MethodKey(File.class, "list", new Class[] { null });
 		Method m = key.getMethod();
 		assertEquals(LIST_FILENAME_FILTER, m);
 	}
 
+	@Test
 	public void testGetMethodWithSingleNullAndUnclearMatch() {
 		new MethodKey(File.class, "listFiles", new Class[] { null });
 	}