moving jmx.* unit tests from .testsuite -> .context

org.springframework.context/src/test/java/org/springframework/aop/interceptor/NopInterceptor.java

@@ -0,0 +1,58 @@
+
+/*
+ * Copyright 2002-2005 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.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.interceptor;
+
+import org.aopalliance.intercept.MethodInterceptor;
+import org.aopalliance.intercept.MethodInvocation;
+
+/**
+ * Trivial interceptor that can be introduced in a chain to display it.
+ *
+ * @author Rod Johnson
+ */
+public class NopInterceptor implements MethodInterceptor {
+	
+	private int count;
+
+	/**
+	 * @see org.aopalliance.intercept.MethodInterceptor#invoke(MethodInvocation)
+	 */
+	public Object invoke(MethodInvocation invocation) throws Throwable {
+		increment();
+		return invocation.proceed();
+	}
+	
+	public int getCount() {
+		return this.count;
+	}
+	
+	protected void increment() {
+		++count;
+	}
+
+	public boolean equals(Object other) {
+		if (!(other instanceof NopInterceptor)) {
+			return false;
+		}
+		if (this == other) {
+			return true;
+		}
+		return this.count == ((NopInterceptor) other).count;
+	}
+
+}

org.springframework.context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java

@@ -16,6 +16,8 @@
 
 package org.springframework.jmx.export.notification;
 
+import static org.junit.Assert.*;
+
 import javax.management.AttributeChangeNotification;
 import javax.management.MBeanException;
 import javax.management.MalformedObjectNameException;
@@ -23,48 +25,35 @@ import javax.management.Notification;
 import javax.management.ObjectName;
 import javax.management.RuntimeOperationsException;
 
-import junit.framework.TestCase;
-
+import org.junit.Test;
 import org.springframework.jmx.export.SpringModelMBean;
-import org.springframework.test.AssertThrows;
 
 /**
  * @author Rick Evans
+ * @author Chris Beams
  */
-public final class ModelMBeanNotificationPublisherTests extends TestCase {
+public final class ModelMBeanNotificationPublisherTests {
 
+    @Test(expected=IllegalArgumentException.class)
 	public void testCtorWithNullMBean() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new ModelMBeanNotificationPublisher(null, createObjectName(), this);
-			}
-		}.runTest();
+        new ModelMBeanNotificationPublisher(null, createObjectName(), this);
 	}
 
+    @Test(expected=IllegalArgumentException.class)
 	public void testCtorWithNullObjectName() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new ModelMBeanNotificationPublisher(new SpringModelMBean(), null, this);
-			}
-		}.runTest();
+		new ModelMBeanNotificationPublisher(new SpringModelMBean(), null, this);
 	}
 
+    @Test(expected=IllegalArgumentException.class)
 	public void testCtorWithNullManagedResource() throws Exception {
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				new ModelMBeanNotificationPublisher(new SpringModelMBean(), createObjectName(), null);
-			}
-		}.runTest();
+		new ModelMBeanNotificationPublisher(new SpringModelMBean(), createObjectName(), null);
 	}
 
+    @Test(expected=IllegalArgumentException.class)
 	public void testSendNullNotification() throws Exception {
-		final NotificationPublisher publisher
+		NotificationPublisher publisher
 				= new ModelMBeanNotificationPublisher(new SpringModelMBean(), createObjectName(), this);
-		new AssertThrows(IllegalArgumentException.class) {
-			public void test() throws Exception {
-				publisher.sendNotification(null);
-			}
-		}.runTest();
+		publisher.sendNotification(null);
 	}
 
 	public void testSendVanillaNotification() throws Exception {