You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2008/05/16 11:01:16 UTC
svn commit: r656976 - in /activemq/camel/trunk/components/camel-atom/src:
main/java/org/apache/camel/component/atom/
test/java/org/apache/camel/component/atom/
Author: davsclaus
Date: Fri May 16 02:01:15 2008
New Revision: 656976
URL: http://svn.apache.org/viewvc?rev=656976&view=rev
Log:
CAMEL-451 - Added long sample and fixed the entry consumer should return when it has processed an exchange
Added:
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java (with props)
Modified:
activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
Modified: activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java?rev=656976&r1=656975&r2=656976&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/main/java/org/apache/camel/component/atom/AtomEntryPollingConsumer.java Fri May 16 02:01:15 2008
@@ -60,6 +60,8 @@
if (valid) {
Exchange exchange = endpoint.createExchange(feed, entry);
getProcessor().process(exchange);
+ // return and wait for the next poll to continue from last time (this consumer is stateful)
+ return;
}
}
Modified: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java?rev=656976&r1=656975&r2=656976&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java Fri May 16 02:01:15 2008
@@ -39,18 +39,18 @@
public void testResult3() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result3");
- mock.expectedMessageCount(2);
+ mock.expectedMessageCount(4);
mock.assertIsSatisfied();
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom?splitEntries=true").to("mock:result1");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&consumer.delay=500").to("mock:result1");
- from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=false").to("mock:result2");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=false&consumer.delay=500").to("mock:result2");
- from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=true&lastUpdate=2007-11-13T23:59:00").to("mock:result3");
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&filter=true&lastUpdate=2007-11-13T14:35:00&consumer.delay=500").to("mock:result3");
}
};
}
Added: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java?rev=656976&view=auto
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java (added)
+++ activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java Fri May 16 02:01:15 2008
@@ -0,0 +1,134 @@
+/**
+ * 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.component.atom;
+
+import java.util.Hashtable;
+
+import org.apache.abdera.model.Entry;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Exchange;
+import org.apache.camel.TestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.util.jndi.CamelInitialContextFactory;
+
+/**
+ * Unit test with good sample for the wiki documentation
+ */
+public class AtomGoodBlogsTest extends TestSupport {
+
+ protected void setUp() throws Exception {
+ super.setUp();
+ setupCamel();
+ }
+
+ protected void tearDown() throws Exception {
+ super.tearDown();
+ context.stop();
+ }
+
+ // START SNIPPET: e1
+
+ // This is the CamelContext that is the heart of Camel
+ private CamelContext context;
+
+ // We use a simple Hashtable for our bean registry. For more advanced usage Spring is supported out-of-the-box
+ private Hashtable beans = new Hashtable();
+
+ // We iniitalize Camel
+ private void setupCamel() throws Exception {
+ // First we register a blog service in our bean registry
+ beans.put("blogService", new BlogService());
+
+ // Then we create the camel context with our bean registry
+ context = new DefaultCamelContext(new CamelInitialContextFactory().getInitialContext(beans));
+
+ // 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();
+ }
+
+ /**
+ * This is the route builder where we create our routes in the advanced Camel DSL syntax
+ */
+ protected RouteBuilder createRouteBuilder() 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
+ // we set the delay to 1 second for each pool as this is a unit test also and we can
+ // not wait the default poll interval of 60 seconds.
+ // Using splitEntries=true will during polling only fetch one Atom Entry at any given time.
+ // As the feed.atom file contains 7 entries, using this will require 7 polls to fetch the entire
+ // content. When Camel have reach the end of entries it will refresh the atom feed from URI source
+ // and restart - but as Camel by default uses the UpdatedDateFilter it will only deliver new
+ // blog entries to "seda:feeds". So only when James Straham updates his blog with a new entry
+ // Camel will create an exchange for the seda:feeds.
+ from("atom:file:src/test/data/feed.atom?splitEntries=true&consumer.delay=1000").to("seda:feeds");
+
+ // From the feeds we filter each blot entry by using our blog service class
+ from("seda:feeds").filter().method("blogService", "goodBlog").to("seda:goodBlogs");
+
+ // And the good blogs is moved to a mock queue as this sample is also used for unit testing
+ // this is one of the strengths in Camel that you can also use the mock endpoint for your
+ // unit tests
+ from("seda:goodBlogs").to("mock:result");
+ }
+ };
+ }
+
+ /**
+ * This is the actual junit test method that does the assertion that our routes is working
+ * as expected
+ */
+ public void testFiltering() throws Exception {
+ // Get the mock endpoint
+ MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
+
+ // There should be two good blog entries from the feed
+ mock.expectedMessageCount(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();
+ }
+
+ /**
+ * Services for blogs
+ */
+ public class BlogService {
+
+ /**
+ * Tests the blogs if its a good blog entry or not
+ */
+ public boolean isGoodBlog(Exchange exchange) {
+ Entry entry = exchange.getIn().getBody(Entry.class);
+ String title = entry.getTitle();
+
+ // We like blogs about Camel
+ boolean good = title.toLowerCase().contains("camel");
+ return good;
+ }
+
+ }
+
+ // END SNIPPET: e1
+
+}
Propchange: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java?rev=656976&r1=656975&r2=656976&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java Fri May 16 02:01:15 2008
@@ -65,7 +65,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("atom:file:src/test/data/feed.atom").to("mock:results");
+ from("atom:file:src/test/data/feed.atom?consumer.delay=500").to("mock:results");
}
};
}