Fallback to properties locations test

astefanutti · Aug 27, 2014 · 1bba05b · 1bba05b
1 parent 5386f74
commit 1bba05b
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 13 deletions.
diff --git a/src/main/java/io/astefanutti/camel/cdi/CdiPropertiesComponent.java b/src/main/java/io/astefanutti/camel/cdi/CdiPropertiesComponent.java
@@ -19,11 +19,13 @@
 import org.apache.camel.component.properties.PropertiesComponent;
 
 import javax.enterprise.inject.Instance;
+import javax.enterprise.inject.Typed;
 import javax.inject.Inject;
 import javax.inject.Named;
 import java.util.Properties;
 
 @Named("properties")
+@Typed(PropertiesComponent.class)
 class CdiPropertiesComponent extends PropertiesComponent {
 
     @Inject

diff --git a/src/test/java/io/astefanutti/camel/cdi/InjectedEndpointRouteTest.java b/src/test/java/io/astefanutti/camel/cdi/InjectedEndpointRouteTest.java
@@ -58,8 +58,8 @@ public static Archive<?> deployment() {
 
     @Test
     @InSequence(1)
-    public void startCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.start();
+    public void startCamelContext(CamelContext context) throws Exception {
+        context.start();
     }
 
     @Test
@@ -75,7 +75,7 @@ public void sendMessageToInboundConsumer() throws InterruptedException {
 
     @Test
     @InSequence(3)
-    public void stopCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.stop();
+    public void stopCamelContext(CamelContext context) throws Exception {
+        context.stop();
     }
 }
diff --git a/src/test/java/io/astefanutti/camel/cdi/PropertyEndpointRouteTest.java b/src/test/java/io/astefanutti/camel/cdi/PropertyEndpointRouteTest.java
@@ -19,6 +19,7 @@
 import org.apache.camel.CamelContext;
 import org.apache.camel.ProducerTemplate;
 import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.component.properties.PropertiesComponent;
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.junit.InSequence;
@@ -70,15 +71,17 @@ private static Properties configuration() {
 
     @Test
     @InSequence(1)
-    public void startCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.start();
+    public void startCamelContext(CamelContext context) throws Exception {
+        context.getComponent("properties", PropertiesComponent.class).setLocation("classpath:placeholder.properties");
+        context.start();
     }
 
     @Test
     @InSequence(2)
     public void sendMessageToInboundConsumer() throws InterruptedException {
         outbound.expectedMessageCount(1);
         outbound.expectedBodiesReceived("test");
+        outbound.expectedHeaderReceived("header", "message from file");
 
         inbound.sendBody("test");
 
@@ -87,7 +90,7 @@ public void sendMessageToInboundConsumer() throws InterruptedException {
 
     @Test
     @InSequence(3)
-    public void stopCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.stop();
+    public void stopCamelContext(CamelContext context) throws Exception {
+        context.stop();
     }
 }
diff --git a/src/test/java/io/astefanutti/camel/cdi/UriEndpointRouteTest.java b/src/test/java/io/astefanutti/camel/cdi/UriEndpointRouteTest.java
@@ -59,8 +59,8 @@ public static Archive<?> deployment() {
 
     @Test
     @InSequence(1)
-    public void startCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.start();
+    public void startCamelContext(CamelContext context) throws Exception {
+        context.start();
     }
 
     @Test
@@ -76,7 +76,7 @@ public void sendMessageToInboundConsumer() throws InterruptedException {
 
     @Test
     @InSequence(3)
-    public void stopCamelContext(CamelContext camelContext) throws Exception {
-        camelContext.stop();
+    public void stopCamelContext(CamelContext context) throws Exception {
+        context.stop();
     }
 }
diff --git a/src/test/java/io/astefanutti/camel/cdi/bean/PropertyEndpointRoute.java b/src/test/java/io/astefanutti/camel/cdi/bean/PropertyEndpointRoute.java
@@ -22,6 +22,6 @@ public class PropertyEndpointRoute extends RouteBuilder {
 
     @Override
     public void configure() {
-        from("direct:{{from}}").to("{{to}}");
+        from("direct:{{from}}").setHeader("header", simple("properties:header.message")).to("{{to}}");
     }
 }
diff --git a/src/test/resources/placeholder.properties b/src/test/resources/placeholder.properties
@@ -0,0 +1 @@
+header.message=message from file