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 2009/06/30 10:55:10 UTC
svn commit: r789625 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel/component:
dataset/CustomDataSetTest.java file/FileConsumerPollStrategyTest.java
Author: davsclaus
Date: Tue Jun 30 08:55:10 2009
New Revision: 789625
URL: http://svn.apache.org/viewvc?rev=789625&view=rev
Log:
Fixed unit test repoted by TC.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java?rev=789625&r1=789624&r2=789625&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java Tue Jun 30 08:55:10 2009
@@ -26,7 +26,6 @@
import org.apache.camel.builder.PredicateBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.builder.xml.XPathBuilder;
-import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.PredicateAssertHelper;
/**
@@ -50,9 +49,8 @@
};
public void testUsingCustomDataSet() throws Exception {
- MockEndpoint endpoint = getMockEndpoint("mock:results");
- endpoint.expectedMessageCount((int) dataSet.getSize());
-
+ // data set will itself set its assertions so we should just
+ // assert that all mocks is ok
assertMockEndpointsSatisfied();
}
@@ -67,9 +65,7 @@
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
- from("dataset:foo").multicast().
- to("mock:results").
- to("direct:foo");
+ from("dataset:foo").to("direct:foo");
from("direct:foo").to("dataset:foo");
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java?rev=789625&r1=789624&r2=789625&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerPollStrategyTest.java Tue Jun 30 08:55:10 2009
@@ -33,7 +33,7 @@
private static int counter;
private static String event = "";
- private String fileUrl = "file://target/pollstrategy/?consumer.pollStrategy=#myPoll";
+ private String fileUrl = "file://target/pollstrategy/?consumer.pollStrategy=#myPoll&noop=true";
@Override
protected JndiRegistry createRegistry() throws Exception {
@@ -55,10 +55,10 @@
assertMockEndpointsSatisfied();
- // give poll strategy a bit time to signal commit
- Thread.sleep(50);
+ // give file consumer a bit time
+ Thread.sleep(1000);
- assertEquals("rollbackcommit", event);
+ assertTrue(event.startsWith("rollbackcommit"));
}
protected RouteBuilder createRouteBuilder() throws Exception {