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:16 UTC
[04/13] camel git commit: Make spring rest tests faster
Make spring rest tests faster
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/a2324c38
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/a2324c38
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/a2324c38
Branch: refs/heads/master
Commit: a2324c38a2a3777406bf4c1b7e8794b98d0a637f
Parents: a87544a
Author: Claus Ibsen <da...@apache.org>
Authored: Wed May 24 19:42:04 2017 +0200
Committer: Claus Ibsen <da...@apache.org>
Committed: Thu May 25 11:09:52 2017 +0200
----------------------------------------------------------------------
.../java/org/apache/camel/spring/CamelContextFactoryBean.java | 5 +++++
.../main/java/org/apache/camel/spring/SpringCamelContext.java | 5 +++++
.../test/java/org/apache/camel/component/rest/RestRefTest.java | 1 +
.../camel/component/rest/SpringFromRestConfigurationTest.java | 1 +
.../camel/component/rest/SpringFromRestDuplicateTest.java | 1 +
.../component/rest/SpringFromRestGetEmbeddedRouteTest.java | 1 +
.../camel/component/rest/SpringFromRestGetInterceptTest.java | 1 +
.../camel/component/rest/SpringFromRestGetOnExceptionTest.java | 1 +
.../component/rest/SpringFromRestGetRouteOnExceptionTest.java | 1 +
.../org/apache/camel/component/rest/SpringFromRestGetTest.java | 1 +
.../component/rest/SpringFromRestIdAndDescriptionTest.java | 1 +
.../camel/component/rest/SpringFromRestUriPrefixTest.java | 1 +
12 files changed, 20 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
index 3faa12d..9914942 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/CamelContextFactoryBean.java
@@ -69,6 +69,7 @@ import org.apache.camel.spi.PackageScanFilter;
import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.BridgePropertyPlaceholderConfigurer;
import org.apache.camel.util.CamelContextHelper;
+import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.DisposableBean;
@@ -286,6 +287,8 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
@Override
public void afterPropertiesSet() throws Exception {
+ StopWatch watch = new StopWatch();
+
super.afterPropertiesSet();
Boolean shutdownEager = CamelContextHelper.parseBoolean(getContext(), getShutdownEager());
@@ -293,6 +296,8 @@ public class CamelContextFactoryBean extends AbstractCamelContextFactoryBean<Spr
LOG.debug("Using shutdownEager: " + shutdownEager);
getContext().setShutdownEager(shutdownEager);
}
+
+ LOG.debug("afterPropertiesSet() took {} millis", watch.stop());
}
protected void initCustomRegistry(SpringCamelContext context) {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
index 1d160fd..540436d 100644
--- a/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
+++ b/components/camel-spring/src/main/java/org/apache/camel/spring/SpringCamelContext.java
@@ -29,6 +29,7 @@ import org.apache.camel.spi.Registry;
import org.apache.camel.spring.spi.ApplicationContextRegistry;
import org.apache.camel.spring.spi.SpringInjector;
import org.apache.camel.spring.spi.SpringManagementMBeanAssembler;
+import org.apache.camel.util.StopWatch;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.BeansException;
@@ -119,7 +120,11 @@ public class SpringCamelContext extends DefaultCamelContext implements Initializ
}
public void afterPropertiesSet() throws Exception {
+ StopWatch watch = new StopWatch();
+
maybeStart();
+
+ LOG.debug("afterPropertiesSet() took {} millis", watch.stop());
}
public void destroy() throws Exception {
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
index 3d9af1b..d61eb51 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/RestRefTest.java
@@ -59,6 +59,7 @@ public class RestRefTest extends SpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
+ System.setProperty("CamelSedaPollTimeout", "10");
return new ClassPathXmlApplicationContext("org/apache/camel/component/rest/RestRefTest.xml");
}
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
index 4139633..8c49899 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestConfigurationTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestConfigurationTest extends FromRestConfigurationTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestConfigurationTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
index fc6b70b..0017ede 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestDuplicateTest.java
@@ -27,6 +27,7 @@ public class SpringFromRestDuplicateTest extends SpringTestSupport {
@Override
protected AbstractXmlApplicationContext createApplicationContext() {
+ System.setProperty("CamelSedaPollTimeout", "10");
try {
new ClassPathXmlApplicationContext("org/apache/camel/component/rest/SpringFromRestDuplicateTest.xml");
fail("Should throw exception");
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
index 9acb598..779e772 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestGetEmbeddedRouteTest extends FromRestGetEmbeddedRouteTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestGetEmbeddedRouteTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
index 8746215..7ec5241 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetInterceptTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestGetInterceptTest extends FromRestGetInterceptTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestGetInterceptTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
index 5c96561..83c2313 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestGetOnExceptionTest extends FromRestGetOnExceptionTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestGetOnExceptionTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
index a386b4b..f1fa058 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestGetRouteOnExceptionTest extends FromRestGetRouteOnExceptionTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestGetRouteOnExceptionTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
index b8908ff..029f435 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestGetTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestGetTest extends FromRestGetTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestGetTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
index b044dc0..d40d851 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestIdAndDescriptionTest extends FromRestIdAndDescriptionTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestIdAndDescriptionTest.xml");
}
http://git-wip-us.apache.org/repos/asf/camel/blob/a2324c38/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
----------------------------------------------------------------------
diff --git a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
index 6eafd23..ece16cd 100644
--- a/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
+++ b/components/camel-spring/src/test/java/org/apache/camel/component/rest/SpringFromRestUriPrefixTest.java
@@ -23,6 +23,7 @@ import static org.apache.camel.spring.processor.SpringTestHelper.createSpringCam
public class SpringFromRestUriPrefixTest extends FromRestUriPrefixTest {
protected CamelContext createCamelContext() throws Exception {
+ System.setProperty("CamelSedaPollTimeout", "10");
return createSpringCamelContext(this, "org/apache/camel/component/rest/SpringFromRestUriPrefixTest.xml");
}