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 2012/11/15 08:58:10 UTC
svn commit: r1409678 - in
/camel/trunk/camel-core/src/test/java/org/apache/camel/component:
bean/ProxyReturnFutureExceptionTest.java bean/ProxyReturnFutureTest.java
dataset/DataSetEndpointTest.java
file/AntPathMatcherGenericFileFilterTest.java
Author: davsclaus
Date: Thu Nov 15 07:58:08 2012
New Revision: 1409678
URL: http://svn.apache.org/viewvc?rev=1409678&view=rev
Log:
Fixed tests
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java?rev=1409678&r1=1409677&r2=1409678&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureExceptionTest.java Thu Nov 15 07:58:08 2012
@@ -33,7 +33,7 @@ public class ProxyReturnFutureExceptionT
Future<String> future = service.asText(4);
log.info("Got future");
- assertFalse("Should not be done", future.isDone());
+
log.info("Waiting for future to be done ...");
try {
assertEquals("Four", future.get(5, TimeUnit.SECONDS));
@@ -50,7 +50,7 @@ public class ProxyReturnFutureExceptionT
@Override
public void configure() throws Exception {
from("direct:echo")
- .delay(2000)
+ .delay(250)
.throwException(new IllegalArgumentException("Forced"));
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java?rev=1409678&r1=1409677&r2=1409678&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/ProxyReturnFutureTest.java Thu Nov 15 07:58:08 2012
@@ -34,9 +34,7 @@ public class ProxyReturnFutureTest exten
Future<String> future = service.asText(4);
log.info("Got future");
- assertFalse("Should not be done", future.isDone());
log.info("Waiting for future to be done ...");
-
String reply = future.get(5, TimeUnit.SECONDS);
assertEquals("Four", reply);
}
@@ -47,13 +45,13 @@ public class ProxyReturnFutureTest exten
Future<String> future = service.asText(4);
log.info("Got future");
- assertFalse("Should not be done", future.isDone());
+
log.info("Waiting for future to be done ...");
assertEquals("Four", future.get(5, TimeUnit.SECONDS));
future = service.asText(5);
log.info("Got future");
- assertFalse("Should not be done", future.isDone());
+
log.info("Waiting for future to be done ...");
assertEquals("Four", future.get(5, TimeUnit.SECONDS));
}
@@ -64,7 +62,7 @@ public class ProxyReturnFutureTest exten
@Override
public void configure() throws Exception {
from("direct:echo")
- .delay(2000)
+ .delay(250)
.transform().constant("Four");
}
};
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java?rev=1409678&r1=1409677&r2=1409678&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetEndpointTest.java Thu Nov 15 07:58:08 2012
@@ -40,9 +40,6 @@ public class DataSetEndpointTest extends
endpoint.setEndpointUriIfNotSpecified("dataset://foo");
endpoint.setDataSet(new SimpleDataSet(2));
- endpoint.reset();
- endpoint.setMinRate(1);
- assertEquals(1, endpoint.getMinRate());
assertEquals(0, endpoint.getPreloadSize());
assertEquals(0, endpoint.getConsumeDelay());
assertEquals(3, endpoint.getProduceDelay());
@@ -55,7 +52,6 @@ public class DataSetEndpointTest extends
}
});
context.start();
- endpoint.start();
endpoint.assertIsSatisfied();
}
@@ -78,7 +74,6 @@ public class DataSetEndpointTest extends
}
});
context.start();
- endpoint.start();
endpoint.assertIsSatisfied();
}
@@ -101,7 +96,6 @@ public class DataSetEndpointTest extends
}
});
context.start();
- endpoint.start();
endpoint.assertIsSatisfied();
assertTrue(reported.get());
@@ -137,7 +131,6 @@ public class DataSetEndpointTest extends
}
});
context.start();
- endpoint.start();
endpoint.assertIsSatisfied();
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java?rev=1409678&r1=1409677&r2=1409678&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/AntPathMatcherGenericFileFilterTest.java Thu Nov 15 07:58:08 2012
@@ -43,29 +43,27 @@ public class AntPathMatcherGenericFileFi
}
public void testInclude() throws Exception {
-
- template.sendBodyAndHeader("file://target/files/ant-path-1/x/y/z", "Hello World", Exchange.FILE_NAME, "report.txt");
-
MockEndpoint mock = getMockEndpoint("mock:result1");
mock.expectedBodiesReceivedInAnyOrder("Hello World");
+ template.sendBodyAndHeader("file://target/files/ant-path-1/x/y/z", "Hello World", Exchange.FILE_NAME, "report.txt");
+
assertMockEndpointsSatisfied();
- oneExchangeDone.matchesMockWaitTime();
}
public void testExclude() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result2");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World 2");
template.sendBodyAndHeader("file://target/files/ant-path-2/x/y/z", "Hello World 1", Exchange.FILE_NAME, "report.bak");
template.sendBodyAndHeader("file://target/files/ant-path-2/x/y/z", "Hello World 2", Exchange.FILE_NAME, "report.txt");
- MockEndpoint mock = getMockEndpoint("mock:result2");
- mock.expectedBodiesReceivedInAnyOrder("Hello World 2");
-
assertMockEndpointsSatisfied();
- oneExchangeDone.matchesMockWaitTime();
}
public void testIncludesAndExcludes() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result3");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World 2", "Hello World 4");
template.sendBodyAndHeader("file://target/files/ant-path-3/x/y/z", "Hello World 1", Exchange.FILE_NAME, "a.pdf");
template.sendBodyAndHeader("file://target/files/ant-path-3/x/y/z", "Hello World 2", Exchange.FILE_NAME, "m.pdf");
@@ -74,31 +72,24 @@ public class AntPathMatcherGenericFileFi
template.sendBodyAndHeader("file://target/files/ant-path-3/x/y/z", "Hello World 5", Exchange.FILE_NAME, "b.bak");
template.sendBodyAndHeader("file://target/files/ant-path-3/x/y/z", "Hello World 6", Exchange.FILE_NAME, "m.bak");
- MockEndpoint mock = getMockEndpoint("mock:result3");
- mock.expectedBodiesReceivedInAnyOrder("Hello World 2", "Hello World 4");
-
assertMockEndpointsSatisfied();
- oneExchangeDone.matchesMockWaitTime();
}
public void testIncludesAndExcludesAndFilter() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:result4");
+ mock.expectedBodiesReceivedInAnyOrder("Hello World 3");
template.sendBodyAndHeader("file://target/files/ant-path-4/x/y/z", "Hello World 1", Exchange.FILE_NAME, "a.txt");
template.sendBodyAndHeader("file://target/files/ant-path-4/x/y/z", "Hello World 2", Exchange.FILE_NAME, "b.txt");
template.sendBodyAndHeader("file://target/files/ant-path-4/x/y/z", "Hello World 3", Exchange.FILE_NAME, "c.txt");
- MockEndpoint mock = getMockEndpoint("mock:result4");
- mock.expectedBodiesReceivedInAnyOrder("Hello World 3");
-
assertMockEndpointsSatisfied();
- oneExchangeDone.matchesMockWaitTime();
}
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() throws Exception {
-
from("file://target/files/ant-path-1?recursive=true&antInclude=**/*.txt").convertBodyTo(String.class).to("mock:result1");
from("file://target/files/ant-path-2?recursive=true&antExclude=**/*.bak").convertBodyTo(String.class).to("mock:result2");