Repository: camel Updated Branches: refs/heads/camel-2.16.x 92b137d4c -> 9344aa874 refs/heads/master 27aa338f3 -> ff03192d0
Fixed and speedup test Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/ff03192d Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/ff03192d Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/ff03192d Branch: refs/heads/master Commit: ff03192d02ae0cd1e92eee5cc0e66b185a19ca16 Parents: 27aa338 Author: Claus Ibsen <davscl...@apache.org> Authored: Sun Jan 10 11:12:14 2016 +0100 Committer: Claus Ibsen <davscl...@apache.org> Committed: Sun Jan 10 11:12:14 2016 +0100 ---------------------------------------------------------------------- .../beanstalk/ConsumerCompletionTest.java | 33 +++++++++++++++++--- 1 file changed, 28 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/ff03192d/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java ---------------------------------------------------------------------- diff --git a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java index 40d9437..809b78a 100644 --- a/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java +++ b/components/camel-beanstalk/src/test/java/org/apache/camel/component/beanstalk/ConsumerCompletionTest.java @@ -16,14 +16,18 @@ */ package org.apache.camel.component.beanstalk; +import java.util.concurrent.TimeUnit; + import com.surftools.BeanstalkClient.BeanstalkException; import com.surftools.BeanstalkClient.Job; import org.apache.camel.Exchange; import org.apache.camel.Processor; +import org.apache.camel.builder.NotifyBuilder; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.mock.MockEndpoint; import org.junit.Test; +import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.anyInt; import static org.mockito.Mockito.atLeast; import static org.mockito.Mockito.atLeastOnce; @@ -59,15 +63,21 @@ public class ConsumerCompletionTest extends BeanstalkMockTestSupport { when(client.reserve(anyInt())) .thenReturn(jobMock) .thenReturn(null); + when(client.statsJob(anyInt())).thenReturn(null); MockEndpoint result = getMockEndpoint("mock:result"); + result.expectedMinimumMessageCount(1); result.expectedBodiesReceived(testMessage); result.expectedHeaderReceived(Headers.JOB_ID, jobId); result.message(0).header(Headers.JOB_ID).isEqualTo(jobId); - result.assertIsSatisfied(2000); + + context.startRoute("foo"); + + result.assertIsSatisfied(); verify(client, atLeastOnce()).reserve(anyInt()); + verify(client, atLeastOnce()).statsJob(anyInt()); verify(client).delete(jobId); } @@ -85,12 +95,20 @@ public class ConsumerCompletionTest extends BeanstalkMockTestSupport { when(client.reserve(anyInt())) .thenReturn(jobMock) .thenReturn(null); + when(client.statsJob(anyInt())).thenReturn(null); + when(client.release(anyInt(), anyLong(), anyInt())).thenReturn(true); + + NotifyBuilder notify = new NotifyBuilder(context).whenFailed(1).create(); MockEndpoint result = getMockEndpoint("mock:result"); - result.expectedMinimumMessageCount(1); - result.assertIsNotSatisfied(1000); + result.expectedMessageCount(0); + + context.startRoute("foo"); + + assertTrue(notify.matches(5, TimeUnit.SECONDS)); verify(client, atLeastOnce()).reserve(anyInt()); + verify(client, atLeastOnce()).statsJob(anyInt()); verify(client).release(jobId, priority, delay); } @@ -110,13 +128,17 @@ public class ConsumerCompletionTest extends BeanstalkMockTestSupport { when(client.reserve(anyInt())) .thenThrow(new BeanstalkException("test")) .thenReturn(jobMock); + when(client.statsJob(anyInt())).thenReturn(null); MockEndpoint result = getMockEndpoint("mock:result"); result.expectedMessageCount(1); result.expectedBodiesReceived(testMessage); result.expectedHeaderReceived(Headers.JOB_ID, jobId); result.message(0).header(Headers.JOB_ID).isEqualTo(jobId); - result.assertIsSatisfied(100); + + context.startRoute("foo"); + + result.assertIsSatisfied(); verify(client, atLeast(1)).reserve(anyInt()); verify(client, times(1)).close(); @@ -127,7 +149,8 @@ public class ConsumerCompletionTest extends BeanstalkMockTestSupport { return new RouteBuilder() { @Override public void configure() { - from("beanstalk:tube?consumer.onFailure=release").process(processor).to("mock:result"); + from("beanstalk:tube?consumer.onFailure=release").routeId("foo") + .process(processor).to("mock:result"); } }; }
