camel-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From davscl...@apache.org
Subject svn commit: r1058013 - /camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
Date Wed, 12 Jan 2011 07:52:12 GMT
Author: davsclaus
Date: Wed Jan 12 07:52:12 2011
New Revision: 1058013

URL: http://svn.apache.org/viewvc?rev=1058013&view=rev
Log:
CAMEL-3529: Fixed unit test.

Modified:
    camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java

Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java?rev=1058013&r1=1058012&r2=1058013&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
(original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
Wed Jan 12 07:52:12 2011
@@ -23,43 +23,38 @@ import org.apache.camel.builder.RouteBui
 import org.apache.camel.component.mock.MockEndpoint;
 import org.apache.camel.impl.DefaultCamelContext;
 import org.apache.camel.impl.SimpleRegistry;
-import org.apache.camel.test.junit4.CamelTestSupport;
+import org.apache.camel.test.junit4.TestSupport;
 import org.junit.Test;
 
 /**
- * Unit test with good sample for the wiki documentation
+ * Example for wiki documentation
  */
-public class AtomGoodBlogsTest extends CamelTestSupport {
+public class AtomGoodBlogsTest extends TestSupport {
 
     // START SNIPPET: e1
 
     // This is the CamelContext that is the heart of Camel
     private CamelContext context;
 
-    @Override
     protected CamelContext createCamelContext() throws Exception {
-        // We initialize Camel
 
-        SimpleRegistry registry = new SimpleRegistry();
         // First we register a blog service in our bean registry
+        SimpleRegistry registry = new SimpleRegistry();
         registry.put("blogService", new BlogService());
 
         // Then we create the camel context with our bean registry
         context = new DefaultCamelContext(registry);
 
         // Then we add all the routes we need using the route builder DSL syntax
-        context.addRoutes(createRouteBuilder());
-
-        // And finally we must start Camel to let the magic routing begins
-        context.start();
+        context.addRoutes(createMyRoutes());
 
         return context;
     }
 
     /**
-     * This is the route builder where we create our routes in the advanced Camel DSL syntax
+     * This is the route builder where we create our routes using the Camel DSL
      */
-    protected RouteBuilder createRouteBuilder() throws Exception {
+    protected RouteBuilder createMyRoutes() throws Exception {
         return new RouteBuilder() {
             public void configure() throws Exception {
                 // We pool the atom feeds from the source for further processing in the seda
queue
@@ -85,21 +80,27 @@ public class AtomGoodBlogsTest extends C
     }
 
     /**
-     * This is the actual junit test method that does the assertion that our routes is working
-     * as expected
+     * This is the actual junit test method that does the assertion that our routes is working
as expected
      */
     @Test
     public void testFiltering() throws Exception {
+        // create and start Camel
+        context = createCamelContext();
+        context.start();
+
         // Get the mock endpoint
         MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
 
-        // There should be two good blog entries from the feed
+        // There should be at least two good blog entries from the feed
         mock.expectedMinimumMessageCount(2);
 
         // Asserts that the above expectations is true, will throw assertions exception if
it failed
         // Camel will default wait max 20 seconds for the assertions to be true, if the conditions
         // is true sooner Camel will continue
         mock.assertIsSatisfied();
+
+        // stop Camel after use
+        context.stop();
     }
 
     /**



Mime
View raw message