Author: davsclaus
Date: Thu Mar 25 13:36:19 2010
New Revision: 927398
URL: http://svn.apache.org/viewvc?rev=927398&view=rev
Log:
Polished cafe example to fix test on other boxes.
Modified:
camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
Modified:
camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/main/java/org/apache/camel/example/cafe/Order.java
Thu Mar 25 13:36:19 2010
@@ -15,13 +15,10 @@
* limitations under the License.
*/
package org.apache.camel.example.cafe;
+
import java.util.ArrayList;
import java.util.List;
-/**
- * @author Mark Fisher
- * @author Marius Bogoevici
- */
public class Order {
private List<OrderItem> orderItems = new ArrayList<OrderItem>();
Modified:
camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml
(original)
+++
camel/trunk/examples/camel-example-cafe/src/main/resources/META-INF/camel-routes.xml
Thu Mar 25 13:36:19 2010
@@ -25,8 +25,8 @@
<import resource="classpath:META-INF/beans.xml"/>
<!-- START SNIPPET: e1 -->
- <camelContext id="camel"
- xmlns="http://camel.apache.org/schema/spring";>
+ <camelContext id="camel" xmlns="http://camel.apache.org/schema/spring";>
+
<route>
<from uri="direct:cafe"/>
<split>
@@ -34,22 +34,26 @@
<to uri="direct:drink"/>
</split>
</route>
+
<route>
<from uri="direct:drink" />
<recipientList>
<method bean="drinkRouter"/>
</recipientList>
</route>
+
<route>
<from uri="seda:coldDrinks?concurrentConsumers=2"/>
<to uri="bean:barista?method=prepareColdDrink"/>
<to uri="direct:deliveries"/>
</route>
+
<route>
<from uri="seda:hotDrinks?concurrentConsumers=3"/>
<to uri="bean:barista?method=prepareHotDrink"/>
<to uri="direct:deliveries"/>
</route>
+
<route>
<from uri="direct:deliveries"/>
<aggregate strategyRef="aggregatorStrategy" completionTimeout="5000">
@@ -60,6 +64,7 @@
<to uri="bean:waiter?method=deliverCafes"/>
</aggregate>
</route>
+
</camelContext>
<!-- END SNIPPET: e1 -->
Modified:
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteBuilderTest.java
Thu Mar 25 13:36:19 2010
@@ -63,7 +63,6 @@ public class CafeRouteBuilderTest extend
template.sendBody("direct:cafe", order);
assertMockEndpointsSatisfied();
-
}
@Test
@@ -84,16 +83,15 @@ public class CafeRouteBuilderTest extend
waiter.setVerfiyDrinks(drinks);
template.sendBody("direct:cafe", order);
-
- Thread.sleep(6000);
+
+ // wait enough time to let the aggregate complete
+ Thread.sleep(10000);
waiter.verifyDrinks();
-
}
protected RouteBuilder createRouteBuilder() throws Exception {
return new CafeRouteBuilder();
}
-
}
Modified:
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringIntegrationTest.java
Thu Mar 25 13:36:19 2010
@@ -38,12 +38,10 @@ public class CafeRouteSpringIntegrationT
applicationContext = new
ClassPathXmlApplicationContext("META-INF/spring/camel-context.xml");
CamelContext camelContext = getCamelContext();
template = camelContext.createProducerTemplate();
-
}
@Test
public void testCafeRoute() throws Exception {
-
Order order = new Order(2);
order.addItem(DrinkType.ESPRESSO, 2, true);
order.addItem(DrinkType.CAPPUCCINO, 4, false);
@@ -52,7 +50,7 @@ public class CafeRouteSpringIntegrationT
template.sendBody("direct:cafe", order);
- Thread.sleep(6000);
+ Thread.sleep(7000);
}
@After
@@ -64,7 +62,6 @@ public class CafeRouteSpringIntegrationT
protected CamelContext getCamelContext() throws Exception {
return (DefaultCamelContext) applicationContext.getBean("camel");
-
}
}
Modified:
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/CafeRouteSpringTest.java
Thu Mar 25 13:36:19 2010
@@ -20,7 +20,6 @@ import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
import org.apache.camel.example.cafe.test.TestDrinkRouter;
import org.apache.camel.example.cafe.test.TestWaiter;
-import org.apache.camel.impl.DefaultCamelContext;
import org.junit.After;
import org.junit.Before;
import org.springframework.context.support.AbstractApplicationContext;
@@ -48,8 +47,7 @@ public class CafeRouteSpringTest extends
}
protected CamelContext createCamelContext() throws Exception {
- DefaultCamelContext camelcontext = (DefaultCamelContext)
applicationContext.getBean("camel");
- return camelcontext;
+ return (CamelContext) applicationContext.getBean("camel");
}
}
Modified:
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestDrinkRouter.java
Thu Mar 25 13:36:19 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.cafe.test;
import org.apache.camel.example.cafe.OrderItem;
Modified:
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
URL:
http://svn.apache.org/viewvc/camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java?rev=927398&r1=927397&r2=927398&view=diff
==============================================================================
---
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
(original)
+++
camel/trunk/examples/camel-example-cafe/src/test/java/org/apache/camel/example/cafe/test/TestWaiter.java
Thu Mar 25 13:36:19 2010
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.example.cafe.test;
import java.util.List;
@@ -26,23 +25,25 @@ import org.apache.camel.example.cafe.stu
public class TestWaiter extends Waiter {
protected List<Drink> expectDrinks;
protected List<Drink> deliveredDrinks;
-
+
public void setVerfiyDrinks(List<Drink> drinks) {
this.expectDrinks = drinks;
}
-
+
public void deliverCafes(Delivery delivery) {
super.deliverCafes(delivery);
deliveredDrinks = delivery.getDeliveredDrinks();
}
-
+
public void verifyDrinks() {
- if (expectDrinks.size() != deliveredDrinks.size()) {
- throw new AssertionError("Can't get expect size of drinks");
+ if (deliveredDrinks == null || expectDrinks.size() !=
deliveredDrinks.size()) {
+ throw new AssertionError("Did not deliver expected number of
drinks " + expectDrinks.size() + " was "
+ + (deliveredDrinks != null ? deliveredDrinks.size() :
"null"));
}
+
for (Drink drink : expectDrinks) {
if (!deliveredDrinks.contains(drink)) {
- throw new AssertionError("Can't find drink " + drink + " in
the deliveredDrinks");
+ throw new AssertionError("Cannot find expected drink " + drink
+ " in the delivered drinks");
}
}
}
