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 2011/01/13 15:53:40 UTC
svn commit: r1058591 [1/2] - in
/camel/trunk/camel-core/src/test/java/org/apache/camel: management/
processor/aggregator/
Author: davsclaus
Date: Thu Jan 13 14:53:38 2011
New Revision: 1058591
URL: http://svn.apache.org/viewvc?rev=1058591&view=rev
Log:
Polished management test to reuse base test class. Fixed CS.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.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/ManagedCamelContextAutoStartupTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendResumeTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendStartTest.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/ManagedCustomBeanTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.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/ManagedFileIdempotentConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedProducerCacheTest.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/ManagedRouteAutoStartupTest.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/ManagedRouteRemoveTest.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/ManagedRouteSuspendAndResumeTest.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/ManagedServiceUrlPathTest.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/ManagedStatisticsTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.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/ManagedThreadPoolProfileTest.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/ManagedThreadPoolWithIdTest.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/ManagedUnregisterCamelContextTest.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/RemoveRouteDefinitionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolProfileTest.java Thu Jan 13 14:53:38 2011
@@ -16,13 +16,9 @@
*/
package org.apache.camel.management;
-import java.util.Iterator;
-import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ThreadPoolRejectedPolicy;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.ThreadPoolProfileSupport;
@@ -31,24 +27,10 @@ import org.apache.camel.spi.ThreadPoolPr
/**
* @version $Revision: 1005721 $
*/
-public class DualManagedThreadPoolProfileTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class DualManagedThreadPoolProfileTest extends ManagementTestSupport {
public void testManagedThreadPool() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=threads1(threads)");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/DualManagedThreadPoolWithIdTest.java Thu Jan 13 14:53:38 2011
@@ -16,36 +16,18 @@
*/
package org.apache.camel.management;
-import java.util.Iterator;
-import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision: 1005721 $
*/
-public class DualManagedThreadPoolWithIdTest extends ContextTestSupport {
+public class DualManagedThreadPoolWithIdTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManagedThreadPool() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=threadpools,name=myThreads(threads)");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,31 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedBrowseableEndpointEmptyTest extends ManagementTestSupport {
public void testBrowseableEndpointEmpty() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
String out = (String) mbeanServer.invoke(name, "browseExchange", new Object[]{0}, new String[]{"java.lang.Integer"});
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,28 +19,12 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedBrowseableEndpointTest extends ManagementTestSupport {
public void testBrowseableEndpoint() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(2);
@@ -50,7 +34,7 @@ public class ManagedBrowseableEndpointTe
assertMockEndpointsSatisfied();
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\"");
String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextAutoStartupTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextAutoStartupTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextAutoStartupTest.java Thu Jan 13 14:53:38 2011
@@ -19,31 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision$
*/
-public class ManagedCamelContextAutoStartupTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCamelContextAutoStartupTest extends ManagementTestSupport {
public void testManagedCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
ObjectName onRoute = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"foo\"");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendResumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendResumeTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendResumeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendResumeTest.java Thu Jan 13 14:53:38 2011
@@ -19,32 +19,16 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision: 980370 $
*/
-public class ManagedCamelContextSuspendResumeTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCamelContextSuspendResumeTest extends ManagementTestSupport {
public void testManagedCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendStartTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendStartTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendStartTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCamelContextSuspendStartTest.java Thu Jan 13 14:53:38 2011
@@ -19,32 +19,16 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision: 980370 $
*/
-public class ManagedCamelContextSuspendStartTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCamelContextSuspendStartTest extends ManagementTestSupport {
public void testManagedCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,32 +19,16 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCamelContextTest extends ManagementTestSupport {
public void testManagedCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,8 +21,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -31,24 +29,10 @@ import org.apache.camel.processor.interc
/**
* @version $Revision$
*/
-public class ManagedCamelContextTracerTest extends ContextTestSupport {
+public class ManagedCamelContextTracerTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testCamelContextTracing() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName camel = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=tracer,*"), null);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomBeanTest.java Thu Jan 13 14:53:38 2011
@@ -21,8 +21,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Headers;
import org.apache.camel.builder.RouteBuilder;
import org.springframework.jmx.export.annotation.ManagedAttribute;
@@ -31,24 +29,10 @@ import org.springframework.jmx.export.an
/**
* @version $Revision: 950375 $
*/
-public class ManagedCustomBeanTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCustomBeanTest extends ManagementTestSupport {
public void testManageCustomBean() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"custom\"");
getMockEndpoint("mock:result").expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedCustomProcessorTest.java Thu Jan 13 14:53:38 2011
@@ -20,8 +20,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
@@ -31,24 +29,10 @@ import org.springframework.jmx.export.an
/**
* @version $Revision: 950375 $
*/
-public class ManagedCustomProcessorTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedCustomProcessorTest extends ManagementTestSupport {
public void testManageCustomProcessor() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"custom\"");
getMockEndpoint("mock:result").expectedMessageCount(1);
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,29 +19,13 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedDelayerTest extends ContextTestSupport {
+public class ManagedDelayerTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManageDelay() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -50,7 +34,7 @@ public class ManagedDelayerTest extends
assertMockEndpointsSatisfied();
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
// get the object name for the delayer
ObjectName delayerName = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"mydelayer\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,9 +21,7 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
@@ -33,28 +31,14 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedErrorHandlerOptionsTest extends ContextTestSupport {
+public class ManagedErrorHandlerOptionsTest extends ManagementTestSupport {
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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManagedErrorHandlerOptions() throws Exception {
counter = 0;
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=errorhandlers,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,9 +21,7 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.LoggingLevel;
import org.apache.camel.Processor;
@@ -33,28 +31,14 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedErrorHandlerRedeliveryTest extends ContextTestSupport {
+public class ManagedErrorHandlerRedeliveryTest extends ManagementTestSupport {
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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManagedErrorHandlerRedelivery() throws Exception {
counter = 0;
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=errorhandlers,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,31 +21,15 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedErrorHandlerTest extends ContextTestSupport {
+public class ManagedErrorHandlerTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManagedErrorHandler() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=errorhandlers,*"), null);
// there should only be 2 error handler types as route 1 and route 3 uses the same default error handler
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedFileIdempotentConsumerTest.java Thu Jan 13 14:53:38 2011
@@ -21,15 +21,12 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.processor.idempotent.FileIdempotentRepository;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.util.CastUtils;
@@ -38,27 +35,14 @@ import org.apache.camel.util.FileUtil;
/**
* @version $Revision$
*/
-public class ManagedFileIdempotentConsumerTest extends ContextTestSupport {
+public class ManagedFileIdempotentConsumerTest extends ManagementTestSupport {
protected Endpoint startEndpoint;
protected MockEndpoint resultEndpoint;
private File store = new File("target/idempotentfilestore.dat");
private IdempotentRepository<String> repo;
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testDuplicateMessagesAreFilteredOut() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
// services
Set<ObjectName> names = CastUtils.cast(mbeanServer.queryNames(new ObjectName("org.apache.camel" + ":type=services,*"), null));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedMemoryIdempotentConsumerTest.java Thu Jan 13 14:53:38 2011
@@ -20,43 +20,26 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Endpoint;
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.Processor;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
-import org.apache.camel.impl.DefaultCamelContext;
import org.apache.camel.processor.idempotent.MemoryIdempotentRepository;
import org.apache.camel.spi.IdempotentRepository;
import org.apache.camel.util.CastUtils;
-import org.apache.camel.util.FileUtil;
/**
* @version $Revision: 937951 $
*/
-public class ManagedMemoryIdempotentConsumerTest extends ContextTestSupport {
+public class ManagedMemoryIdempotentConsumerTest extends ManagementTestSupport {
protected Endpoint startEndpoint;
protected MockEndpoint resultEndpoint;
private IdempotentRepository<String> repo;
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testDuplicateMessagesAreFilteredOut() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
// services
Set<ObjectName> names = CastUtils.cast(mbeanServer.queryNames(new ObjectName("org.apache.camel" + ":type=services,*"), null));
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedProducerCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedProducerCacheTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedProducerCacheTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedProducerCacheTest.java Thu Jan 13 14:53:38 2011
@@ -22,29 +22,13 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedProducerCacheTest extends ContextTestSupport {
+public class ManagedProducerCacheTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
-
public void testManageProducerCache() throws Exception {
getMockEndpoint("mock:result").expectedMessageCount(1);
@@ -53,7 +37,7 @@ public class ManagedProducerCacheTest ex
assertMockEndpointsSatisfied();
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=services,*"), null);
assertEquals(6, set.size());
List<ObjectName> list = new ArrayList<ObjectName>(set);
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,32 +19,16 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRegisterCamelContextTest extends ManagementTestSupport {
public void testRegisterCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
String name = (String) mbeanServer.getAttribute(on, "CamelId");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,31 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRegisterEndpointTest extends ManagementTestSupport {
public void testLookupEndpointsByName() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName name = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"direct://start\"");
String uri = (String) mbeanServer.getAttribute(name, "EndpointUri");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -19,31 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRegisterExchangeStatisticsTest extends ManagementTestSupport {
public void testExchangesCompletedStatistics() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route1\"");
Long completed = (Long) mbeanServer.getAttribute(on, "ExchangesCompleted");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,22 +20,16 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedRegisterRouteTest extends ContextTestSupport {
+public class ManagedRegisterRouteTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
public void testRoutes() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,31 +21,15 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRegisterTwoRoutesTest extends ManagementTestSupport {
public void testRoutes() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(2, set.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAutoStartupTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAutoStartupTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAutoStartupTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteAutoStartupTest.java Thu Jan 13 14:53:38 2011
@@ -19,31 +19,15 @@ package org.apache.camel.management;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision$
*/
-public class ManagedRouteAutoStartupTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = new DefaultCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRouteAutoStartupTest extends ManagementTestSupport {
public void testManagedCamelContext() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
ObjectName onFoo = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"foo\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,8 +20,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.LoggingLevel;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -30,24 +28,10 @@ import org.apache.camel.processor.interc
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRouteContextTracerTest extends ManagementTestSupport {
public void testRouteTracing() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on1 = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route1\"");
ObjectName on2 = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route2\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,32 +20,16 @@ import java.util.Date;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedRoutePerformanceCounterTest extends ManagementTestSupport {
public void testPerformanceCounterStats() throws Exception {
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route1\"");
getMockEndpoint("mock:result").expectedMessageCount(1);
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteRemoveTest.java Thu Jan 13 14:53:38 2011
@@ -20,7 +20,6 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
@@ -29,12 +28,7 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedRouteRemoveTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedRouteRemoveTest extends ManagementTestSupport {
@Override
protected void setUp() throws Exception {
@@ -43,7 +37,7 @@ public class ManagedRouteRemoveTest exte
}
public void testRemove() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = getRouteObjectName(mbeanServer);
MockEndpoint mock = getMockEndpoint("mock:result");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,7 +20,6 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
@@ -29,12 +28,7 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedRouteShutdownAndStartTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedRouteShutdownAndStartTest extends ManagementTestSupport {
@Override
protected void setUp() throws Exception {
@@ -43,7 +37,7 @@ public class ManagedRouteShutdownAndStar
}
public void testShutdownAndStartRoute() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = getRouteObjectName(mbeanServer);
MockEndpoint mock = getMockEndpoint("mock:result");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -31,13 +31,8 @@ import org.apache.camel.component.mock.M
*/
public class ManagedRouteStopAndStartCleanupTest extends ManagedRouteStopAndStartTest {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
public void testStopAndStartRoute() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = getRouteObjectName(mbeanServer);
MockEndpoint mock = getMockEndpoint("mock:result");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,7 +20,6 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
@@ -29,12 +28,7 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedRouteStopAndStartTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedRouteStopAndStartTest extends ManagementTestSupport {
@Override
protected void setUp() throws Exception {
@@ -43,7 +37,7 @@ public class ManagedRouteStopAndStartTes
}
public void testStopAndStartRoute() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = getRouteObjectName(mbeanServer);
MockEndpoint mock = getMockEndpoint("mock:result");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,27 +20,21 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedRouteStopTest extends ContextTestSupport {
+public class ManagedRouteStopTest extends ManagementTestSupport {
- @Override
- protected boolean useJmx() {
- return true;
- }
-
public void testStopRoute() throws Exception {
// fire a message to get it running
getMockEndpoint("mock:result").expectedMessageCount(1);
template.sendBody("direct:start", "Hello World");
assertMockEndpointsSatisfied();
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedRouteSuspendAndResumeTest.java Thu Jan 13 14:53:38 2011
@@ -20,7 +20,6 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
@@ -29,12 +28,7 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-public class ManagedRouteSuspendAndResumeTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedRouteSuspendAndResumeTest extends ManagementTestSupport {
@Override
protected void setUp() throws Exception {
@@ -43,7 +37,7 @@ public class ManagedRouteSuspendAndResum
}
public void testSuspendAndResume() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = getRouteObjectName(mbeanServer);
MockEndpoint mock = getMockEndpoint("mock:result");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -17,18 +17,12 @@
package org.apache.camel.management;
import org.apache.camel.CamelExecutionException;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedRouteWithOnExceptionTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedRouteWithOnExceptionTest extends ManagementTestSupport {
@Override
protected void setUp() throws Exception {
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -22,31 +22,15 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
-import org.apache.camel.impl.DefaultCamelContext;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedScheduledPollConsumerTest extends ManagementTestSupport {
public void testScheduledPollConsumer() throws Exception {
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,8 +20,6 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ServiceStatus;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -29,21 +27,7 @@ import org.apache.camel.component.mock.M
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedSendProcessorTest extends ManagementTestSupport {
public void testManageSendProcessor() throws Exception {
MockEndpoint result = getMockEndpoint("mock:result");
@@ -56,7 +40,7 @@ public class ManagedSendProcessorTest ex
assertMockEndpointsSatisfied();
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
// get the object name for the delayer
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"mysend\"");
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedServiceUrlPathTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedServiceUrlPathTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedServiceUrlPathTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedServiceUrlPathTest.java Thu Jan 13 14:53:38 2011
@@ -23,28 +23,19 @@ import javax.management.remote.JMXConnec
import javax.management.remote.JMXServiceURL;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedServiceUrlPathTest extends ContextTestSupport {
+public class ManagedServiceUrlPathTest extends ManagementTestSupport {
private static final String JMXSERVICEURL = "service:jmx:rmi:///jndi/rmi://localhost:2113/foo/bar";
private JMXConnector clientConnector;
@Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
// START SNIPPET: e1
context.getManagementStrategy().getManagementAgent().setServiceUrlPath("/foo/bar");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -20,34 +20,18 @@ import java.util.concurrent.TimeUnit;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedShutdownStrategyTest extends ManagementTestSupport {
public void testManagedShutdownStrategy() throws Exception {
// set timeout to 300
context.getShutdownStrategy().setTimeout(300);
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=context,name=\"camel-1\"");
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,35 +21,19 @@ import javax.management.Attribute;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-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();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedStatisticsDisabledTest extends ManagementTestSupport {
public void testManageStatisticsDisabled() throws Exception {
template.sendBody("direct:start", "Hello World");
template.sendBody("direct:start", "Bye World");
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -22,27 +22,17 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ManagementStatisticsLevel;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedStatisticsLevelOffTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedStatisticsLevelOffTest extends ManagementTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
-
// disable it by default
context.getManagementStrategy().setStatisticsLevel(ManagementStatisticsLevel.Off);
return context;
@@ -53,7 +43,7 @@ public class ManagedStatisticsLevelOffTe
template.sendBody("direct:start", "Bye World");
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011
@@ -21,26 +21,17 @@ import javax.management.MBeanServer;
import javax.management.ObjectName;
import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.ManagementStatisticsLevel;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedStatisticsLevelRoutesOnlyTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
+public class ManagedStatisticsLevelRoutesOnlyTest extends ManagementTestSupport {
@Override
protected CamelContext createCamelContext() throws Exception {
CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
// only routes
context.getManagementStrategy().setStatisticsLevel(ManagementStatisticsLevel.RoutesOnly);
@@ -52,7 +43,7 @@ public class ManagedStatisticsLevelRoute
template.sendBody("direct:start", "Bye World");
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsTest.java Thu Jan 13 14:53:38 2011
@@ -20,32 +20,16 @@ import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision$
*/
-public class ManagedStatisticsTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedStatisticsTest extends ManagementTestSupport {
public void testManageStatistics() throws Exception {
// get the stats for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
Set<ObjectName> set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null);
assertEquals(1, set.size());
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedStatisticsWithSplitterTest.java Thu Jan 13 14:53:38 2011
@@ -16,36 +16,19 @@
*/
package org.apache.camel.management;
-import java.util.Set;
import javax.management.MBeanServer;
import javax.management.ObjectName;
-import org.apache.camel.CamelContext;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
/**
* @version $Revision: 926292 $
*/
-public class ManagedStatisticsWithSplitterTest extends ContextTestSupport {
-
- @Override
- protected boolean useJmx() {
- return true;
- }
-
- @Override
- protected CamelContext createCamelContext() throws Exception {
- CamelContext context = super.createCamelContext();
- DefaultManagementNamingStrategy naming = (DefaultManagementNamingStrategy) context.getManagementStrategy().getManagementNamingStrategy();
- naming.setHostName("localhost");
- naming.setDomainName("org.apache.camel");
- return context;
- }
+public class ManagedStatisticsWithSplitterTest extends ManagementTestSupport {
public void testManageStatistics() throws Exception {
// get the status for the route
- MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer();
+ MBeanServer mbeanServer = getMBeanServer();
ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=routes,name=\"route-a\"");