Upgrade to JUnit 4

build.gradle

@@ -157,7 +157,7 @@ project("spring-webflow") {
 		optional("org.apache.tiles:tiles-extras:$tiles3Version") {
 			exclude group: "org.springframework", module: "spring-web"
 		}
-		provided("junit:junit:3.8.2")
+		provided("junit:junit:4.12")
 		testCompile("org.springframework:spring-aop:$springVersion")
 		testCompile("org.springframework:spring-jdbc:$springVersion")
 		testCompile("org.springframework:spring-test:$springVersion")

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

@@ -1,21 +1,26 @@
 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);
 		map.put("null", null);
 		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 void testAccessNullAttribute() {
 		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 void testGetPutRemove() {
 		assertNull(map.get("foo"));
 	}
 
+	@Test
 	public void testPutAll() {
 		Map<String, String> all = new HashMap<>();
 		all.put("foo", "bar");
@@ -55,20 +63,23 @@ public void testPutAll() {
 		assertTrue(map.size() == 2);
 	}
 
+	@Test
 	public void testEntrySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
 		Set<Map.Entry<String, String>> entrySet = map.entrySet();
 		assertTrue(entrySet.size() == 2);
 	}
 
+	@Test
 	public void testKeySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
 		Set<String> keySet = map.keySet();
 		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 @@ protected void setAttribute(String key, String value) {
 		}
 	};
 
+	@Test
 	public void testGetPutRemove() {
 		assertTrue(map.size() == 0);
 		assertTrue(map.isEmpty());
@@ -66,6 +73,7 @@ public void testGetPutRemove() {
 		assertNull(map.get("foo"));
 	}
 
+	@Test
 	public void testPutAll() {
 		Map<String, String> all = new HashMap<>();
 		all.put("foo", "bar");
@@ -74,20 +82,23 @@ public void testPutAll() {
 		assertTrue(map.size() == 2);
 	}
 
+	@Test
 	public void testEntrySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
 		Set<Map.Entry<String, String>> entrySet = map.entrySet();
 		assertTrue(entrySet.size() == 2);
 	}
 
+	@Test
 	public void testKeySet() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");
 		Set<String> keySet = map.keySet();
 		assertTrue(keySet.size() == 2);
 	}
 
+	@Test
 	public void testValues() {
 		map.put("foo", "bar");
 		map.put("bar", "baz");