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 09:23:07 UTC
svn commit: r1409690 - in /camel/branches/camel-2.10.x: ./
components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
Author: davsclaus
Date: Thu Nov 15 08:23:06 2012
New Revision: 1409690
URL: http://svn.apache.org/viewvc?rev=1409690&view=rev
Log:
Fixed tests
Modified:
camel/branches/camel-2.10.x/ (props changed)
camel/branches/camel-2.10.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Merged /camel/trunk:r1409689
Propchange: camel/branches/camel-2.10.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: camel/branches/camel-2.10.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java?rev=1409690&r1=1409689&r2=1409690&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java (original)
+++ camel/branches/camel-2.10.x/components/camel-mail/src/test/java/org/apache/camel/component/mail/MailProducerConcurrentTest.java Thu Nov 15 08:23:06 2012
@@ -24,6 +24,7 @@ import java.util.concurrent.ExecutorServ
import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
+import org.apache.camel.builder.NotifyBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -49,6 +50,8 @@ public class MailProducerConcurrentTest
private void doSendMessages(int files, int poolSize) throws Exception {
Mailbox.clearAll();
+ NotifyBuilder builder = new NotifyBuilder(context).whenDone(files).create();
+
getMockEndpoint("mock:result").expectedMessageCount(files);
getMockEndpoint("mock:result").expectsNoDuplicates(body());
@@ -66,9 +69,10 @@ public class MailProducerConcurrentTest
}
// wait first for all the exchanges above to be thoroughly sent asynchronously
- assertTrue(latch.await(2, TimeUnit.SECONDS));
+ assertTrue(latch.await(5, TimeUnit.SECONDS));
assertMockEndpointsSatisfied();
+ assertTrue(builder.matchesMockWaitTime());
Mailbox box = Mailbox.get("someone@localhost");
assertEquals(files, box.size());
Modified: camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java
URL: http://svn.apache.org/viewvc/camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java?rev=1409690&r1=1409689&r2=1409690&view=diff
==============================================================================
--- camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java (original)
+++ camel/branches/camel-2.10.x/tests/camel-itest/src/test/java/org/apache/camel/itest/async/HttpAsyncCallbackTest.java Thu Nov 15 08:23:06 2012
@@ -37,7 +37,6 @@ public class HttpAsyncCallbackTest exten
@Test
public void testAsyncAndSyncAtSameTimeWithHttp() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(3);
mock.expectedBodiesReceivedInAnyOrder("Hello Claus", "Hello Hadrian", "Hello Willem");
// START SNIPPET: e3
@@ -56,7 +55,6 @@ public class HttpAsyncCallbackTest exten
assertTrue("Should get 3 callbacks", LATCH.await(10, TimeUnit.SECONDS));
// assert that we got all the correct data in our callback
- assertEquals(3, callback.getData().size());
assertTrue("Claus is missing", callback.getData().contains("Hello Claus"));
assertTrue("Hadrian is missing", callback.getData().contains("Hello Hadrian"));
assertTrue("Willem is missing", callback.getData().contains("Hello Willem"));
@@ -69,7 +67,7 @@ public class HttpAsyncCallbackTest exten
*/
private static class MyCallback extends SynchronizationAdapter {
- private List<String> data = new ArrayList<String>();
+ private final List<String> data = new ArrayList<String>();
@Override
public void onComplete(Exchange exchange) {
@@ -77,6 +75,7 @@ public class HttpAsyncCallbackTest exten
String body = exchange.getOut().getBody(String.class);
data.add(body);
+ // the latch is used for testing purposes
LATCH.countDown();
}
@@ -93,7 +92,7 @@ public class HttpAsyncCallbackTest exten
public void configure() throws Exception {
// START SNIPPET: e1
// The mocks are here for unit test
- // Simulate a slow http service (delaying 1 sec) we want to invoke async
+ // Simulate a slow http service (delaying a bit) we want to invoke async
from("jetty:http://0.0.0.0:" + getPort() + "/myservice")
.delay(300)
.transform(body().prepend("Hello "))