Author: davsclaus
Date: Sat Mar 26 14:01:16 2011
New Revision: 1085723
URL: http://svn.apache.org/viewvc?rev=1085723&view=rev
Log:
CAMEL-3809: Mock endpoint is lenient properties, to make it easier to stub real
components with mocks having uri parameters. Now mock wont complain about
unknown parameters.
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java?rev=1085723&r1=1085722&r2=1085723&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/MockEndpoint.java
Sat Mar 26 14:01:16 2011
@@ -1106,4 +1106,8 @@ public class MockEndpoint extends Defaul
public boolean isSingleton() {
return true;
}
+
+ public boolean isLenientProperties() {
+ return true;
+ }
}
Added:
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java?rev=1085723&view=auto
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
(added)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/component/mock/MockEndpointWithParametersTest.java
Sat Mar 26 14:01:16 2011
@@ -0,0 +1,56 @@
+/**
+ * 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.component.mock;
+
+import org.apache.camel.CamelContext;
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+
+/**
+ *
+ */
+public class MockEndpointWithParametersTest extends ContextTestSupport {
+
+ private String uri =
"smtp://host:9999?username=smtpusername&password=smtppassword";
+
+ public void testMockEndpointWithParameter() throws Exception {
+ getMockEndpoint(uri).expectedBodiesReceived("Hello World");
+
+ template.sendBody("direct:start", "Hello World");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected CamelContext createCamelContext() throws Exception {
+ CamelContext context = super.createCamelContext();
+ // replace smtp with mock
+ context.addComponent("smtp", new MockComponent());
+ return context;
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ @Override
+ public void configure() throws Exception {
+ from("direct:start")
+ .to(uri);
+ }
+ };
+ }
+}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java?rev=1085723&r1=1085722&r2=1085723&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/model/StartingRoutesErrorReportedTest.java
Sat Mar 26 14:01:16 2011
@@ -47,13 +47,13 @@ public class StartingRoutesErrorReported
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
-
from("direct:start").routeId("route2").to("mock:result?foo=bar");
+
from("direct:start").routeId("route2").to("direct:result?foo=bar");
}
});
context.start();
fail();
} catch (FailedToCreateRouteException e) {
- assertTrue(e.getMessage().startsWith("Failed to create route
route2 at: >>> To[mock:result?foo=bar] <<< in route: Route[[From[direct:start]]
-> [To[mock:result?foo=bar]]] because of"));
+ assertTrue(e.getMessage().startsWith("Failed to create route
route2 at: >>> To[direct:result?foo=bar] <<< in route:
Route[[From[direct:start]] -> [To[direct:result?foo=bar]]] because of"));
}
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java?rev=1085723&r1=1085722&r2=1085723&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelBuilderWithInvalidDeadLetterUriTest.java
Sat Mar 26 14:01:16 2011
@@ -48,7 +48,7 @@ public class DeadLetterChannelBuilderWit
context.addRoutes(new RouteBuilder() {
@Override
public void configure() throws Exception {
- errorHandler(deadLetterChannel("mock:error?foo=bar"));
+ errorHandler(deadLetterChannel("direct:error?foo=bar"));
from("direct:start").to("mock:foo");
}
Modified:
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml?rev=1085723&r1=1085722&r2=1085723&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
(original)
+++
camel/trunk/components/camel-spring/src/test/resources/org/apache/camel/spring/processor/SpringDeadLetterChannelInvalidOptionDeadLetterUriTest.xml
Sat Mar 26 14:01:16 2011
@@ -23,8 +23,8 @@
">
<bean id="myDLC" class="org.apache.camel.builder.DeadLetterChannelBuilder">
- <!-- invalid option in mock uri -->
- <property name="deadLetterUri" value="mock:error?foo=bar"/>
+ <!-- invalid option in direct uri -->
+ <property name="deadLetterUri" value="direct:error?foo=bar"/>
</bean>
<camelContext errorHandlerRef="myDLC"
xmlns="http://camel.apache.org/schema/spring";>
