From 0130b15189cd7dbab64face31d1958e5145d3a45 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Wed, 6 Jul 2011 09:13:17 +0000 Subject: [PATCH] Rename JMX tests to avoid jmxremote_optional error Even after applying @Ignore to these tests at the class level, they still run (and fail) under ant when the jmxremote_optional jar is not present. See the issues mentioned below for information on how these tests will be re-enabled. Issue: SPR-8089, SPR-8093, SPR-8458 git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@4678 50f2f4bb-b051-0410-bef5-90022cba6387 --- ...rTests.java => RemoteMBeanClientInterceptorTestsIgnore.java} | 2 +- ...eanTests.java => ConnectorServerFactoryBeanTestsIgnore.java} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename org.springframework.context/src/test/java/org/springframework/jmx/access/{RemoteMBeanClientInterceptorTests.java => RemoteMBeanClientInterceptorTestsIgnore.java} (96%) rename org.springframework.context/src/test/java/org/springframework/jmx/support/{ConnectorServerFactoryBeanTests.java => ConnectorServerFactoryBeanTestsIgnore.java} (97%) diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java similarity index 96% rename from org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java index 751884998a7..77aefe6167c 100644 --- a/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTests.java +++ b/org.springframework.context/src/test/java/org/springframework/jmx/access/RemoteMBeanClientInterceptorTestsIgnore.java @@ -38,7 +38,7 @@ import org.junit.Ignore; // fact get ignored. So we leave @Ignore here so that developers can // easily search for ignored tests. @Ignore("Requires jmxremote_optional.jar; see comments in AbstractMBeanServerTests for details.") -public class RemoteMBeanClientInterceptorTests extends MBeanClientInterceptorTests { +public class RemoteMBeanClientInterceptorTestsIgnore extends MBeanClientInterceptorTests { private static final String SERVICE_URL = "service:jmx:jmxmp://localhost:9876"; diff --git a/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java b/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java similarity index 97% rename from org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java rename to org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java index 5d7cce5ed17..ef244b085e5 100644 --- a/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTests.java +++ b/org.springframework.context/src/test/java/org/springframework/jmx/support/ConnectorServerFactoryBeanTestsIgnore.java @@ -41,7 +41,7 @@ import org.springframework.jmx.AbstractMBeanServerTests; // fact get ignored. So we leave @Ignore here so that developers can // easily search for ignored tests. @Ignore("Requires jmxremote_optional.jar; see comments in AbstractMBeanServerTests for details.") -public class ConnectorServerFactoryBeanTests extends AbstractMBeanServerTests { +public class ConnectorServerFactoryBeanTestsIgnore extends AbstractMBeanServerTests { private static final String OBJECT_NAME = "spring:type=connector,name=test";