You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by js...@apache.org on 2007/09/06 17:09:03 UTC
svn commit: r573290 - in /activemq/camel/trunk:
camel-core/src/main/java/org/apache/camel/builder/
camel-core/src/main/java/org/apache/camel/component/mock/
camel-core/src/test/ide-resources/
camel-core/src/test/java/org/apache/camel/ camel-core/src/te...
Author: jstrachan
Date: Thu Sep 6 08:09:01 2007
New Revision: 573290
URL: http://svn.apache.org/viewvc?rev=573290&view=rev
Log:
added the test case from Ravi: http://www.nabble.com/Dead-Letter-Channel-delivers-message-when-it-shouldn%27t--tf4390150s22882.html#a12517101 also made some refactoring of the test cases and ContextTestSupport to make it easier to work with mock endpoints in test cases with less and more readable code
Added:
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java (with props)
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
activemq/camel/trunk/camel-core/src/test/ide-resources/log4j.properties
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JournalRouteTest.java
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
activemq/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/DeadLetterChannelBuilder.java Thu Sep 6 08:09:01 2007
@@ -38,7 +38,7 @@
private ProcessorFactory deadLetterFactory;
private Processor defaultDeadLetterEndpoint;
private Expression defaultDeadLetterEndpointExpression;
- private String defaultDeadLetterEndpointUri = "log:org.apache.camel.DeadLetterChannel:error";
+ private String defaultDeadLetterEndpointUri = "log:org.apache.camel.DeadLetterChannel?level=error";
private Logger logger = DeadLetterChannel.createDefaultLogger();
public DeadLetterChannelBuilder() {
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java Thu Sep 6 08:09:01 2007
@@ -20,18 +20,12 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Collection;
import java.util.concurrent.CopyOnWriteArrayList;
import java.util.concurrent.CountDownLatch;
import java.util.concurrent.TimeUnit;
-import org.apache.camel.Component;
-import org.apache.camel.Consumer;
-import org.apache.camel.Exchange;
-import org.apache.camel.Expression;
-import org.apache.camel.Message;
-import org.apache.camel.Processor;
-import org.apache.camel.Producer;
-import org.apache.camel.ExchangePattern;
+import org.apache.camel.*;
import org.apache.camel.impl.DefaultEndpoint;
import org.apache.camel.impl.DefaultExchange;
import org.apache.camel.impl.DefaultProducer;
@@ -93,6 +87,24 @@
}
}
+
+ /**
+ * Asserts that all the expectations on any {@link MockEndpoint} instances registered
+ * in the given context are valid
+ *
+ * @param context the camel context used to find all the available endpoints to be asserted
+ */
+ public static void assertIsSatisfied(CamelContext context) throws InterruptedException {
+ Collection<Endpoint> endpoints = context.getSingletonEndpoints();
+ for (Endpoint endpoint : endpoints) {
+ if (endpoint instanceof MockEndpoint) {
+ MockEndpoint mockEndpoint = (MockEndpoint) endpoint;
+ mockEndpoint.assertIsSatisfied();
+ }
+ }
+ }
+
+
public static void expectsMessageCount(int count, MockEndpoint... endpoints) throws InterruptedException {
for (MockEndpoint endpoint : endpoints) {
endpoint.expectsMessageCount(count);
@@ -141,6 +153,7 @@
* should wait for the test to be true
*/
public void assertIsSatisfied(long timeoutForEmptyEndpoints) throws InterruptedException {
+ LOG.info("Asserting: " + this + " is satisfied");
if (expectedCount >= 0) {
if (expectedCount != getReceivedCounter()) {
if (expectedCount == 0) {
@@ -539,5 +552,4 @@
public boolean isSingleton() {
return true;
}
-
}
Modified: activemq/camel/trunk/camel-core/src/test/ide-resources/log4j.properties
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/ide-resources/log4j.properties?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/ide-resources/log4j.properties (original)
+++ activemq/camel/trunk/camel-core/src/test/ide-resources/log4j.properties Thu Sep 6 08:09:01 2007
@@ -21,7 +21,7 @@
log4j.rootLogger=INFO, out
# uncomment the next line to debug Camel
-log4j.logger.org.apache.camel=DEBUG
+log4j.logger.org.apache.camel=INFO
log4j.logger.org.apache.camel.impl.converter=INFO
#log4j.logger.org.apache.activemq=DEBUG
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/ContextTestSupport.java Thu Sep 6 08:09:01 2007
@@ -21,6 +21,7 @@
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.spi.Language;
import org.apache.camel.util.jndi.JndiTest;
+import org.apache.camel.component.mock.MockEndpoint;
import javax.naming.Context;
@@ -102,6 +103,10 @@
return JndiTest.createInitialContext();
}
+ /**
+ * Factory method which derived classes can use to create a {@link RouteBuilder}
+ * to define the routes for testing
+ */
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
@@ -110,15 +115,38 @@
};
}
+ /**
+ * Resolves a mandatory endpoint for the given URI or an exception is thrown
+ *
+ * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint
+ * @return the endpoint
+ */
protected Endpoint resolveMandatoryEndpoint(String uri) {
return resolveMandatoryEndpoint(context, uri);
}
+ /**
+ * Resolves a mandatory endpoint for the given URI and expected type or an exception is thrown
+ *
+ * @param uri the Camel <a href="">URI</a> to use to create or resolve an endpoint
+ * @return the endpoint
+ */
protected <T extends Endpoint> T resolveMandatoryEndpoint(String uri, Class<T> endpointType) {
return resolveMandatoryEndpoint(context, uri, endpointType);
}
/**
+ * Resolves the mandatory Mock endpoint using a URI of the form <code>mock:someName</code>
+ *
+ * @param uri the URI which typically starts with "mock:" and has some name
+ * @return the mandatory mock endpoint or an exception is thrown if it could not be resolved
+ */
+ protected MockEndpoint getMockEndpoint(String uri) {
+ return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+ }
+
+
+ /**
* Sends a message to the given endpoint URI with the body value
*
* @param endpointUri the URI of the endpoint to send to
@@ -186,5 +214,12 @@
Language language = context.resolveLanguage(languageName);
assertNotNull("No language found for name: " + languageName, language);
return language;
+ }
+
+ /**
+ * Asserts that all the expectations of the Mock endpoints are valid
+ */
+ protected void assertMockEndpointsSatisifed() throws InterruptedException {
+ MockEndpoint.assertIsSatisfied(context);
}
}
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java?rev=573290&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java Thu Sep 6 08:09:01 2007
@@ -0,0 +1,73 @@
+/**
+ *
+ * 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.issues;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class ExceptionTest extends ContextTestSupport {
+
+ public void testExceptionWithoutHandler() throws Exception {
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
+
+ resultEndpoint.expectedMessageCount(0);
+
+ template.sendBody("direct:start", "<body/>");
+
+ assertMockEndpointsSatisifed();
+ }
+
+ public void testExceptionWithHandler() throws Exception {
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
+ MockEndpoint exceptionEndpoint = getMockEndpoint("mock:exception");
+
+ exceptionEndpoint.expectedMessageCount(1);
+ resultEndpoint.expectedMessageCount(0);
+
+ template.sendBody("direct:start", "<body/>");
+
+ assertMockEndpointsSatisifed();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ final Processor exceptionThrower = new Processor() {
+ public void process(Exchange exchange) throws Exception {
+ exchange.getIn().setBody("<exception/>");
+ throw new IllegalArgumentException("Exception thrown intentionally.");
+ }
+ };
+
+ return new RouteBuilder() {
+ public void configure() {
+ if (getName().endsWith("WithHandler")) {
+ log.debug("Using exception handler");
+ exception(IllegalArgumentException.class).to("mock:exception");
+ }
+ from("direct:start").process(exceptionThrower).to("mock:result");
+ }
+ };
+ }
+}
+
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/ExceptionTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ChoiceTest.java Thu Sep 6 08:09:01 2007
@@ -37,7 +37,7 @@
sendMessage("bar", body);
- assertIsSatisfied(x, y, z);
+ assertMockEndpointsSatisifed();
}
public void testSendToSecondWhen() throws Exception {
@@ -47,7 +47,7 @@
sendMessage("cheese", body);
- assertIsSatisfied(x, y, z);
+ assertMockEndpointsSatisifed();
}
public void testSendToOtherwiseClause() throws Exception {
@@ -57,7 +57,7 @@
sendMessage("somethingUndefined", body);
- assertIsSatisfied(x, y, z);
+ assertMockEndpointsSatisifed();
}
protected void sendMessage(final Object headerValue, final Object body) throws Exception {
@@ -68,9 +68,9 @@
protected void setUp() throws Exception {
super.setUp();
- x = (MockEndpoint) resolveMandatoryEndpoint("mock:x");
- y = (MockEndpoint) resolveMandatoryEndpoint("mock:y");
- z = (MockEndpoint) resolveMandatoryEndpoint("mock:z");
+ x = getMockEndpoint("mock:x");
+ y = getMockEndpoint("mock:y");
+ z = getMockEndpoint("mock:z");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelTest.java Thu Sep 6 08:09:01 2007
@@ -45,7 +45,7 @@
sendBody("direct:start", body);
- assertIsSatisfied(deadEndpoint, successEndpoint);
+ assertMockEndpointsSatisifed();
}
public void testLotsOfAttemptsFail() throws Exception {
@@ -59,7 +59,7 @@
sendBody("direct:start", body);
- assertIsSatisfied(deadEndpoint, successEndpoint);
+ assertMockEndpointsSatisifed();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/IdempotentConsumerTest.java Thu Sep 6 08:09:01 2007
@@ -62,7 +62,7 @@
super.setUp();
startEndpoint = resolveMandatoryEndpoint("direct:start");
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTest.java Thu Sep 6 08:09:01 2007
@@ -33,7 +33,7 @@
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -41,14 +41,14 @@
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
@Override
protected void setUp() throws Exception {
super.setUp();
- a = (MockEndpoint) resolveMandatoryEndpoint("mock:a");
- b = (MockEndpoint) resolveMandatoryEndpoint("mock:b");
+ a = getMockEndpoint("mock:a");
+ b = getMockEndpoint("mock:b");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateAndProceedRouteTest.java Thu Sep 6 08:09:01 2007
@@ -34,7 +34,7 @@
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -42,14 +42,14 @@
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
@Override
protected void setUp() throws Exception {
super.setUp();
- a = (MockEndpoint) resolveMandatoryEndpoint("mock:a");
- b = (MockEndpoint) resolveMandatoryEndpoint("mock:b");
+ a = getMockEndpoint("mock:a");
+ b = getMockEndpoint("mock:b");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithPredicateRouteTest.java Thu Sep 6 08:09:01 2007
@@ -33,7 +33,7 @@
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -41,14 +41,14 @@
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
@Override
protected void setUp() throws Exception {
super.setUp();
- a = (MockEndpoint) resolveMandatoryEndpoint("mock:a");
- b = (MockEndpoint) resolveMandatoryEndpoint("mock:b");
+ a = getMockEndpoint("mock:a");
+ b = getMockEndpoint("mock:b");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptWithoutProceedRouteTest.java Thu Sep 6 08:09:01 2007
@@ -33,21 +33,21 @@
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
public void testSendNotMatchingMessage() throws Exception {
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- assertIsSatisfied(a, b);
+ assertMockEndpointsSatisifed();
}
@Override
protected void setUp() throws Exception {
super.setUp();
- a = (MockEndpoint) resolveMandatoryEndpoint("mock:a");
- b = (MockEndpoint) resolveMandatoryEndpoint("mock:b");
+ a = getMockEndpoint("mock:a");
+ b = getMockEndpoint("mock:b");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/JoinRoutesTest.java Thu Sep 6 08:09:01 2007
@@ -57,7 +57,7 @@
super.setUp();
startEndpoint = resolveMandatoryEndpoint("direct:a");
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastTest.java Thu Sep 6 08:09:01 2007
@@ -48,16 +48,16 @@
}
});
- assertIsSatisfied(x, y, z);
+ assertMockEndpointsSatisifed();
}
@Override
protected void setUp() throws Exception {
super.setUp();
- x = (MockEndpoint) resolveMandatoryEndpoint("mock:x");
- y = (MockEndpoint) resolveMandatoryEndpoint("mock:y");
- z = (MockEndpoint) resolveMandatoryEndpoint("mock:z");
+ x = getMockEndpoint("mock:x");
+ y = getMockEndpoint("mock:y");
+ z = getMockEndpoint("mock:z");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/PipelineTest.java Thu Sep 6 08:09:01 2007
@@ -114,7 +114,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListTest.java Thu Sep 6 08:09:01 2007
@@ -51,9 +51,9 @@
protected void setUp() throws Exception {
super.setUp();
- x = (MockEndpoint) resolveMandatoryEndpoint("mock:x");
- y = (MockEndpoint) resolveMandatoryEndpoint("mock:y");
- z = (MockEndpoint) resolveMandatoryEndpoint("mock:z");
+ x = getMockEndpoint("mock:x");
+ y = getMockEndpoint("mock:y");
+ z = getMockEndpoint("mock:z");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/ResequencerTest.java Thu Sep 6 08:09:01 2007
@@ -47,7 +47,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SplitterTest.java Thu Sep 6 08:09:01 2007
@@ -49,7 +49,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/StreamResequencerTest.java Thu Sep 6 08:09:01 2007
@@ -57,7 +57,7 @@
@Override
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformTest.java Thu Sep 6 08:09:01 2007
@@ -41,7 +41,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformViaDSLTest.java Thu Sep 6 08:09:01 2007
@@ -38,7 +38,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java Thu Sep 6 08:09:01 2007
@@ -52,7 +52,7 @@
super.setUp();
startEndpoint = resolveMandatoryEndpoint("direct:start");
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQJmsHeaderRouteTest.java Thu Sep 6 08:09:01 2007
@@ -46,7 +46,7 @@
protected String messageType = getClass().getName();
public void testForwardingAMessageAcrossJMSKeepingCustomJMSHeaders() throws Exception {
- MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived(expectedBody);
AssertionClause firstMessageExpectations = resultEndpoint.message(0);
Modified: activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java (original)
+++ activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/ActiveMQReplyToHeaderUsingConverterTest.java Thu Sep 6 08:09:01 2007
@@ -47,7 +47,7 @@
protected String messageType = getClass().getName();
public void testSendingAMessageFromCamelSetsCustomJmsHeaders() throws Exception {
- MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:result", MockEndpoint.class);
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedBodiesReceived(expectedBody);
AssertionClause firstMessage = resultEndpoint.message(0);
Modified: activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JournalRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JournalRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JournalRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-activemq/src/test/java/org/apache/camel/component/activemq/JournalRouteTest.java Thu Sep 6 08:09:01 2007
@@ -35,7 +35,7 @@
byte[] payload = "Hello World".getBytes();
- MockEndpoint resultEndpoint = resolveMandatoryEndpoint("mock:out", MockEndpoint.class);
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:out");
resultEndpoint.expectedMessageCount(1);
AssertionClause firstMessageExpectations = resultEndpoint.message(0);
Modified: activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MimeMessageConsumeTest.java Thu Sep 6 08:09:01 2007
@@ -40,7 +40,7 @@
protected String body = "hello world!";
public void testSendAndReceiveMails() throws Exception {
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
Properties properties = new Properties();
Modified: activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java (original)
+++ activemq/camel/trunk/components/camel-mail/src/test/java/org/apache/camel/component/mail/MultipleDestinationConsumeTest.java Thu Sep 6 08:09:01 2007
@@ -42,7 +42,7 @@
protected Session mailSession;
public void testSendAndReceiveMails() throws Exception {
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMinimumMessageCount(1);
MimeMessage message = new MimeMessage(mailSession);
Modified: activemq/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-quartz/src/test/java/org/apache/camel/component/quartz/QuartzRouteTest.java Thu Sep 6 08:09:01 2007
@@ -31,7 +31,7 @@
protected MockEndpoint resultEndpoint;
public void testSendAndReceiveMails() throws Exception {
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
resultEndpoint.expectedMessageCount(2);
resultEndpoint.message(0).header("triggerName").isEqualTo("myTimerName");
resultEndpoint.message(0).header("triggerGroup").isEqualTo("myGroup");
Modified: activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java (original)
+++ activemq/camel/trunk/components/camel-saxon/src/test/java/org/apache/camel/builder/saxon/XQueryFilterTest.java Thu Sep 6 08:09:01 2007
@@ -53,7 +53,7 @@
super.setUp();
startEndpoint = resolveMandatoryEndpoint("direct:start");
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/main/java/org/apache/camel/spring/Main.java Thu Sep 6 08:09:01 2007
@@ -81,10 +81,10 @@
}
public static void main(String... args) {
- Main main = new Main();
- main.run(args);
+ new Main().run(args);
}
+
/**
* Parses the command line arguments then runs the program
*/
@@ -287,7 +287,8 @@
}
protected AbstractApplicationContext createDefaultApplicationContext() {
- return new ClassPathXmlApplicationContext(getApplicationContextUri());
+ String[] args = getApplicationContextUri().split(";");
+ return new ClassPathXmlApplicationContext(args);
}
protected void doStop() throws Exception {
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/EndpointReferenceTest.java Thu Sep 6 08:09:01 2007
@@ -44,7 +44,7 @@
log.debug("Found dummy bean: " + dummyBean);
- MockEndpoint resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint(camelContext, "mock:end");
+ MockEndpoint resultEndpoint = getMockEndpoint("mock:end");
resultEndpoint.expectedBodiesReceived(body);
// now lets send a message
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/SpringTestSupport.java Thu Sep 6 08:09:01 2007
@@ -23,6 +23,7 @@
import org.apache.camel.Exchange;
import org.apache.camel.Route;
import org.apache.camel.TestSupport;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.util.ObjectHelper;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -40,11 +41,11 @@
@Override
protected void setUp() throws Exception {
- super.setUp();
-
applicationContext = createApplicationContext();
assertNotNull("Should have created a valid spring context", applicationContext);
+ super.setUp();
+
camelContext = createCamelContext();
assertValidContext(camelContext);
if (!camelContext.isStarted()) {
@@ -85,6 +86,16 @@
return resolveMandatoryEndpoint(camelContext, uri, endpointType);
}
+ /**
+ * Resolves the mandatory Mock endpoint using a URI of the form <code>mock:someName</code>
+ *
+ * @param uri the URI which typically starts with "mock:" and has some name
+ * @return the mandatory mock endpoint or an exception is thrown if it could not be resolved
+ */
+ protected MockEndpoint getMockEndpoint(String uri) {
+ return resolveMandatoryEndpoint(uri, MockEndpoint.class);
+ }
+
protected void assertValidContext(SpringCamelContext context) {
assertNotNull("No context found!", context);
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/ContentBasedRouteTest.java Thu Sep 6 08:09:01 2007
@@ -54,8 +54,8 @@
protected void setUp() throws Exception {
super.setUp();
- matchedEndpoint = (MockEndpoint) resolveMandatoryEndpoint(camelContext, "mock:matched");
- notMatchedEndpoint = (MockEndpoint) resolveMandatoryEndpoint(camelContext, "mock:notMatched");
+ matchedEndpoint = getMockEndpoint("mock:matched");
+ notMatchedEndpoint = getMockEndpoint("mock:notMatched");
}
protected ClassPathXmlApplicationContext createApplicationContext() {
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoConsumerTest.java Thu Sep 6 08:09:01 2007
@@ -39,7 +39,7 @@
protected void setUp() throws Exception {
super.setUp();
- resultEndpoint = (MockEndpoint) resolveMandatoryEndpoint("mock:result");
+ resultEndpoint = getMockEndpoint("mock:result");
}
protected ClassPathXmlApplicationContext createApplicationContext() {
Modified: activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java (original)
+++ activemq/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/example/PojoSenderTest.java Thu Sep 6 08:09:01 2007
@@ -53,8 +53,8 @@
protected void setUp() throws Exception {
super.setUp();
- matchedEndpoint = (MockEndpoint) resolveMandatoryEndpoint(camelContext, "mock:a");
- notMatchedEndpoint = (MockEndpoint) resolveMandatoryEndpoint(camelContext, "mock:b");
+ matchedEndpoint = getMockEndpoint("mock:a");
+ notMatchedEndpoint = getMockEndpoint("mock:b");
mySender = getMandatoryBean(MySender.class, "mySender");
}
Modified: activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java (original)
+++ activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/EmbeddedMojo.java Thu Sep 6 08:09:01 2007
@@ -30,7 +30,8 @@
/**
* Runs a CamelContext using any Spring XML configuration files found in
- * <code>META-INF/spring/*.xml</code> and starting up the context; then generating
+ * <code>META-INF/spring/*.xml</code> and <code>camel-*.xml</code>
+ * and starting up the context; then generating
* the DOT file before closing the context down.
*
* @goal embedded
Modified: activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java?rev=573290&r1=573289&r2=573290&view=diff
==============================================================================
--- activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java (original)
+++ activemq/camel/trunk/tooling/maven/camel-maven-plugin/src/main/java/org/apache/camel/maven/RunMojo.java Thu Sep 6 08:09:01 2007
@@ -54,7 +54,7 @@
/**
* Runs a CamelContext using any Spring XML configuration files found in
- * <code>META-INF/spring/*.xml</code> and starting up the context.
+ * <code>META-INF/spring/*.xml</code> and <code>camel-*.xml</code> and starting up the context.
*
* @goal run
* @requiresDependencyResolution runtime