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 2009/09/21 15:57:05 UTC
svn commit: r817257 - in /camel/trunk/camel-core/src:
main/java/org/apache/camel/ main/java/org/apache/camel/management/mbean/
main/java/org/apache/camel/processor/ test/java/org/apache/camel/processor/
test/java/org/apache/camel/processor/async/
Author: davsclaus
Date: Mon Sep 21 13:57:04 2009
New Revision: 817257
URL: http://svn.apache.org/viewvc?rev=817257&view=rev
Log:
Added more unit test to camel core. Added Camel version in jconsole.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java (with props)
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java (with props)
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java?rev=817257&r1=817256&r2=817257&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/CamelContext.java Mon Sep 21 13:57:04 2009
@@ -55,6 +55,13 @@
*/
String getName();
+ /**
+ * Gets the version of the this context.
+ *
+ * @return the version
+ */
+ String getVersion();
+
// Component Management Methods
//-----------------------------------------------------------------------
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java?rev=817257&r1=817256&r2=817257&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/management/mbean/ManagedCamelContext.java Mon Sep 21 13:57:04 2009
@@ -47,6 +47,11 @@
return context.getName();
}
+ @ManagedAttribute(description = "Camel Version")
+ public String getCamelVersion() {
+ return context.getVersion();
+ }
+
@ManagedAttribute(description = "Camel State")
public String getState() {
// must use String type to be sure remote JMX can read the attribute without requiring Camel classes.
Modified: camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java?rev=817257&r1=817256&r2=817257&view=diff
==============================================================================
--- camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java (original)
+++ camel/trunk/camel-core/src/main/java/org/apache/camel/processor/InterceptEndpointProcessor.java Mon Sep 21 13:57:04 2009
@@ -27,10 +27,6 @@
private final String uri;
- public InterceptEndpointProcessor(String uri) {
- this.uri = uri;
- }
-
public InterceptEndpointProcessor(String uri, Processor processor) {
super(processor);
this.uri = uri;
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java?rev=817257&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java Mon Sep 21 13:57:04 2009
@@ -0,0 +1,50 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor;
+
+import org.apache.camel.CamelExecutionException;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.RollbackExchangeException;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class RollbackDefaultMessageTest extends ContextTestSupport {
+
+ public void testRollback() throws Exception {
+ try {
+ template.sendBody("direct:start", "Hello World");
+ fail("Should have thrown an exception");
+ } catch (CamelExecutionException e) {
+ assertIsInstanceOf(RollbackExchangeException.class, e.getCause());
+ assertNotNull(e.getCause().getMessage());
+ }
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ context.setTracing(true);
+
+ from("direct:start").rollback();
+ }
+ };
+ }
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RollbackDefaultMessageTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Added: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java?rev=817257&view=auto
==============================================================================
--- camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java (added)
+++ camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java Mon Sep 21 13:57:04 2009
@@ -0,0 +1,183 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.camel.processor.async;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.ExchangePattern;
+import org.apache.camel.Processor;
+import org.apache.camel.WaitForTaskToComplete;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ * @version $Revision$
+ */
+public class AsyncWaitPropertyTest extends ContextTestSupport {
+
+ private static String route = "";
+
+ @Override
+ protected void setUp() throws Exception {
+ super.setUp();
+ route = "";
+ }
+
+ public void testAsyncWaitPropertyAlways() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+ getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+ // send a request reply to the direct start endpoint
+ // it will wait for the async response so we get the full response
+ Exchange out = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello");
+ exchange.setPattern(ExchangePattern.InOnly);
+ // force to always wait even for in only
+ exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.Always);
+ }
+ });
+
+ // we should not run before the async processor that sets B
+ route += "A";
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("BA", route);
+
+ // get the response from the future
+ String response = context.getTypeConverter().convertTo(String.class, out.getOut().getBody());
+ assertEquals("Bye World", response);
+ }
+
+ public void testAsyncWaitPropertyNever() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+ getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+ // send a request reply to the direct start endpoint
+ // it will wait for the async response so we get the full response
+ Exchange out = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello");
+ exchange.setPattern(ExchangePattern.InOut);
+ // force to not wait even for in out
+ exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.Never);
+ }
+ });
+
+ // we should run before the async processor that sets B
+ route += "A";
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("AB", route);
+
+ // get the response from the future
+ String response = context.getTypeConverter().convertTo(String.class, out.getOut().getBody());
+ assertEquals("Bye World", response);
+ }
+
+ public void testAsyncWaitPropertyInReplyExpectedForInOut() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+ getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+ // send a request reply to the direct start endpoint
+ // it will wait for the async response so we get the full response
+ Exchange out = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello");
+ exchange.setPattern(ExchangePattern.InOut);
+ exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.IfReplyExpected);
+ }
+ });
+
+ // we should not run before the async processor that sets B
+ route += "A";
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("BA", route);
+
+ // get the response from the future
+ String response = context.getTypeConverter().convertTo(String.class, out.getOut().getBody());
+ assertEquals("Bye World", response);
+ }
+
+ public void testAsyncWaitPropertyInReplyExpectedForInOnly() throws Exception {
+ getMockEndpoint("mock:foo").expectedBodiesReceived("Hello World");
+ getMockEndpoint("mock:result").expectedBodiesReceived("Bye World");
+
+ // send a request reply to the direct start endpoint
+ // it will wait for the async response so we get the full response
+ Exchange out = template.send("direct:start", new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("Hello");
+ exchange.setPattern(ExchangePattern.InOnly);
+ exchange.setProperty(Exchange.ASYNC_WAIT, WaitForTaskToComplete.IfReplyExpected);
+ }
+ });
+
+ // we should run before the async processor that sets B
+ route += "A";
+
+ assertMockEndpointsSatisfied();
+
+ assertEquals("AB", route);
+
+ // get the response from the future
+ String response = context.getTypeConverter().convertTo(String.class, out.getOut().getBody());
+ // which will be Hello World as its a InOnly MEP
+ assertEquals("Hello World", response);
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ // we start this route async
+ from("direct:start")
+ // we play a bit with the message
+ .transform(body().append(" World"))
+ // now turn the route into async from this point forward
+ // the caller will have a Future<Exchange> returned as response in OUT
+ // to be used to grape the async response when he fell like it
+ .threads()
+ // from this point forward this is the async route doing its work
+ // so we do a bit of delay to simulate heavy work that takes time
+ .to("mock:foo")
+ .delay(500)
+ // and we also work with the message so we can prepare a response
+ .process(new MyProcessor())
+ // and we use mocks for unit testing
+ .to("mock:result");
+ }
+ };
+ }
+
+ public static class MyProcessor implements Processor {
+
+ public MyProcessor() {
+ }
+
+ public void process(Exchange exchange) throws Exception {
+ route += "B";
+ assertEquals("Hello World", exchange.getIn().getBody());
+ exchange.getOut().setBody("Bye World");
+ }
+ }
+
+}
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: camel/trunk/camel-core/src/test/java/org/apache/camel/processor/async/AsyncWaitPropertyTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date