You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by bv...@apache.org on 2012/07/09 21:15:27 UTC

svn commit: r1359343 - in /camel/branches/camel-2.10.x: ./ camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java components/camel-http/

Author: bvahdat
Date: Mon Jul  9 19:15:26 2012
New Revision: 1359343

URL: http://svn.apache.org/viewvc?rev=1359343&view=rev
Log:
Merged revisions 1359341 via svnmerge from 
https://svn.apache.org/repos/asf/camel/trunk

........
  r1359341 | bvahdat | 2012-07-09 21:11:46 +0200 (Mo, 09 Jul 2012) | 1 line
  
  CAMEL-5432: Polished the unit-test.
........

Modified:
    camel/branches/camel-2.10.x/   (props changed)
    camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java
    camel/branches/camel-2.10.x/components/camel-http/   (props changed)

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
  Merged /camel/trunk:r1359341

Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Jul  9 19:15:26 2012
@@ -1 +1 @@
-/camel/trunk:1-1358964,1359013,1359197,1359226,1359265
+/camel/trunk:1-1358964,1359013,1359197,1359226,1359265,1359341

Modified: camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java?rev=1359343&r1=1359342&r2=1359343&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java (original)
+++ camel/branches/camel-2.10.x/camel-core/src/test/java/org/apache/camel/component/seda/SedaRemoveRouteThenAddAgainTest.java Mon Jul  9 19:15:26 2012
@@ -25,17 +25,6 @@ import org.apache.camel.component.mock.M
  */
 public class SedaRemoveRouteThenAddAgainTest extends ContextTestSupport {
 
-    @Override
-    protected RouteBuilder createRouteBuilder() throws Exception {
-        return new RouteBuilder() {
-
-            @Override
-            public void configure() throws Exception {
-                from("seda:in").id("sedaToMock").to("mock:out");
-            }
-        };
-    }
-
     public void testRemoveRouteAndThenAddAgain() throws Exception {
         MockEndpoint out = getMockEndpoint("mock:out");
         out.expectedMessageCount(1);
@@ -61,4 +50,15 @@ public class SedaRemoveRouteThenAddAgain
 
         out.assertIsSatisfied();
     }
+
+    @Override
+    protected RouteBuilder createRouteBuilder() throws Exception {
+        return new RouteBuilder() {
+            @Override
+            public void configure() throws Exception {
+                from("seda:in").routeId("sedaToMock").to("mock:out");
+            }
+        };
+    }
+
 }
\ No newline at end of file

Propchange: camel/branches/camel-2.10.x/components/camel-http/
------------------------------------------------------------------------------
  Merged /camel/trunk/components/camel-http:r1359341