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 2011/05/07 15:46:57 UTC
svn commit: r1100533 - in /camel/trunk:
camel-core/src/test/java/org/apache/camel/processor/async/
camel-core/src/test/java/org/apache/camel/processor/enricher/
camel-core/src/test/java/org/apache/camel/util/
components/camel-spring/src/test/resources/...
Author: davsclaus
Date: Sat May 7 13:46:57 2011
New Revision: 1100533
URL: http://svn.apache.org/viewvc?rev=1100533&view=rev
Log:
Fixed tests and made them a bit faster.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListParallel3Test.java Sat May 7 13:46:57 2011
@@ -57,7 +57,7 @@ public class AsyncEndpointRecipientListP
beforeThreadName = Thread.currentThread().getName();
}
})
- .recipientList(constant("async:Hi Camel?delay=2000,direct:foo")).parallelProcessing();
+ .recipientList(constant("async:Hi Camel?delay=200,direct:foo")).parallelProcessing();
from("direct:foo")
.process(new Processor() {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay2Test.java Sat May 7 13:46:57 2011
@@ -56,7 +56,7 @@ public class AsyncEndpointRedeliveryErro
public void configure() throws Exception {
context.addComponent("async", new MyAsyncComponent());
- errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(2000).asyncDelayedRedelivery());
+ errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(100).asyncDelayedRedelivery());
from("seda:start")
.to("log:before")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelay3Test.java Sat May 7 13:46:57 2011
@@ -51,7 +51,7 @@ public class AsyncEndpointRedeliveryErro
public void configure() throws Exception {
context.addComponent("async", new MyAsyncComponent());
- errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(1000).asyncDelayedRedelivery());
+ errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(100).asyncDelayedRedelivery());
from("seda:start")
.to("log:before")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRedeliveryErrorHandlerNonBlockedDelayTest.java Sat May 7 13:46:57 2011
@@ -57,7 +57,7 @@ public class AsyncEndpointRedeliveryErro
public void configure() throws Exception {
context.addComponent("async", new MyAsyncComponent());
- errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(2000).asyncDelayedRedelivery());
+ errorHandler(defaultErrorHandler().maximumRedeliveries(5).redeliveryDelay(100).asyncDelayedRedelivery());
from("seda:start")
.to("log:before")
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/MyAsyncEndpoint.java Sat May 7 13:46:57 2011
@@ -29,7 +29,7 @@ import org.apache.camel.impl.Synchronous
public class MyAsyncEndpoint extends DefaultEndpoint {
private String reply;
- private long delay = 500;
+ private long delay = 25;
private int failFirstAttempts;
public MyAsyncEndpoint(String endpointUri, Component component) {
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/enricher/PollEnricherTest.java Sat May 7 13:46:57 2011
@@ -45,7 +45,7 @@ public class PollEnricherTest extends Co
// -------------------------------------------------------------
public void testPollEnrichInOnly() throws InterruptedException {
- template.sendBody("direct:foo1", "blah");
+ template.sendBody("seda:foo1", "blah");
mock.expectedBodiesReceived("test:blah");
template.sendBody("direct:enricher-test-1", "test");
@@ -61,7 +61,7 @@ public class PollEnricherTest extends Co
// now send it and try again
mock.reset();
- template.sendBody("direct:foo2", "blah");
+ template.sendBody("seda:foo2", "blah");
template.sendBody("direct:enricher-test-2", "test");
mock.assertIsSatisfied();
}
@@ -75,7 +75,7 @@ public class PollEnricherTest extends Co
} catch (InterruptedException e) {
// ignore
}
- template.sendBody("direct:foo3", "blah");
+ template.sendBody("seda:foo3", "blah");
}
});
@@ -94,14 +94,16 @@ public class PollEnricherTest extends Co
// -------------------------------------------------------------
public void testPollEnrichInOut() throws InterruptedException {
- template.sendBody("direct:foo4", "blah");
+ template.sendBody("seda:foo4", "blah");
+
+ Thread.sleep(100);
String result = (String) template.sendBody("direct:enricher-test-4", ExchangePattern.InOut, "test");
assertEquals("test:blah", result);
}
public void testPollEnrichInOutPlusHeader() throws InterruptedException {
- template.sendBody("direct:foo4", "blah");
+ template.sendBody("seda:foo4", "blah");
Exchange exchange = template.request("direct:enricher-test-4", new Processor() {
public void process(Exchange exchange) {
@@ -123,15 +125,15 @@ public class PollEnricherTest extends Co
// -------------------------------------------------------------
from("direct:enricher-test-1")
- .pollEnrich("direct:foo1", aggregationStrategy)
+ .pollEnrich("seda:foo1", aggregationStrategy)
.to("mock:mock");
from("direct:enricher-test-2")
- .pollEnrich("direct:foo2", 1000, aggregationStrategy)
+ .pollEnrich("seda:foo2", 1000, aggregationStrategy)
.to("mock:mock");
from("direct:enricher-test-3")
- .pollEnrich("direct:foo3", -1, aggregationStrategy)
+ .pollEnrich("seda:foo3", -1, aggregationStrategy)
.to("mock:mock");
// -------------------------------------------------------------
@@ -139,7 +141,7 @@ public class PollEnricherTest extends Co
// -------------------------------------------------------------
from("direct:enricher-test-4")
- .pollEnrich("direct:foo4", aggregationStrategy);
+ .pollEnrich("seda:foo4", aggregationStrategy);
}
};
}
Modified: camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java (original)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/util/LRUSoftCacheTest.java Sat May 7 13:46:57 2011
@@ -215,10 +215,10 @@ public class LRUSoftCacheTest extends Te
public void testLRUSoftCacheNotRunOutOfMemory() throws Exception {
// we should not run out of memory using the soft cache
// if you run this test with LRUCache then you will run out of memory
- LRUSoftCache<Integer, Object> cache = new LRUSoftCache<Integer, Object>(250);
+ LRUSoftCache<Integer, Object> cache = new LRUSoftCache<Integer, Object>(500);
cache.start();
- for (int i = 0; i < 1000; i++) {
+ for (int i = 0; i < 500; i++) {
Object data = createData();
Integer key = new Integer(i);
log.info("Putting {}", key);
@@ -239,8 +239,8 @@ public class LRUSoftCacheTest extends Te
int first = list.get(0).intValue();
assertTrue("First key should not be 0, was: " + first, first != 0);
- // last key should be 999
- assertEquals(999, list.get(list.size() - 1).intValue());
+ // last key should be 499
+ assertEquals(499, list.get(list.size() - 1).intValue());
cache.stop();
}
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricher.xml Sat May 7 13:46:57 2011
@@ -26,26 +26,26 @@
<!-- START SNIPPET: e1 -->
<route>
<from uri="direct:enricher-test-1"/>
- <pollEnrich uri="direct:foo1" strategyRef="sampleAggregator"/>
+ <pollEnrich uri="seda:foo1" strategyRef="sampleAggregator"/>
<to uri="mock:mock"/>
</route>
<!-- END SNIPPET: e1 -->
<route>
<from uri="direct:enricher-test-2"/>
- <pollEnrich uri="direct:foo2" timeout="1000" strategyRef="sampleAggregator"/>
+ <pollEnrich uri="seda:foo2" timeout="1000" strategyRef="sampleAggregator"/>
<to uri="mock:mock"/>
</route>
<route>
<from uri="direct:enricher-test-3"/>
- <pollEnrich uri="direct:foo3" timeout="-1" strategyRef="sampleAggregator"/>
+ <pollEnrich uri="seda:foo3" timeout="-1" strategyRef="sampleAggregator"/>
<to uri="mock:mock"/>
</route>
<route>
<from uri="direct:enricher-test-4"/>
- <pollEnrich uri="direct:foo4" strategyRef="sampleAggregator"/>
+ <pollEnrich uri="seda:foo4" strategyRef="sampleAggregator"/>
<to uri="mock:mock"/>
</route>
</camelContext>
Modified: camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml?rev=1100533&r1=1100532&r2=1100533&view=diff
==============================================================================
--- camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml (original)
+++ camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/pollEnricherRef.xml Sat May 7 13:46:57 2011
@@ -24,10 +24,10 @@
<camelContext xmlns="http://camel.apache.org/schema/spring">
- <endpoint id="foo1" uri="direct:foo1"/>
- <endpoint id="foo2" uri="direct:foo2"/>
- <endpoint id="foo3" uri="direct:foo3"/>
- <endpoint id="foo4" uri="direct:foo4"/>
+ <endpoint id="foo1" uri="seda:foo1"/>
+ <endpoint id="foo2" uri="seda:foo2"/>
+ <endpoint id="foo3" uri="seda:foo3"/>
+ <endpoint id="foo4" uri="seda:foo4"/>
<!-- START SNIPPET: e1 -->
<route>