svn commit: r1418595 - in /camel/trunk: camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java

[ni...@apache.org]

Author: ningjiang
Date: Sat Dec  8 02:38:52 2012
New Revision: 1418595

URL: http://svn.apache.org/viewvc?rev=1418595&view=rev
Log:
CAMEL-5854 adviceWith() just needs to start the route when the camel context is started

Added:
    camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java
Modified:
    camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java

Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java?rev=1418595&r1=1418594&r2=1418595&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/model/RouteDefinition.java Sat Dec  8 02:38:52 2012
@@ -38,6 +38,7 @@ import org.apache.camel.Route;
 import org.apache.camel.ServiceStatus;
 import org.apache.camel.ShutdownRoute;
 import org.apache.camel.ShutdownRunningTask;
+import org.apache.camel.StatefulService;
 import org.apache.camel.builder.AdviceWithRouteBuilder;
 import org.apache.camel.builder.AdviceWithTask;
 import org.apache.camel.builder.ErrorHandlerBuilderRef;
@@ -266,8 +267,13 @@ public class RouteDefinition extends Pro
         // log the merged route at info level to make it easier to end users to spot any mistakes they may have made
         log.info("AdviceWith route after: " + merged);
 
-        // and start it
-        camelContext.startRoute(merged);
+        // If the camel context is started then we start the route
+        if (camelContext instanceof StatefulService) {
+            StatefulService service = (StatefulService) camelContext;
+            if (service.isStarted()) {
+                camelContext.startRoute(merged);
+            }
+        }
         return merged;
     }
 

Added: camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java?rev=1418595&view=auto
==============================================================================
--- camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java (added)
+++ camel/trunk/tests/camel-itest/src/test/java/org/apache/camel/itest/issues/IsUseAdviceWithJUnit4Test.java Sat Dec  8 02:38:52 2012
@@ -0,0 +1,82 @@
+/**
+ * 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.itest.issues;
+
+import org.apache.camel.builder.AdviceWithRouteBuilder;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
+
+
+public class IsUseAdviceWithJUnit4Test extends CamelTestSupport {
+
+    private String providerEndPointURI = "http4://fakeeeeWebsite.com:80";
+    private String timerEndPointURI = "timer://myTimer";
+    private String mockEndPointURI = "mock:myMock";
+    private String directEndPointURI = "direct:myDirect";
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+
+                from(timerEndPointURI).to(providerEndPointURI).to(mockEndPointURI);
+            }
+        };
+    }
+
+    @Test
+    public void testIsUseAdviceWith() throws Exception {
+
+        context.getRouteDefinitions().get(0).adviceWith(context, new AdviceWithRouteBuilder() {
+            public void configure() throws Exception {
+
+                replaceFromWith(directEndPointURI);
+
+                interceptSendToEndpoint(providerEndPointURI).to("mock:intercepted").skipSendToOriginalEndpoint();
+            }
+        });
+
+        // we must manually start when we are done with all the advice with
+        context.start();
+
+        getMockEndpoint(mockEndPointURI).expectedBodiesReceived("a trigger");
+        getMockEndpoint("mock:intercepted").expectedBodiesReceived("a trigger");
+
+        template.sendBody(directEndPointURI, "a trigger");
+
+        assertMockEndpointsSatisfied();
+
+        assertNotNull(context.hasEndpoint(directEndPointURI));
+      
+        assertNotNull(context.hasEndpoint(mockEndPointURI));
+    }
+
+    @Override
+    public boolean isUseAdviceWith() {
+        return true;
+    }
+
+    @Override
+    public boolean isUseRouteBuilder() {
+        return true;
+    }
+
+}