diff --git a/org.springframework.context/src/test/java/org/springframework/aop/interceptor/NopInterceptor.java b/org.springframework.context/src/test/java/org/springframework/aop/interceptor/NopInterceptor.java new file mode 100644 index 0000000000..6bbbc4ff17 --- /dev/null +++ b/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; + } + +} diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/AbstractJmxTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/AbstractJmxTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/AbstractJmxTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/AbstractJmxTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/AbstractMBeanServerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/IJmxTestBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/IJmxTestBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/IJmxTestBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/IJmxTestBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/JmxTestBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/JmxTestBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/JmxTestBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/JmxTestBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/access/MBeanClientInterceptorTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/applicationContext.xml b/org.springframework.context/src/test/java/org/springframework/jmx/applicationContext.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/applicationContext.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/applicationContext.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/CustomEditorConfigurerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/DateRange.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/DateRange.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/DateRange.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/DateRange.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/ExceptionOnInitBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/LazyInitMBeanTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterOperationsTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/MBeanExporterTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationListenerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/NotificationPublisherTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/PropertyPlaceholderConfigurerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/TestDynamicMBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationLazyInitMBeanTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationMetadataAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/AnnotationTestBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/JmxUtilsAnnotationTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/annotations.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/annotations.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/annotations.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/componentScan.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyAssembling.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/annotation/lazyNaming.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractAutodetectTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractJmxAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerAutodetectTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/AbstractMetadataAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/IAdditionalTestMethods.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomBase.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ICustomJmxBean.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerCustomTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerMappedTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/InterfaceBasedMBeanInfoAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerComboTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerMappedTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerNotMappedTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodExclusionMBeanInfoAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerMappedTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/MethodNameBasedMBeanInfoAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/ReflectiveAssemblerTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssembler.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerCustom.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/interfaceAssemblerMapped.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadata-autodetect.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/metadataAssembler.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssembler.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerCombo.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerMapped.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodExclusionAssemblerNotMapped.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssembler.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/methodNameAssemblerMapped.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/assembler/reflectiveAssembler.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectLazyMBeans.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectMBeans.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/autodetectNoMBeans.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/customConfigurer.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/customConfigurer.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/customConfigurer.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/customConfigurer.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/excludedBeans.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/excludedBeans.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/excludedBeans.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/excludedBeans.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/lazyInit.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/lazyInit.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/lazyInit.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/lazyInit.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/AbstractNamingStrategyTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/IdentityNamingStrategyTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/KeyNamingStrategyTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesFileNamingStrategyTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/PropertiesNamingStrategyTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties b/org.springframework.context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties rename to org.springframework.context/src/test/java/org/springframework/jmx/export/naming/jmx-names.properties diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java similarity index 84% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java index 486a35df6e..4645890de8 100644 --- a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notification/ModelMBeanNotificationPublisherTests.java +++ b/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 { diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherLazyTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/notificationPublisherTests.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml b/org.springframework.context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml rename to org.springframework.context/src/test/java/org/springframework/jmx/export/propertyPlaceholderConfigurer.xml diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/support/JmxUtilsTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerConnectionFactoryBeanTests.java diff --git a/org.springframework.testsuite/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java similarity index 100% rename from org.springframework.testsuite/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/support/MBeanServerFactoryBeanTests.java