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 2017/05/25 09:33:17 UTC
[05/13] camel git commit: Make camel-spring test faster and disable
JMX for non-JMX tests
Make camel-spring test faster and disable JMX for non-JMX tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a87544ac
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a87544ac
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a87544ac
Branch: refs/heads/master
Commit: a87544acfcd7ec0d256f19804628877dc2f2ad50
Parents: 28efd0d
Author: Claus Ibsen <da...@apache.org>
Authored: Wed May 24 19:15:04 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu May 25 11:09:52 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/spring/DefaultJMXAgentTest.java | 5 +++++
.../apache/camel/spring/LifecycleStrategyInjectionTest.java | 4 ++--
.../camel/spring/MultipleLifecycleStrategyInjectionTest.java | 4 ++--
.../org/apache/camel/spring/SpringEndpointPropertyTest.java | 6 ++++--
.../test/java/org/apache/camel/spring/SpringTestSupport.java | 8 ++++++++
.../management/ManagedEndpointInjectRefEndpointTest.java | 5 +++++
.../camel/spring/management/ManagedRefEndpointTest.java | 5 +++++
.../spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java | 5 +++++
.../SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java | 5 +++++
.../spring/management/SpringJmxDumpRoutesAsXmlTest.java | 5 +++++
.../management/SpringJmxEndpointInjectBeanRefTest.java | 5 +++++
.../management/SpringJmxEndpointInjectBeanRefTwoTest.java | 5 +++++
.../spring/management/SpringJmxEndpointInjectBeanTest.java | 5 +++++
.../management/SpringJmxRecipientListRegisterAlwaysTest.java | 5 +++++
.../camel/spring/management/SpringJmxRecipientListTest.java | 5 +++++
.../spring/management/SpringLoggingEventNotifierTest.java | 5 +++++
.../spring/management/SpringManagedCamelContextTest.java | 5 +++++
.../spring/management/SpringManagedCustomProcessorTest.java | 5 +++++
.../spring/management/SpringManagedErrorHandlerTest.java | 5 +++++
.../spring/management/SpringManagedNamePatternFixedTest.java | 5 +++++
.../spring/management/SpringManagedNamePatternTest.java | 5 +++++
.../camel/spring/management/SpringManagedResourceTest.java | 6 ++++++
...pringManagedRouteRemoveContextScopedErrorHandlerTest.java | 5 +++++
...agedRouteRemoveRouteAndContextScopedErrorHandlerTest.java | 5 +++++
.../SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java | 5 +++++
.../camel/spring/management/SpringManagedSanitizeTest.java | 5 +++++
.../spring/management/SpringManagedSedaEndpointTest.java | 5 +++++
.../management/SpringManagedStatisticsLevelOffTest.java | 5 +++++
.../SpringManagedStatisticsLevelRoutesOnlyTest.java | 5 +++++
.../management/SpringManagedTransactedProcessorTest.java | 5 +++++
.../spring/management/SpringPublishEventNotifierTest.java | 5 +++++
.../org/apache/camel/spring/SpringEndpointPropertyTest.xml | 2 +-
32 files changed, 153 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
index b90cf4f..9929976 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/DefaultJMXAgentTest.java
@@ -37,6 +37,11 @@ public class DefaultJMXAgentTest extends SpringTestSupport {
protected long sleepForConnection = 3000;
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected void setUp() throws Exception {
releaseMBeanServers();
super.setUp();
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
index 5f41504..be54a63 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/LifecycleStrategyInjectionTest.java
@@ -32,8 +32,8 @@ public class LifecycleStrategyInjectionTest extends SpringTestSupport {
}
public void testInjectedStrategy() throws Exception {
- assertEquals(3, context.getLifecycleStrategies().size());
- assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(1));
+ assertEquals(2, context.getLifecycleStrategies().size());
+ assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(0));
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
index eae218a..155c122 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/MultipleLifecycleStrategyInjectionTest.java
@@ -32,9 +32,9 @@ public class MultipleLifecycleStrategyInjectionTest extends SpringTestSupport {
}
public void testInjectedStrategy() throws Exception {
- assertEquals(4, context.getLifecycleStrategies().size());
+ assertEquals(3, context.getLifecycleStrategies().size());
+ assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(0));
assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(1));
- assertIsInstanceOf(DummyLifecycleStrategy.class, context.getLifecycleStrategies().get(2));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
index f2ae331..600c173 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringEndpointPropertyTest.java
@@ -27,6 +27,8 @@ public class SpringEndpointPropertyTest extends SpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
+ System.clearProperty("CamelSedaPollTimeout");
+
return new ClassPathXmlApplicationContext("org/apache/camel/spring/SpringEndpointPropertyTest.xml");
}
@@ -39,9 +41,9 @@ public class SpringEndpointPropertyTest extends SpringTestSupport {
SedaEndpoint foo = applicationContext.getBean("foo", SedaEndpoint.class);
assertNotNull(foo);
assertEquals(100, foo.getSize());
- assertEquals(5000, foo.getPollTimeout());
+ assertEquals(250, foo.getPollTimeout());
assertEquals(true, foo.isBlockWhenFull());
- assertEquals("seda://foo?blockWhenFull=true&pollTimeout=5000&size=100", foo.getEndpointUri());
+ assertEquals("seda://foo?blockWhenFull=true&pollTimeout=250&size=100", foo.getEndpointUri());
SedaEndpoint bar = applicationContext.getBean("bar", SedaEndpoint.class);
assertNotNull(bar);
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
index 1729b13..243a53c 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
@@ -50,6 +50,14 @@ public abstract class SpringTestSupport extends ContextTestSupport {
System.setProperty(AbstractCamelContextFactoryBean.LAZY_LOAD_TYPE_CONVERTERS, "false");
}
+ // we want SpringTestSupport to startup faster and not use JMX by default and should stop seda quicker
+ System.setProperty("CamelSedaPollTimeout", "10");
+ if(!this.useJmx()) {
+ this.disableJMX();
+ } else {
+ this.enableJMX();
+ }
+
applicationContext = createApplicationContext();
assertNotNull("Should have created a valid spring context", applicationContext);
super.setUp();
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
index 1a35859..443ed3f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class ManagedEndpointInjectRefEndpointTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/ManagedEndpointInjectRefEndpointTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
index 75d93da..2abbfac 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/ManagedRefEndpointTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class ManagedRefEndpointTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/ManagedRefEndpointTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
index 2b4940e..de54ea0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpCBRRoutesAsXmlTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxDumpCBRRoutesAsXmlTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxDumpCBRRouteAsXmlTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
index adca08d..fb7937e 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlIncludeHostNameTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxDumpRoutesAsXmlIncludeHostNameTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlIncludeHostNameTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
index ab384e4..662aa6a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxDumpRoutesAsXmlTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxDumpRoutesAsXmlTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxDumpRouteAsXmlTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
index 42d7e50..d7e54f4 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxEndpointInjectBeanRefTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
index 2b427b7..64dde67 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxEndpointInjectBeanRefTwoTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxEndpointInjectBeanRefTwoTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
index 679b385..ea7375b 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxEndpointInjectBeanTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxEndpointInjectBeanTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
index d44baa2..fb4f13f 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListRegisterAlwaysTest.java
@@ -30,6 +30,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxRecipientListRegisterAlwaysTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxRecipientListTestRegisterAlways.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
index 84ec19a..594aa28 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringJmxRecipientListTest.java
@@ -30,6 +30,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringJmxRecipientListTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringJmxRecipientListTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
index aadd48c..a851e37 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringLoggingEventNotifierTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringLoggingEventNotifierTest extends LoggingEventNotifierTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringLoggingEventNotifierTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
index 674f88e..143b9ba 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCamelContextTest.java
@@ -31,6 +31,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringManagedCamelContextTest extends ManagedCamelContextTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedCamelContextTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
index b2c50a9..b48fbb0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedCustomProcessorTest.java
@@ -34,6 +34,11 @@ import org.springframework.jmx.export.annotation.ManagedResource;
public class SpringManagedCustomProcessorTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringManagedCustomProcessorTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
index a21c8e9..ee49974 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedErrorHandlerTest.java
@@ -25,6 +25,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedErrorHandlerTest extends ManagedErrorHandlerTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedErrorHandlerTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
index 85c3869..05f6fc0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedNamePatternFixedTest extends ManagedNamePatternFixedTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedNamePatternFixedTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
index a08226a..cc8bcca 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedNamePatternTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedNamePatternTest extends ManagedNamePatternTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedNamePatternTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
index 57b7f14..a21ecb0 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedResourceTest.java
@@ -22,6 +22,12 @@ import org.apache.camel.management.ManagedResourceTest;
import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCamelContext;
public class SpringManagedResourceTest extends ManagedResourceTest {
+
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedResourceTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
index f99293b..72ab638 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedRouteRemoveContextScopedErrorHandlerTest extends ManagedRouteRemoveContextScopedErrorHandlerTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedRouteRemoveContextScopedErrorHandlerTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
index e66bc25..185a507 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest extends ManagedRouteRemoveRouteAndContextScopedErrorHandlerTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedRouteRemoveRouteAndContextScopedErrorHandlerTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
index 16a2ab8..54802dd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedRouteRemoveRouteScopedErrorHandlerTest extends ManagedRouteRemoveRouteScopedErrorHandlerTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedRouteRemoveRouteScopedErrorHandlerTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
index e3b588c..9c8995d 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSanitizeTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedSanitizeTest extends ManagedSanitizeTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedSanitizeTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
index 8849080..faa7623 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedSedaEndpointTest.java
@@ -29,6 +29,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringManagedSedaEndpointTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringManagedSedaEndpointTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
index 59f049f..31b6829 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.java
@@ -25,6 +25,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedStatisticsLevelOffTest extends ManagedStatisticsLevelOffTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringManagedStatisticsLevelOffTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
index 619613a..d4ba03a 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedStatisticsLevelRoutesOnlyTest.java
@@ -25,6 +25,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringManagedStatisticsLevelRoutesOnlyTest extends ManagedStatisticsLevelRoutesOnlyTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/ManagedStatisticsLevelRoutesOnlyTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
index c32383d..4f29eb1 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.java
@@ -30,6 +30,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
public class SpringManagedTransactedProcessorTest extends SpringTestSupport {
@Override
+ protected boolean useJmx() {
+ return true;
+ }
+
+ @Override
protected AbstractXmlApplicationContext createApplicationContext() {
return new ClassPathXmlApplicationContext("org/apache/camel/spring/management/SpringManagedTransactedProcessorTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
index 9ba0cd3..4969921 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/spring/management/SpringPublishEventNotifierTest.java
@@ -26,6 +26,11 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
*/
public class SpringPublishEventNotifierTest extends PublishEventNotifierTest {
+ @Override
+ protected boolean useJmx() {
+ return true;
+ }
+
protected CamelContext createCamelContext() throws Exception {
return createSpringCamelContext(this, "org/apache/camel/spring/management/SpringPublishEventNotifierTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a87544ac/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml b/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
index d3d6ce5..d6a64b0 100644
--- a/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
+++ b/components/camel-spring/src/test/resources/org/apache/camel/spring/SpringEndpointPropertyTest.xml
@@ -34,7 +34,7 @@
<!-- inside camelContext -->
<endpoint id="foo" uri="seda:foo">
<property key="size" value="100"/>
- <property key="pollTimeout" value="5000"/>
+ <property key="pollTimeout" value="250"/>
<property key="blockWhenFull" value="true"/>
</endpoint>