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 2015/11/20 08:19:38 UTC
[1/4] camel git commit: Fixed test
Repository: camel
Updated Branches:
refs/heads/camel-2.16.x fd534e777 -> 37ce3d913
refs/heads/master b7bede86a -> 352682148
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/229517a9
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/229517a9
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/229517a9
Branch: refs/heads/master
Commit: 229517a91d0a948cf11ed8184179c19d4033d6c6
Parents: b7bede8
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 20 08:04:20 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 20 08:04:20 2015 +0100
----------------------------------------------------------------------
.../disruptor/BasicDisruptorComponentTest.java | 41 ++++----------------
1 file changed, 8 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/229517a9/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
index 6f5aa8d..67af198 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.disruptor;
import java.util.Collections;
@@ -36,7 +35,7 @@ import org.junit.Test;
* Tests some of the basic disruptor functionality
*/
public class BasicDisruptorComponentTest extends CamelTestSupport {
- private static final Integer VALUE = Integer.valueOf(42);
+ private static final Integer VALUE = 42;
@EndpointInject(uri = "mock:result")
private MockEndpoint resultEndpoint;
@@ -44,8 +43,6 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
@Produce(uri = "disruptor:test")
private ProducerTemplate template;
-
-
private final ThreadCounter threadCounter = new ThreadCounter();
@Test
@@ -53,34 +50,11 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
resultEndpoint.expectedBodiesReceived(VALUE);
resultEndpoint.setExpectedMessageCount(1);
- template.asyncSendBody("disruptor:test", VALUE);
+ template.sendBody("disruptor:test", VALUE);
- resultEndpoint.await(5, TimeUnit.SECONDS);
resultEndpoint.assertIsSatisfied();
}
-
- @Test
- public void testAsynchronous() throws InterruptedException {
- threadCounter.reset();
-
- final int messagesSent = 1000;
-
- resultEndpoint.setExpectedMessageCount(messagesSent);
-
- final long currentThreadId = Thread.currentThread().getId();
-
- for (int i = 0; i < messagesSent; ++i) {
- template.asyncSendBody("disruptor:testAsynchronous", VALUE);
- }
-
- resultEndpoint.await(20, TimeUnit.SECONDS);
- resultEndpoint.assertIsSatisfied();
-
- assertTrue(threadCounter.getThreadIdCount() > 0);
- assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
- }
-
@Test
public void testMultipleConsumers() throws InterruptedException {
threadCounter.reset();
@@ -90,7 +64,7 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
resultEndpoint.setExpectedMessageCount(messagesSent);
for (int i = 0; i < messagesSent; ++i) {
- template.asyncSendBody("disruptor:testMultipleConsumers?concurrentConsumers=4", VALUE);
+ template.sendBody("disruptor:testMultipleConsumers", VALUE);
}
resultEndpoint.await(20, TimeUnit.SECONDS);
@@ -103,15 +77,16 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
assertEquals(4, threadCounter.getThreadIdCount());
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("disruptor:test").to("mock:result");
- from("disruptor:testAsynchronous").process(threadCounter).to("mock:result");
- from("disruptor:testMultipleConsumers?concurrentConsumers=4").process(threadCounter)
+ from("disruptor:test")
+ .to("mock:result");
+
+ from("disruptor:testMultipleConsumers?concurrentConsumers=4")
+ .process(threadCounter)
.to("mock:result");
}
};
[3/4] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/543e4d31
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/543e4d31
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/543e4d31
Branch: refs/heads/camel-2.16.x
Commit: 543e4d31949740f09a0ececbd11472ea98b90511
Parents: fd534e7
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 20 08:04:20 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 20 08:19:22 2015 +0100
----------------------------------------------------------------------
.../disruptor/BasicDisruptorComponentTest.java | 41 ++++----------------
1 file changed, 8 insertions(+), 33 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/543e4d31/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
----------------------------------------------------------------------
diff --git a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
index 6f5aa8d..67af198 100644
--- a/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
+++ b/components/camel-disruptor/src/test/java/org/apache/camel/component/disruptor/BasicDisruptorComponentTest.java
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
package org.apache.camel.component.disruptor;
import java.util.Collections;
@@ -36,7 +35,7 @@ import org.junit.Test;
* Tests some of the basic disruptor functionality
*/
public class BasicDisruptorComponentTest extends CamelTestSupport {
- private static final Integer VALUE = Integer.valueOf(42);
+ private static final Integer VALUE = 42;
@EndpointInject(uri = "mock:result")
private MockEndpoint resultEndpoint;
@@ -44,8 +43,6 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
@Produce(uri = "disruptor:test")
private ProducerTemplate template;
-
-
private final ThreadCounter threadCounter = new ThreadCounter();
@Test
@@ -53,34 +50,11 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
resultEndpoint.expectedBodiesReceived(VALUE);
resultEndpoint.setExpectedMessageCount(1);
- template.asyncSendBody("disruptor:test", VALUE);
+ template.sendBody("disruptor:test", VALUE);
- resultEndpoint.await(5, TimeUnit.SECONDS);
resultEndpoint.assertIsSatisfied();
}
-
- @Test
- public void testAsynchronous() throws InterruptedException {
- threadCounter.reset();
-
- final int messagesSent = 1000;
-
- resultEndpoint.setExpectedMessageCount(messagesSent);
-
- final long currentThreadId = Thread.currentThread().getId();
-
- for (int i = 0; i < messagesSent; ++i) {
- template.asyncSendBody("disruptor:testAsynchronous", VALUE);
- }
-
- resultEndpoint.await(20, TimeUnit.SECONDS);
- resultEndpoint.assertIsSatisfied();
-
- assertTrue(threadCounter.getThreadIdCount() > 0);
- assertFalse(threadCounter.getThreadIds().contains(currentThreadId));
- }
-
@Test
public void testMultipleConsumers() throws InterruptedException {
threadCounter.reset();
@@ -90,7 +64,7 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
resultEndpoint.setExpectedMessageCount(messagesSent);
for (int i = 0; i < messagesSent; ++i) {
- template.asyncSendBody("disruptor:testMultipleConsumers?concurrentConsumers=4", VALUE);
+ template.sendBody("disruptor:testMultipleConsumers", VALUE);
}
resultEndpoint.await(20, TimeUnit.SECONDS);
@@ -103,15 +77,16 @@ public class BasicDisruptorComponentTest extends CamelTestSupport {
assertEquals(4, threadCounter.getThreadIdCount());
}
-
@Override
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("disruptor:test").to("mock:result");
- from("disruptor:testAsynchronous").process(threadCounter).to("mock:result");
- from("disruptor:testMultipleConsumers?concurrentConsumers=4").process(threadCounter)
+ from("disruptor:test")
+ .to("mock:result");
+
+ from("disruptor:testMultipleConsumers?concurrentConsumers=4")
+ .process(threadCounter)
.to("mock:result");
}
};
[4/4] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/37ce3d91
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/37ce3d91
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/37ce3d91
Branch: refs/heads/camel-2.16.x
Commit: 37ce3d913e3670a7e871ce7447ec97768578a014
Parents: 543e4d3
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 20 08:19:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 20 08:19:28 2015 +0100
----------------------------------------------------------------------
...uestReplyTempQueueMultipleConsumersTest.java | 39 ++++++++++++--------
1 file changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/37ce3d91/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
index decf610..a293de3 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,44 +41,52 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
private final Map<String, AtomicInteger> msgsPerThread = new ConcurrentHashMap<String, AtomicInteger>();
private PooledConnectionFactory connectionFactory;
-
+ private ExecutorService executorService;
+
@Test
public void testMultipleConsumingThreads() throws Exception {
- doSendMessages(1000, 5);
- assertTrue("Expected multiple consuming threads, but only found: " + msgsPerThread.keySet().size(),
+ executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
+
+ doSendMessages(1000);
+
+ assertTrue("Expected multiple consuming threads, but only found: " + msgsPerThread.keySet().size(),
msgsPerThread.keySet().size() > 1);
+
+ context.getExecutorServiceManager().shutdown(executorService);
}
@Test
public void testTempQueueRefreshed() throws Exception {
- doSendMessages(500, 5);
- connectionFactory.clear();
- doSendMessages(100, 5);
+ executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
+
+ doSendMessages(100);
connectionFactory.clear();
- doSendMessages(100, 5);
+ Thread.sleep(1000);
+ doSendMessages(100);
connectionFactory.clear();
- doSendMessages(100, 5);
+ Thread.sleep(1000);
+ doSendMessages(100);
+
+ context.getExecutorServiceManager().shutdown(executorService);
}
- private void doSendMessages(int files, int poolSize) throws Exception {
+ private void doSendMessages(int files) throws Exception {
resetMocks();
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(files);
mockEndpoint.expectsNoDuplicates(body());
- ExecutorService executor = Executors.newFixedThreadPool(poolSize);
for (int i = 0; i < files; i++) {
final int index = i;
- executor.submit(new Callable<Object>() {
+ executorService.submit(new Callable<Object>() {
public Object call() throws Exception {
- template.sendBody("seda:start", "Message " + index);
+ template.sendBody("direct:start", "Message " + index);
return null;
}
});
}
assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
- executor.shutdownNow();
}
protected CamelContext createCamelContext() throws Exception {
@@ -96,7 +103,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:start").inOut("jms:queue:foo?replyToConcurrentConsumers=10&replyToMaxConcurrentConsumers=20&recoveryInterval=10").process(new Processor() {
+ from("direct:start").inOut("jms:queue:foo?replyToConcurrentConsumers=10&replyToMaxConcurrentConsumers=20&recoveryInterval=10").process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
String threadName = Thread.currentThread().getName();
@@ -111,7 +118,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
}
}).to("mock:result");
- from("jms:queue:foo?concurrentConsumers=20&recoveryInterval=10").setBody(simple("Reply >>> ${body}"));
+ from("jms:queue:foo?concurrentConsumers=10&recoveryInterval=10").setBody(simple("Reply >>> ${body}"));
}
};
}
[2/4] camel git commit: Fixed test
Posted by da...@apache.org.
Fixed test
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/35268214
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/35268214
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/35268214
Branch: refs/heads/master
Commit: 35268214813be9b2bdf3990c122917bd8fdb51cb
Parents: 229517a
Author: Claus Ibsen <da...@apache.org>
Authored: Fri Nov 20 08:19:03 2015 +0100
Committer: Claus Ibsen <da...@apache.org>
Committed: Fri Nov 20 08:19:03 2015 +0100
----------------------------------------------------------------------
...uestReplyTempQueueMultipleConsumersTest.java | 39 ++++++++++++--------
1 file changed, 23 insertions(+), 16 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/35268214/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
----------------------------------------------------------------------
diff --git a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
index decf610..a293de3 100644
--- a/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
+++ b/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsRequestReplyTempQueueMultipleConsumersTest.java
@@ -20,7 +20,6 @@ import java.util.Map;
import java.util.concurrent.Callable;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicInteger;
@@ -42,44 +41,52 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
private final Map<String, AtomicInteger> msgsPerThread = new ConcurrentHashMap<String, AtomicInteger>();
private PooledConnectionFactory connectionFactory;
-
+ private ExecutorService executorService;
+
@Test
public void testMultipleConsumingThreads() throws Exception {
- doSendMessages(1000, 5);
- assertTrue("Expected multiple consuming threads, but only found: " + msgsPerThread.keySet().size(),
+ executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
+
+ doSendMessages(1000);
+
+ assertTrue("Expected multiple consuming threads, but only found: " + msgsPerThread.keySet().size(),
msgsPerThread.keySet().size() > 1);
+
+ context.getExecutorServiceManager().shutdown(executorService);
}
@Test
public void testTempQueueRefreshed() throws Exception {
- doSendMessages(500, 5);
- connectionFactory.clear();
- doSendMessages(100, 5);
+ executorService = context.getExecutorServiceManager().newFixedThreadPool(this, "test", 5);
+
+ doSendMessages(100);
connectionFactory.clear();
- doSendMessages(100, 5);
+ Thread.sleep(1000);
+ doSendMessages(100);
connectionFactory.clear();
- doSendMessages(100, 5);
+ Thread.sleep(1000);
+ doSendMessages(100);
+
+ context.getExecutorServiceManager().shutdown(executorService);
}
- private void doSendMessages(int files, int poolSize) throws Exception {
+ private void doSendMessages(int files) throws Exception {
resetMocks();
MockEndpoint mockEndpoint = getMockEndpoint("mock:result");
mockEndpoint.expectedMessageCount(files);
mockEndpoint.expectsNoDuplicates(body());
- ExecutorService executor = Executors.newFixedThreadPool(poolSize);
for (int i = 0; i < files; i++) {
final int index = i;
- executor.submit(new Callable<Object>() {
+ executorService.submit(new Callable<Object>() {
public Object call() throws Exception {
- template.sendBody("seda:start", "Message " + index);
+ template.sendBody("direct:start", "Message " + index);
return null;
}
});
}
assertMockEndpointsSatisfied(20, TimeUnit.SECONDS);
- executor.shutdownNow();
}
protected CamelContext createCamelContext() throws Exception {
@@ -96,7 +103,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
return new RouteBuilder() {
@Override
public void configure() throws Exception {
- from("seda:start").inOut("jms:queue:foo?replyToConcurrentConsumers=10&replyToMaxConcurrentConsumers=20&recoveryInterval=10").process(new Processor() {
+ from("direct:start").inOut("jms:queue:foo?replyToConcurrentConsumers=10&replyToMaxConcurrentConsumers=20&recoveryInterval=10").process(new Processor() {
@Override
public void process(Exchange exchange) throws Exception {
String threadName = Thread.currentThread().getName();
@@ -111,7 +118,7 @@ public class JmsRequestReplyTempQueueMultipleConsumersTest extends CamelTestSupp
}
}).to("mock:result");
- from("jms:queue:foo?concurrentConsumers=20&recoveryInterval=10").setBody(simple("Reply >>> ${body}"));
+ from("jms:queue:foo?concurrentConsumers=10&recoveryInterval=10").setBody(simple("Reply >>> ${body}"));
}
};
}