You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2010/03/22 20:57:33 UTC
svn commit: r926292 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/
camel-core/src/test/java/org/apache/camel/management/
components/camel-spring/src/test/java/org/apache/camel/spring/management/
Author: davsclaus
Date: Mon Mar 22 19:57:31 2010
New Revision: 926292
URL: http://svn.apache.org/viewvc?rev=926292&view=rev
Log:
Faster unit test of camel-core by disabling JMX by default when testing.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterExchangeStatisticsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteContextTracerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTimerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Mon Mar 22 19:57:31 2010
@@ -65,6 +65,11 @@ public abstract class ContextTestSupport
@Override
protected void setUp() throws Exception {
+ if (!useJmx()) {
+ disableJMX();
+ } else {
+ enableJMX();
+ }
context = createCamelContext();
assertValidContext(context);
@@ -100,6 +105,15 @@ public abstract class ContextTestSupport
stopCamelContext();
}
+ /**
+ * Whether or not JMX should be used during testing.
+ *
+ * @return <tt>false</tt> by default.
+ */
+ protected boolean useJmx() {
+ return false;
+ }
+
protected void stopCamelContext() throws Exception {
if (camelContextService != null) {
camelContextService.stop();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java Mon Mar 22 19:57:31 2010
@@ -34,6 +34,11 @@ public class CamelChoiceWithManagementTe
private MockEndpoint d;
private MockEndpoint e;
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected void setUp() throws Exception {
super.setUp();
a = getMockEndpoint("mock:a");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierEventsTest.java Mon Mar 22 19:57:31 2010
@@ -43,6 +43,11 @@ public class EventNotifierEventsTest ext
private static List<EventObject> events = new ArrayList<EventObject>();
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
public void setUp() throws Exception {
events.clear();
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierExchangeSentTest.java Mon Mar 22 19:57:31 2010
@@ -34,6 +34,11 @@ public class EventNotifierExchangeSentTe
private static List<EventObject> events = new ArrayList<EventObject>();
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
public void setUp() throws Exception {
events.clear();
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierFailureHandledEventsTest.java Mon Mar 22 19:57:31 2010
@@ -41,6 +41,11 @@ public class EventNotifierFailureHandled
private static List<EventObject> events = new ArrayList<EventObject>();
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
public void setUp() throws Exception {
events.clear();
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/EventNotifierServiceStoppingFailedEventTest.java Mon Mar 22 19:57:31 2010
@@ -38,6 +38,11 @@ public class EventNotifierServiceStoppin
private static String stopOrder;
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
public void setUp() throws Exception {
events.clear();
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ExceptionWithManagementTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.component.mock.M
*/
public class ExceptionWithManagementTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testExceptionHandler() throws Exception {
MockEndpoint error = this.resolveMandatoryEndpoint("mock:error", MockEndpoint.class);
error.expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationCustomMBeanTest.java Mon Mar 22 19:57:31 2010
@@ -34,6 +34,11 @@ import org.apache.camel.util.CastUtils;
*/
public class JmxInstrumentationCustomMBeanTest extends JmxInstrumentationUsingDefaultsTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableOnCamelContextTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.component.mock.M
public class JmxInstrumentationDisableOnCamelContextTest extends JmxInstrumentationUsingPropertiesTest {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext camel = super.createCamelContext();
camel.disableJMX();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationDisableTest.java Mon Mar 22 19:57:31 2010
@@ -31,15 +31,8 @@ import org.apache.camel.component.mock.M
public class JmxInstrumentationDisableTest extends JmxInstrumentationUsingPropertiesTest {
@Override
- protected void setUp() throws Exception {
- System.setProperty(JmxSystemPropertyKeys.DISABLED, "True");
- super.setUp();
- }
-
- @Override
- protected void tearDown() throws Exception {
- System.clearProperty(JmxSystemPropertyKeys.DISABLED);
- super.tearDown();
+ protected boolean useJmx() {
+ return false;
}
@Override
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationOnlyRegisterProcessorWithCustomIdTest.java Mon Mar 22 19:57:31 2010
@@ -34,6 +34,11 @@ public class JmxInstrumentationOnlyRegis
protected String domainName = DefaultManagementAgent.DEFAULT_DOMAIN;
protected MBeanServer server;
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testCustomId() throws Exception {
Set s = server.queryNames(new ObjectName(domainName + ":type=endpoints,*"), null);
assertEquals("Could not find 2 endpoints: " + s, 6, s.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingDefaultsTest.java Mon Mar 22 19:57:31 2010
@@ -42,6 +42,11 @@ public class JmxInstrumentationUsingDefa
protected MBeanServerConnection mbsc;
protected long sleepForConnection;
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected boolean canRunOnThisPlatform() {
return true;
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPlatformMBSTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import javax.management.ObjectName;
public class JmxInstrumentationUsingPlatformMBSTest extends JmxInstrumentationUsingPropertiesTest {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
System.setProperty(JmxSystemPropertyKeys.USE_PLATFORM_MBS, "False");
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationUsingPropertiesTest.java Mon Mar 22 19:57:31 2010
@@ -26,6 +26,11 @@ import javax.management.ObjectName;
public class JmxInstrumentationUsingPropertiesTest extends JmxInstrumentationUsingDefaultsTest {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
domainName = "org.apache.camel-properties";
System.setProperty(JmxSystemPropertyKeys.DOMAIN, domainName);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/JmxInstrumentationWithConnectorTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ public class JmxInstrumentationWithConne
protected static final String JMXSERVICEURL = "service:jmx:rmi:///jndi/rmi://localhost:2123/jmxrmi/camel";
protected JMXConnector clientConnector;
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected boolean canRunOnThisPlatform() {
String os = System.getProperty("os.name");
// Does not work on AIX and the problem is hard to identify, could be issues not allowing to use a custom port
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/LoggingEventNotifierTest.java Mon Mar 22 19:57:31 2010
@@ -27,6 +27,11 @@ import org.apache.camel.impl.DefaultCame
public class LoggingEventNotifierTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
LoggingEventNotifier notifier = new LoggingEventNotifier();
notifier.setLogName("org.apache.camel.EventLog");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointEmptyTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedBrowseableEndpointEmptyTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedBrowseableEndpointTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedBrowseableEndpointTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedCamelContextTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextTracerTest.java Mon Mar 22 19:57:31 2010
@@ -34,6 +34,11 @@ import org.apache.camel.processor.interc
public class ManagedCamelContextTracerTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedDelayerTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedDelayerTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerOptionsTest.java Mon Mar 22 19:57:31 2010
@@ -38,6 +38,11 @@ public class ManagedErrorHandlerOptionsT
private static int counter;
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerRedeliveryTest.java Mon Mar 22 19:57:31 2010
@@ -38,6 +38,11 @@ public class ManagedErrorHandlerRedelive
private static int counter;
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedErrorHandlerTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedErrorHandlerTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterCamelContextTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRegisterCamelContextTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterEndpointTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRegisterEndpointTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterExchangeStatisticsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterExchangeStatisticsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterExchangeStatisticsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterExchangeStatisticsTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRegisterExchangeStatisticsTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterRouteTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
*/
public class ManagedRegisterRouteTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testRoutes() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRegisterTwoRoutesTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRegisterTwoRoutesTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteContextTracerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteContextTracerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteContextTracerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteContextTracerTest.java Mon Mar 22 19:57:31 2010
@@ -33,6 +33,11 @@ import org.apache.camel.processor.interc
public class ManagedRouteContextTracerTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRoutePerformanceCounterTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRoutePerformanceCounterTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteShutdownAndStartTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.component.mock.M
public class ManagedRouteShutdownAndStartTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
deleteDirectory("target/managed");
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartCleanupTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.component.mock.M
*/
public class ManagedRouteStopAndStartCleanupTest extends ManagedRouteStopAndStartTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
@SuppressWarnings("unchecked")
public void testStopAndStartRoute() throws Exception {
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopAndStartTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.component.mock.M
public class ManagedRouteStopAndStartTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
deleteDirectory("target/managed");
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteStopTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.builder.RouteBui
*/
public class ManagedRouteStopTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testStopRoute() throws Exception {
// fire a message to get it running
getMockEndpoint("mock:result").expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteWithOnExceptionTest.java Mon Mar 22 19:57:31 2010
@@ -26,6 +26,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedRouteWithOnExceptionTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
System.setProperty(JmxSystemPropertyKeys.CREATE_CONNECTOR, "true");
super.setUp();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedScheduledPollConsumerTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedScheduledPollConsumerTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSendProcessorTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.component.mock.M
public class ManagedSendProcessorTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedShutdownStrategyTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedShutdownStrategyTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsDisabledTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedStatisticsDisabledTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelOffTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedStatisticsLevelOffTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsLevelRoutesOnlyTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedStatisticsLevelRoutesOnlyTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedSuspendedServiceTest.java Mon Mar 22 19:57:31 2010
@@ -33,6 +33,11 @@ import org.apache.camel.impl.RoutePolicy
*/
public class ManagedSuspendedServiceTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testConsumeSuspendAndResumeFile() throws Exception {
deleteDirectory("target/suspended");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedThreadPoolTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
@@ -42,7 +47,6 @@ public class ManagedThreadPoolTest exten
MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=threadpools,*"), null);
- assertEquals(1, set.size());
ObjectName on = set.iterator().next();
Boolean shutdown = (Boolean) mbeanServer.getAttribute(on, "Shutdown");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedThrottlerTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTimerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTimerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTimerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTimerTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedTimerTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedTracerOptionsTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.builder.RouteBui
public class ManagedTracerOptionsTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterComponentTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterConsumerTest.java Mon Mar 22 19:57:31 2010
@@ -31,6 +31,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterConsumerTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterEndpointTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterEndpointTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProcessorTest.java Mon Mar 22 19:57:31 2010
@@ -30,6 +30,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterProcessorTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterProducerTest.java Mon Mar 22 19:57:31 2010
@@ -33,6 +33,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterProducerTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterRouteTest.java Mon Mar 22 19:57:31 2010
@@ -29,6 +29,11 @@ import org.apache.camel.impl.DefaultCame
*/
public class ManagedUnregisterRouteTest extends ContextTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext();
DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultiInstanceProcessorTest.java Mon Mar 22 19:57:31 2010
@@ -32,6 +32,11 @@ import org.apache.camel.component.mock.M
public class MultiInstanceProcessorTest extends JmxInstrumentationUsingDefaultsTest {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected RouteBuilder createRouteBuilder() {
return new RouteBuilder() {
public void configure() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/MultipleEventNotifierEventsTest.java Mon Mar 22 19:57:31 2010
@@ -44,6 +44,11 @@ public class MultipleEventNotifierEvents
private static List<EventObject> events2 = new ArrayList<EventObject>();
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
public void setUp() throws Exception {
events.clear();
events2.clear();
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/PublishEventNotifierTest.java Mon Mar 22 19:57:31 2010
@@ -27,6 +27,11 @@ import org.apache.camel.impl.DefaultCame
public class PublishEventNotifierTest extends ContextTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = new DefaultCamelContext(createRegistry());
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/DualCamelContextManagedTest.java Mon Mar 22 19:57:31 2010
@@ -33,6 +33,11 @@ import org.springframework.context.suppo
public class DualCamelContextManagedTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected int getExpectedRouteCount() {
return 0;
}
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/JmxInstrumentationWithConnectorTest.java Mon Mar 22 19:57:31 2010
@@ -24,6 +24,11 @@ import org.springframework.context.suppo
public class JmxInstrumentationWithConnectorTest extends EndpointReferenceTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
public void testJmxConfiguration() throws Exception {
ManagementAgent agent = getMandatoryBean(DefaultManagementAgent.class, "agent");
assertNotNull("SpringInstrumentationAgent must be configured for JMX support", agent);
Modified: camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java?rev=926292&r1=926291&r2=926292&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java (original)
+++ camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringCamelContextStartingFailedEventTest.java Mon Mar 22 19:57:31 2010
@@ -27,6 +27,11 @@ import org.springframework.context.suppo
*/
public class SpringCamelContextStartingFailedEventTest extends SpringTestSupport {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected AbstractXmlApplicationContext createApplicationContext() {
AbstractXmlApplicationContext answer = null;
try {