You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2019/05/19 14:05:40 UTC
[camel] branch camel-2.x updated (788695c -> a2c58f2)
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a change to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git.
from 788695c Add flattern pom to git ignore
add ed32858 CAMEL-13543: Make CamelSpringTestContextLoader set property overrides before the CamelContext is injected into any other bean
new a2c58f2 CAMEL-13543 - Fixed CS
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/camel/util/CamelContextHelper.java | 2 +-
.../test/spring/CamelSpringTestContextLoader.java | 40 +++++++++++++---------
...ngOverridePropertiesForPropertyInjectTest.java} | 37 ++++++--------------
.../spring/TestPropertyInjectRouteBuilder.java} | 14 +++++---
...idePropertiesForPropertyInjectTest-context.xml} | 12 ++-----
.../org/apache/camel/test/spring/test.properties | 1 +
6 files changed, 49 insertions(+), 57 deletions(-)
copy components/camel-test-spring/src/test/java/org/apache/camel/test/spring/{CamelSpringOverridePropertiesTest.java => CamelSpringOverridePropertiesForPropertyInjectTest.java} (62%)
copy components/{camel-spring-boot/src/test/java/org/apache/camel/spring/boot/actuate/health/MyCamelRoute.java => camel-test-spring/src/test/java/org/apache/camel/test/spring/TestPropertyInjectRouteBuilder.java} (76%)
copy components/camel-test-spring/src/test/resources/org/apache/camel/test/spring/{CamelSpringOverridePropertiesTest-context.xml => CamelSpringOverridePropertiesForPropertyInjectTest-context.xml} (88%)
[camel] 01/01: CAMEL-13543 - Fixed CS
Posted by ac...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch camel-2.x
in repository https://gitbox.apache.org/repos/asf/camel.git
commit a2c58f21cc24ac533bdb71a49bea7f75792826e1
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Sun May 19 16:05:20 2019 +0200
CAMEL-13543 - Fixed CS
---
.../org/apache/camel/test/spring/CamelSpringTestContextLoader.java | 7 +++----
.../spring/CamelSpringOverridePropertiesForPropertyInjectTest.java | 6 +++---
2 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
index 86bfc45..622c401 100644
--- a/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
+++ b/components/camel-test-spring/src/main/java/org/apache/camel/test/spring/CamelSpringTestContextLoader.java
@@ -26,6 +26,7 @@ import java.util.List;
import java.util.Properties;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.CamelContext;
import org.apache.camel.component.properties.PropertiesComponent;
import org.apache.camel.impl.DefaultDebugger;
import org.apache.camel.impl.InterceptSendToMockEndpointStrategy;
@@ -37,8 +38,10 @@ import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.ExcludingPackageScanClassResolver;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.test.spring.CamelSpringTestHelper.DoToSpringCamelContextsStrategy;
+import org.apache.camel.util.CamelContextHelper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.config.BeanPostProcessor;
import org.springframework.beans.factory.support.RootBeanDefinition;
import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
import org.springframework.context.ApplicationContext;
@@ -54,10 +57,6 @@ import org.springframework.util.StringUtils;
import static org.apache.camel.test.spring.CamelSpringTestHelper.getAllMethods;
-import org.apache.camel.CamelContext;
-import org.apache.camel.util.CamelContextHelper;
-import org.springframework.beans.factory.config.BeanPostProcessor;
-
/**
* Replacement for the default {@link GenericXmlContextLoader} that provides hooks for
* processing some class level Camel related test annotations.
diff --git a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
index bf79523..4c583ba 100644
--- a/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
+++ b/components/camel-test-spring/src/test/java/org/apache/camel/test/spring/CamelSpringOverridePropertiesForPropertyInjectTest.java
@@ -16,9 +16,6 @@
*/
package org.apache.camel.test.spring;
-import static org.hamcrest.CoreMatchers.is;
-import static org.junit.Assert.assertThat;
-
import java.util.Properties;
import org.apache.camel.Produce;
@@ -29,6 +26,9 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.BootstrapWith;
import org.springframework.test.context.ContextConfiguration;
+import static org.hamcrest.CoreMatchers.is;
+import static org.junit.Assert.assertThat;
+
@RunWith(CamelSpringRunner.class)
@BootstrapWith(CamelTestContextBootstrapper.class)
@ContextConfiguration()