Return-Path: Delivered-To: apmail-camel-commits-archive@www.apache.org Received: (qmail 3675 invoked from network); 13 Jan 2011 14:54:12 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.3) by minotaur.apache.org with SMTP; 13 Jan 2011 14:54:12 -0000 Received: (qmail 21677 invoked by uid 500); 13 Jan 2011 14:54:12 -0000 Delivered-To: apmail-camel-commits-archive@camel.apache.org Received: (qmail 21622 invoked by uid 500); 13 Jan 2011 14:54:10 -0000 Mailing-List: contact commits-help@camel.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@camel.apache.org Delivered-To: mailing list commits@camel.apache.org Received: (qmail 21612 invoked by uid 99); 13 Jan 2011 14:54:09 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 14:54:09 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 13 Jan 2011 14:54:07 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 895DA23889E9; Thu, 13 Jan 2011 14:53:41 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1058591 [2/2] - in /camel/trunk/camel-core/src/test/java/org/apache/camel: management/ processor/aggregator/ Date: Thu, 13 Jan 2011 14:53:40 -0000 To: commits@camel.apache.org From: davsclaus@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110113145341.895DA23889E9@eris.apache.org> 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -21,7 +21,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.Route; import org.apache.camel.builder.RouteBuilder; @@ -31,17 +30,12 @@ import org.apache.camel.impl.RoutePolicy /** * @version $Revision$ */ -public class ManagedSuspendedServiceTest extends ContextTestSupport { +public class ManagedSuspendedServiceTest extends ManagementTestSupport { - @Override - protected boolean useJmx() { - return true; - } - public void testConsumeSuspendAndResumeFile() throws Exception { deleteDirectory("target/suspended"); - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null); assertEquals(1, set.size()); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolProfileTest.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$ */ -public class ManagedThreadPoolProfileTest 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 ManagedThreadPoolProfileTest 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/ManagedThreadPoolTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolTest.java?rev=1058591&r1=1058590&r2=1058591&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 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 ManagedThreadPoolTest extends ContextTestSupport { +public class ManagedThreadPoolTest 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=threads1(threads)"); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThreadPoolWithIdTest.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 ManagedThreadPoolWithIdTest extends ContextTestSupport { +public class ManagedThreadPoolWithIdTest 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/ManagedThrottlerTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedThrottlerTest.java?rev=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -20,28 +20,12 @@ 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 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(); - naming.setHostName("localhost"); - naming.setDomainName("org.apache.camel"); - return context; - } +public class ManagedThrottlerTest extends ManagementTestSupport { public void testManageThrottler() throws Exception { getMockEndpoint("mock:result").expectedMessageCount(10); @@ -58,7 +42,7 @@ public class ManagedThrottlerTest extend assertMockEndpointsSatisfied(); // get the stats for the route - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); // get the object name for the delayer ObjectName throttlerName = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=processors,name=\"mythrottler\""); 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -21,32 +21,16 @@ 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.component.mock.MockEndpoint; -import org.apache.camel.impl.DefaultCamelContext; /** * @version $Revision$ */ -public class ManagedTimerTest extends ContextTestSupport { +public class ManagedTimerTest extends ManagementTestSupport { - @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 testTimer() 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=\"timer://foo\\?delay=5000&period=8000\""); assertEquals("Should be registered", true, mbeanServer.isRegistered(name)); 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -21,32 +21,16 @@ 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; /** * @version $Revision$ */ -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(); - naming.setHostName("localhost"); - naming.setDomainName("org.apache.camel"); - return context; - } +public class ManagedTracerOptionsTest extends ManagementTestSupport { public void testManagedTracerOptions() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=tracer,*"), null); assertEquals(1, set.size()); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterCamelContextTest.java Thu Jan 13 14:53:38 2011 @@ -17,38 +17,21 @@ package org.apache.camel.management; import java.util.Map; - 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.impl.DefaultCamelContext; /** * @version $Revision$ */ -public class ManagedUnregisterCamelContextTest 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 ManagedUnregisterCamelContextTest extends ManagementTestSupport { @SuppressWarnings("unchecked") public void testUnregisterCamelContext() throws Exception { // The camel context already started by ContextTestSupport in the startup method - 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/ManagedUnregisterComponentTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagedUnregisterComponentTest.java?rev=1058591&r1=1058590&r2=1058591&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 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.ServiceStatus; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.DefaultCamelContext; /** * @version $Revision$ */ -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(); - naming.setHostName("localhost"); - naming.setDomainName("org.apache.camel"); - return context; - } +public class ManagedUnregisterComponentTest extends ManagementTestSupport { public void testUnregisterComponent() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=components,*"), null); assertEquals(2, set.size()); 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -29,23 +29,10 @@ import org.apache.camel.impl.DefaultCame /** * @version $Revision$ */ -public class ManagedUnregisterConsumerTest extends ContextTestSupport { +public class ManagedUnregisterConsumerTest extends ManagementTestSupport { - @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 testUnregisterConsumer() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=consumers,*"), null); assertEquals(1, set.size()); 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=1058591&r1=1058590&r2=1058591&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 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 ManagedUnregisterEndpointTest 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 ManagedUnregisterEndpointTest extends ManagementTestSupport { public void testUnregisterEndpoint() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); ObjectName on = ObjectName.getInstance("org.apache.camel:context=localhost/camel-1,type=endpoints,name=\"mock://result\""); 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -20,31 +20,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; -import org.apache.camel.impl.DefaultCamelContext; /** * @version $Revision$ */ -public class ManagedUnregisterProcessorTest extends ContextTestSupport { +public class ManagedUnregisterProcessorTest extends ManagementTestSupport { - @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 testUnregisterProcessor() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=processors,*"), null); assertEquals(1, set.size()); 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -16,35 +16,15 @@ */ 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.Endpoint; import org.apache.camel.Exchange; import org.apache.camel.Producer; import org.apache.camel.builder.RouteBuilder; -import org.apache.camel.impl.DefaultCamelContext; /** * @version $Revision$ */ -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(); - naming.setHostName("localhost"); - naming.setDomainName("org.apache.camel"); - return context; - } +public class ManagedUnregisterProducerTest extends ManagementTestSupport { public void testUnregisterProducer() throws Exception { // send a message so the managed producer is started @@ -61,7 +41,7 @@ public class ManagedUnregisterProducerTe // TODO: producers are not managed due they can lead to memory leak CAMEL-2484 -// MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); +// MBeanServer mbeanServer = getMBeanServer(); // Set set = mbeanServer.queryNames(new ObjectName("*:type=producers,*"), null); // assertEquals(0, set.size()); 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=1058591&r1=1058590&r2=1058591&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 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 ManagedUnregisterRouteTest 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 ManagedUnregisterRouteTest extends ManagementTestSupport { public void testUnregisterRoute() 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\""); Added: camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java?rev=1058591&view=auto ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java (added) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/ManagementTestSupport.java Thu Jan 13 14:53:38 2011 @@ -0,0 +1,49 @@ +/** + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package org.apache.camel.management; + +import javax.management.MBeanServer; + +import org.apache.camel.CamelContext; +import org.apache.camel.ContextTestSupport; +import org.apache.camel.impl.DefaultCamelContext; + +/** + * Base class for JMX tests. + * + * @version $Revision$ + */ +public abstract class ManagementTestSupport 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; + } + + protected MBeanServer getMBeanServer() { + return context.getManagementStrategy().getManagementAgent().getMBeanServer(); + } + +} 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=1058591&r1=1058590&r2=1058591&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 Thu Jan 13 14:53:38 2011 @@ -32,11 +32,6 @@ 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/RemoveRouteDefinitionTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/management/RemoveRouteDefinitionTest.java Thu Jan 13 14:53:38 2011 @@ -22,25 +22,18 @@ 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; import org.apache.camel.model.RouteDefinition; /** * @version $Revision$ */ -public class RemoveRouteDefinitionTest extends ContextTestSupport { - - @Override - protected boolean useJmx() { - return true; - } +public class RemoveRouteDefinitionTest extends ManagementTestSupport { @SuppressWarnings("unchecked") public void testShutdownRoute() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null); assertEquals(1, set.size()); @@ -62,7 +55,7 @@ public class RemoveRouteDefinitionTest e public void testStopRoute() throws Exception { - MBeanServer mbeanServer = context.getManagementStrategy().getManagementAgent().getMBeanServer(); + MBeanServer mbeanServer = getMBeanServer(); Set set = mbeanServer.queryNames(new ObjectName("*:type=routes,*"), null); assertEquals(1, set.size()); Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java?rev=1058591&r1=1058590&r2=1058591&view=diff ============================================================================== --- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java (original) +++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/BeanBeforeAggregateIssueTest.java Thu Jan 13 14:53:38 2011 @@ -34,24 +34,24 @@ public class BeanBeforeAggregateIssueTes assertMockEndpointsSatisfied(); } - @Override - protected RouteBuilder createRouteBuilder() throws Exception { - return new RouteBuilder() { - @Override - public void configure() throws Exception { - from("seda:start") - .bean(TestBean.class) - .aggregate(constant("true"), new BodyInAggregatingStrategy()) - .completionSize(2) - .to("mock:result"); - } - }; - } + @Override + protected RouteBuilder createRouteBuilder() throws Exception { + return new RouteBuilder() { + @Override + public void configure() throws Exception { + from("seda:start") + .bean(TestBean.class) + .aggregate(constant("true"), new BodyInAggregatingStrategy()) + .completionSize(2) + .to("mock:result"); + } + }; + } - public static final class TestBean { + public static final class TestBean { - public String doNothing(String foo) { - return foo; - } - } + public String doNothing(String foo) { + return foo; + } + } }