Author: hadrian
Date: Thu Sep 1 02:07:42 2011
New Revision: 1163892
URL: http://svn.apache.org/viewvc?rev=1163892&view=rev
Log:
CAMEL-4394. Fixed remaining tests.
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEnricherTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixed2Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPipelineTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEnricherTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEnricherTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEnricherTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointEnricherTest.java
Thu Sep 1 02:07:42 2011
@@ -50,24 +50,23 @@ public class AsyncEndpointEnricherTest e
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .enrich("async:Bye Camel")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .enrich("async:bye:camel")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixed2Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixed2Test.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixed2Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixed2Test.java
Thu Sep 1 02:07:42 2011
@@ -51,34 +51,33 @@ public class AsyncEndpointFailOverLoadBa
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .loadBalance()
- .failover()
- // first is sync, the 2nd is async based
- .to("direct:fail", "async:Bye World")
- .end()
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- // because the first is a sync then it will
wait and thus use the same thread to continue
- afterThreadName =
Thread.currentThread().getName();
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .loadBalance()
+ .failover()
+ // first is sync, the 2nd is async based
+ .to("direct:fail", "async:bye:world")
+ .end()
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ // because the first is a sync then it will wait
and thus use the same thread to continue
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
from("direct:fail")
- .to("log:fail")
- .to("mock:fail")
- .throwException(new IllegalArgumentException("Damn"));
+ .to("log:fail")
+ .to("mock:fail")
+ .throwException(new IllegalArgumentException("Damn"));
}
};
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixedTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceMixedTest.java
Thu Sep 1 02:07:42 2011
@@ -51,32 +51,32 @@ public class AsyncEndpointFailOverLoadBa
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .loadBalance()
- .failover()
- // the last would succeed
- // and make it complex by having a direct endpoint
which is not a real async processor
- .to("async:bye:camel?failFirstAttempts=5",
"direct:fail", "async:Bye Moon?failFirstAttempts=5", "async:Bye World")
- .end()
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .loadBalance()
+ .failover()
+ // the last would succeed
+ // and make it complex by having a direct endpoint
which is not a real async processor
+ .to("async:bye:camel?failFirstAttempts=5",
"direct:fail", "async:bye:moon?failFirstAttempts=5", "async:bye:world")
+ .end()
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
from("direct:fail")
- .to("log:fail")
- .to("mock:fail")
- .throwException(new IllegalArgumentException("Damn"));
+ .to("log:fail")
+ .to("mock:fail")
+ .throwException(new IllegalArgumentException("Damn"));
}
};
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointFailOverLoadBalanceOnlyAsyncTest.java
Thu Sep 1 02:07:42 2011
@@ -50,28 +50,27 @@ public class AsyncEndpointFailOverLoadBa
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .loadBalance()
- .failover()
- // the last would succeed
- .to("async:bye:camel?failFirstAttempts=5",
"async:Bye Moon?failFirstAttempts=5", "async:Bye World")
- .end()
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .loadBalance()
+ .failover()
+ // the last would succeed
+ .to("async:bye:camel?failFirstAttempts=5",
"async:bye:moon?failFirstAttempts=5", "async:bye:world")
+ .end()
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointMulticastFineGrainedErrorHandlingTest.java
Thu Sep 1 02:07:42 2011
@@ -35,7 +35,7 @@ public class AsyncEndpointMulticastFineG
from("direct:start")
.to("mock:a")
.multicast().stopOnException()
- .to("mock:foo", "async:Bye Camel", "mock:bar");
+ .to("mock:foo", "async:bye:camel", "mock:bar");
}
});
context.start();
@@ -60,7 +60,7 @@ public class AsyncEndpointMulticastFineG
from("direct:start")
.to("mock:a")
.multicast().stopOnException()
- .to("mock:foo", "async:Bye Camel").throwException(new
IllegalArgumentException("Damn")).to("mock:bar");
+ .to("mock:foo", "async:bye:camel").throwException(new
IllegalArgumentException("Damn")).to("mock:bar");
}
});
context.start();
@@ -83,5 +83,4 @@ public class AsyncEndpointMulticastFineG
public boolean isUseRouteBuilder() {
return false;
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPipelineTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPipelineTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPipelineTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointPipelineTest.java
Thu Sep 1 02:07:42 2011
@@ -41,9 +41,8 @@ public class AsyncEndpointPipelineTest e
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .pipeline("async:Bye Camel", "mock:result");
+ .pipeline("async:bye:camel", "mock:result");
}
};
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList3Test.java
Thu Sep 1 02:07:42 2011
@@ -50,27 +50,26 @@ public class AsyncEndpointRecipientList3
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .recipientList(constant("async:Hi Camel,direct:foo"));
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .recipientList(constant("async:hi:camel,direct:foo"));
from("direct:foo")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ exchange.getOut().setBody("Bye Camel");
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientList4Test.java
Thu Sep 1 02:07:42 2011
@@ -50,25 +50,25 @@ public class AsyncEndpointRecipientList4
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadId =
Thread.currentThread().getId();
- }
- })
- .recipientList(constant("async:Hi Camel,async:Hi
World,direct:foo"));
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadId = Thread.currentThread().getId();
+ }
+ })
+
.recipientList(constant("async:hi:camel,async:hi:world,direct:foo"));
from("direct:foo")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadId = Thread.currentThread().getId();
- exchange.getOut().setBody("Bye Camel");
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadId = Thread.currentThread().getId();
+ exchange.getOut().setBody("Bye Camel");
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListBean3Test.java
Thu Sep 1 02:07:42 2011
@@ -57,25 +57,25 @@ public class AsyncEndpointRecipientListB
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .beanRef("myBean");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .beanRef("myBean");
from("direct:foo")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- exchange.getOut().setBody("Bye Camel");
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ exchange.getOut().setBody("Bye Camel");
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}
@@ -84,8 +84,7 @@ public class AsyncEndpointRecipientListB
@RecipientList
public String doSomething() {
- return "async:Hi Camel,direct:foo";
+ return "async:hi:camel,direct:foo";
}
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRecipientListFineGrainedErrorHandlingTest.java
Thu Sep 1 02:07:42 2011
@@ -55,7 +55,7 @@ public class AsyncEndpointRecipientListF
getMockEndpoint("mock:bar").expectedMessageCount(1);
getMockEndpoint("mock:baz").expectedMessageCount(1);
- template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"mock:foo,async:Bye Camel,mock:bar,mock:baz");
+ template.sendBodyAndHeader("direct:start", "Hello World", "foo",
"mock:foo,async:bye:camel,mock:bar,mock:baz");
assertMockEndpointsSatisfied();
}
@@ -105,5 +105,4 @@ public class AsyncEndpointRecipientListF
throw new IllegalArgumentException("Damn");
}
}
-
}
\ No newline at end of file
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java?rev=1163892&r1=1163891&r2=1163892&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncEndpointRoundRobinLoadBalanceTest.java
Thu Sep 1 02:07:42 2011
@@ -53,25 +53,25 @@ public class AsyncEndpointRoundRobinLoad
context.addComponent("async", new MyAsyncComponent());
from("direct:start")
- .to("mock:before")
- .to("log:before")
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- beforeThreadName =
Thread.currentThread().getName();
- }
- })
- .loadBalance()
- .roundRobin()
- .to("async:bye:camel", "async:Bye World")
- .end()
- .process(new Processor() {
- public void process(Exchange exchange) throws
Exception {
- afterThreadName =
Thread.currentThread().getName();
- }
- })
- .to("log:after")
- .to("mock:after")
- .to("mock:result");
+ .to("mock:before")
+ .to("log:before")
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ beforeThreadName =
Thread.currentThread().getName();
+ }
+ })
+ .loadBalance()
+ .roundRobin()
+ .to("async:bye:camel", "async:bye:world")
+ .end()
+ .process(new Processor() {
+ public void process(Exchange exchange) throws
Exception {
+ afterThreadName = Thread.currentThread().getName();
+ }
+ })
+ .to("log:after")
+ .to("mock:after")
+ .to("mock:result");
}
};
}