Update AbstractMBeanServerTests hierarchy to JUnit 4

This commit lays the groundwork for introducing TestGroup#JMXMP and
related assumptions in select JMX-related tests in a subsequent commit;
JUnit assumptions require JUnit 4+ to function properly, so the entire
AbstractMBeanServerTests hierarchy must be moved over to JUnit 4+ style.

Issue: SPR-8089

Author: cbeams

spring-context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2013 the original author or authors.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,15 @@
 import javax.management.MBeanServerFactory;
 import javax.management.ObjectName;
 
-import junit.framework.TestCase;
-
+import org.junit.After;
+import org.junit.Before;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.support.GenericApplicationContext;
 import org.springframework.util.MBeanTestUtils;
 
+import static org.junit.Assert.*;
+
 /**
  * <strong>Note:</strong> the JMX test suite requires the presence of the
  * {@code jmxremote_optional.jar} in your classpath. Thus, if you
@@ -40,12 +42,13 @@
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Chris Beams
  */
-public abstract class AbstractMBeanServerTests extends TestCase {
+public abstract class AbstractMBeanServerTests {
 
 	protected MBeanServer server;
 
-	@Override
+	@Before
 	public final void setUp() throws Exception {
 		this.server = MBeanServerFactory.createMBeanServer();
 		try {
@@ -64,8 +67,8 @@ protected ConfigurableApplicationContext loadContext(String configLocation) {
 		return ctx;
 	}
 
-	@Override
-	protected void tearDown() throws Exception {
+	@After
+	public void tearDown() throws Exception {
 		releaseServer();
 		onTearDown();
 	}

spring-context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java

@@ -29,6 +29,7 @@
 import javax.management.remote.JMXConnectorServerFactory;
 import javax.management.remote.JMXServiceURL;
 
+import org.junit.Test;
 import org.springframework.jmx.AbstractMBeanServerTests;
 import org.springframework.jmx.IJmxTestBean;
 import org.springframework.jmx.JmxException;
@@ -40,6 +41,7 @@
  * @author Rob Harrop
  * @author Juergen Hoeller
  * @author Sam Brannen
+ * @author Chris Beams
  */
 public class MBeanClientInterceptorTests extends AbstractMBeanServerTests {
 
@@ -77,13 +79,15 @@ protected IJmxTestBean getProxy() throws Exception {
 		return (IJmxTestBean) factory.getObject();
 	}
 
+	@Test
 	public void testProxyClassIsDifferent() throws Exception {
 		if (!runTests)
 			return;
 		IJmxTestBean proxy = getProxy();
 		assertTrue("The proxy class should be different than the base class", (proxy.getClass() != IJmxTestBean.class));
 	}
 
+	@Test
 	public void testDifferentProxiesSameClass() throws Exception {
 		if (!runTests)
 			return;
@@ -94,6 +98,7 @@ public void testDifferentProxiesSameClass() throws Exception {
 		assertSame("The proxy classes should be the same", proxy1.getClass(), proxy2.getClass());
 	}
 
+	@Test
 	public void testGetAttributeValue() throws Exception {
 		if (!runTests)
 			return;
@@ -102,6 +107,7 @@ public void testGetAttributeValue() throws Exception {
 		assertEquals("The age should be 100", 100, age);
 	}
 
+	@Test
 	public void testSetAttributeValue() throws Exception {
 		if (!runTests)
 			return;
@@ -110,6 +116,7 @@ public void testSetAttributeValue() throws Exception {
 		assertEquals("The name of the bean should have been updated", "Rob Harrop", target.getName());
 	}
 
+	@Test
 	public void testSetAttributeValueWithRuntimeException() throws Exception {
 		if (!runTests)
 			return;
@@ -122,6 +129,7 @@ public void testSetAttributeValueWithRuntimeException() throws Exception {
 		}
 	}
 
+	@Test
 	public void testSetAttributeValueWithCheckedException() throws Exception {
 		if (!runTests)
 			return;
@@ -134,6 +142,7 @@ public void testSetAttributeValueWithCheckedException() throws Exception {
 		}
 	}
 
+	@Test
 	public void testSetAttributeValueWithIOException() throws Exception {
 		if (!runTests)
 			return;
@@ -146,6 +155,7 @@ public void testSetAttributeValueWithIOException() throws Exception {
 		}
 	}
 
+	@Test
 	public void testSetReadOnlyAttribute() throws Exception {
 		if (!runTests)
 			return;
@@ -158,6 +168,7 @@ public void testSetReadOnlyAttribute() throws Exception {
 		}
 	}
 
+	@Test
 	public void testInvokeNoArgs() throws Exception {
 		if (!runTests)
 			return;
@@ -166,6 +177,7 @@ public void testInvokeNoArgs() throws Exception {
 		assertEquals("The operation should return 1", 1, result);
 	}
 
+	@Test
 	public void testInvokeArgs() throws Exception {
 		if (!runTests)
 			return;
@@ -174,6 +186,7 @@ public void testInvokeArgs() throws Exception {
 		assertEquals("The operation should return 3", 3, result);
 	}
 
+	@Test
 	public void testInvokeUnexposedMethodWithException() throws Exception {
 		if (!runTests)
 			return;
@@ -186,6 +199,7 @@ public void testInvokeUnexposedMethodWithException() throws Exception {
 		}
 	}
 
+	@Test
 	public void testTestLazyConnectionToRemote() throws Exception {
 		if (!runTests)
 			return;

spring-context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java

@@ -28,6 +28,7 @@
 
 /**
  * @author Rob Harrop
+ * @author Chris Beams
  */
 public class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests {
 

spring-context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java

@@ -22,8 +22,11 @@
 
 import javax.management.ObjectName;
 
+import org.junit.Test;
 import org.springframework.jmx.AbstractJmxTests;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  */
@@ -36,6 +39,7 @@ protected String getApplicationContextPath() {
 		return "org/springframework/jmx/export/customConfigurer.xml";
 	}
 
+	@Test
 	public void testDatesInJmx() throws Exception {
 		// System.out.println(getServer().getClass().getName());
 		ObjectName oname = new ObjectName("bean:name=dateRange");
@@ -47,6 +51,7 @@ public void testDatesInJmx() throws Exception {
 		assertEquals("endDate ", getEndDate(), endJmx);
 	}
 
+	@Test
 	public void testGetDates() throws Exception {
 		DateRange dr = (DateRange) getContext().getBean("dateRange");
 

spring-context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java

@@ -28,6 +28,8 @@
 import org.springframework.jmx.export.naming.ObjectNamingStrategy;
 import org.springframework.jmx.support.ObjectNameManager;
 
+import static org.junit.Assert.*;
+
 /**
  * @author Rob Harrop
  * @author Juergen Hoeller