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 2008/09/20 15:08:48 UTC
svn commit: r697361 - in /activemq/camel/trunk/camel-core/src:
main/java/org/apache/camel/builder/xml/
main/java/org/apache/camel/language/xpath/
main/resources/META-INF/services/org/apache/camel/language/
test/java/org/apache/camel/component/bean/ tes...
Author: davsclaus
Date: Sat Sep 20 06:08:47 2008
New Revision: 697361
URL: http://svn.apache.org/viewvc?rev=697361&view=rev
Log:
CAMEL-907: Moved XPathLanguage to new package. Using non @deprecated assert mock method. Added simple language unit test.
Added:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/package.html
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java (with props)
Removed:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/XPathLanguage.java
Modified:
activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/language/xpath
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.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/InterceptRouteTestSupport.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.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/RecipientListTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithArrayHeaderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorWithHeaderTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathFilterTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithNonStandardExchangeTest.java
Modified: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java (original)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/builder/xml/MessageVariableResolver.java Sat Sep 20 06:08:47 2008
@@ -97,8 +97,6 @@
}
}
- // TODO support exposing CamelContext properties/resources via XPath?
-
// If we can't find an answer we must return void.
// We can't return null then the xpath engine will throw a NullPointerException
if (answer == null) {
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java?rev=697361&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/XPathLanguage.java Sat Sep 20 06:08:47 2008
@@ -0,0 +1,60 @@
+/**
+ * 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.language.xpath;
+
+import javax.xml.namespace.QName;
+
+import org.apache.camel.Exchange;
+import org.apache.camel.Expression;
+import org.apache.camel.Predicate;
+import org.apache.camel.builder.xml.XPathBuilder;
+import org.apache.camel.spi.Language;
+
+/**
+ * XPath language.
+ *
+ * @version $Revision: 659760 $
+ */
+public class XPathLanguage implements Language {
+ private QName resultType;
+
+ public Predicate<Exchange> createPredicate(String expression) {
+ XPathBuilder builder = XPathBuilder.xpath(expression);
+ configureBuilder(builder);
+ return builder;
+ }
+
+ public Expression<Exchange> createExpression(String expression) {
+ XPathBuilder builder = XPathBuilder.xpath(expression);
+ configureBuilder(builder);
+ return builder;
+ }
+
+ public QName getResultType() {
+ return resultType;
+ }
+
+ public void setResultType(QName resultType) {
+ this.resultType = resultType;
+ }
+
+ protected void configureBuilder(XPathBuilder builder) {
+ if (resultType != null) {
+ builder.setResultQName(resultType);
+ }
+ }
+}
Added: activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/package.html
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/package.html?rev=697361&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/package.html (added)
+++ activemq/camel/trunk/camel-core/src/main/java/org/apache/camel/language/xpath/package.html Sat Sep 20 06:08:47 2008
@@ -0,0 +1,25 @@
+<!--
+ 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.
+-->
+<html>
+<head>
+</head>
+<body>
+
+Camel <a href="http://activemq.apache.org/camel/xpath.html">XPath</a> language support.
+
+</body>
+</html>
Modified: activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/language/xpath
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/language/xpath?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/language/xpath (original)
+++ activemq/camel/trunk/camel-core/src/main/resources/META-INF/services/org/apache/camel/language/xpath Sat Sep 20 06:08:47 2008
@@ -15,4 +15,4 @@
# limitations under the License.
#
-class=org.apache.camel.builder.xml.XPathLanguage
+class=org.apache.camel.language.xpath.XPathLanguage
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/bean/NewInstanceTest.java Sat Sep 20 06:08:47 2008
@@ -47,7 +47,7 @@
template.sendBody("direct:start", ExchangePattern.InOut, "second");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/CustomDataSetTest.java Sat Sep 20 06:08:47 2008
@@ -52,7 +52,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount((int) dataSet.getSize());
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetConsumeTest.java Sat Sep 20 06:08:47 2008
@@ -32,7 +32,7 @@
template.sendBodyAndHeader("dataset:foo", "<hello>world!</hello>", DataSet.INDEX_HEADER, i);
}
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetSedaTest.java Sat Sep 20 06:08:47 2008
@@ -32,7 +32,7 @@
MockEndpoint endpoint = getMockEndpoint("dataset:foo");
endpoint.expectedMessageCount((int) dataSet.getSize());
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/dataset/DataSetTest.java Sat Sep 20 06:08:47 2008
@@ -32,7 +32,7 @@
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount((int) dataSet.getSize());
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileAlwaysConsumeTest.java Sat Sep 20 06:08:47 2008
@@ -46,7 +46,7 @@
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Thread.sleep(1000);
@@ -62,7 +62,7 @@
file.renameTo(renamed.getAbsoluteFile());
// should consume the file again
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testNotAlwaysConsume() throws Exception {
@@ -77,7 +77,7 @@
mock.expectedBodiesReceived("Hello World");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Thread.sleep(1000);
@@ -93,7 +93,7 @@
// should NOT consume the file again, let 2 secs pass to let the consuemr try to consume it but it should not
Thread.sleep(2000);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
}
\ No newline at end of file
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeFileOnlyTest.java Sat Sep 20 06:08:47 2008
@@ -38,7 +38,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceived("Hello World");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumeSingleDirectoryOnlyTest.java Sat Sep 20 06:08:47 2008
@@ -38,7 +38,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedBodiesReceivedInAnyOrder("Hello World", "Bye World");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileConsumerExpressionTest.java Sat Sep 20 06:08:47 2008
@@ -47,7 +47,7 @@
mock.expectedBodiesReceived("Hello World");
template.sendBodyAndHeader("file://target/filelanguage/", "Hello World", FileComponent.HEADER_FILE_NAME, "report.txt");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// give time for consumer to rename file
Thread.sleep(1000);
@@ -63,7 +63,7 @@
mock.expectedBodiesReceived("Bye World");
template.sendBodyAndHeader("file://target/filelanguage/", "Bye World", FileComponent.HEADER_FILE_NAME, "report2.txt");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// give time for consumer to rename file
Thread.sleep(1000);
@@ -79,7 +79,7 @@
mock.expectedBodiesReceived("Bye Big World");
template.sendBodyAndHeader("file://target/filelanguage/", "Bye Big World", FileComponent.HEADER_FILE_NAME, "report3.txt");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// give time for consumer to rename file
Thread.sleep(1000);
@@ -94,7 +94,7 @@
mock.expectedBodiesReceived("Hello Big World");
template.sendBodyAndHeader("file://target/filelanguage/", "Hello Big World", FileComponent.HEADER_FILE_NAME, "report4.txt");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// give time for consumer to rename file
Thread.sleep(1000);
@@ -110,7 +110,7 @@
template.sendBodyAndHeader("file://target/filelanguage/", "Bean Language Rules The World",
FileComponent.HEADER_FILE_NAME, "report5.txt");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
// give time for consumer to rename file
Thread.sleep(1000);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/FileRouteTest.java Sat Sep 20 06:08:47 2008
@@ -41,7 +41,7 @@
template.sendBodyAndHeader(uri, expectedBody, "cheese", 123);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/file/MoveFilesToDirectoryTest.java Sat Sep 20 06:08:47 2008
@@ -68,7 +68,7 @@
// now lets wait for multiple polls to check we only process it once
Thread.sleep(5000);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void assertFileNotExists(File file) {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/component/timer/TimerFiredTimeTest.java Sat Sep 20 06:08:47 2008
@@ -30,7 +30,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Exchange exchange = mock.getExchanges().get(0);
assertEquals("hello", exchange.getProperty("org.apache.camel.timer.name"));
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/issues/Issue170Test.java Sat Sep 20 06:08:47 2008
@@ -41,7 +41,7 @@
template.sendBodyAndHeader("direct:start", body1, "counter", 1);
template.sendBodyAndHeader("direct:start", body2, "counter", 2);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Added: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java?rev=697361&view=auto
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java (added)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java Sat Sep 20 06:08:47 2008
@@ -0,0 +1,47 @@
+/**
+ * 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.language;
+
+import org.apache.camel.ContextTestSupport;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
+
+/**
+ * Unit test routing with simple language.
+ */
+public class SimpleLanguageRouteTest extends ContextTestSupport {
+
+ public void testSimpleFilter() throws Exception {
+ MockEndpoint mock = getMockEndpoint("mock:foo");
+ mock.expectedBodiesReceived("Hello Foo");
+
+ template.sendBody("seda:foo", "Hello Bar");
+ template.sendBodyAndHeader("seda:foo", "Hello Foo", "foo", "yes");
+
+ assertMockEndpointsSatisfied();
+ }
+
+ @Override
+ protected RouteBuilder createRouteBuilder() throws Exception {
+ return new RouteBuilder() {
+ public void configure() throws Exception {
+ from("seda:foo")
+ .filter().simple("in.header.foo").to("mock:foo");
+ }
+ };
+ }
+}
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/SimpleLanguageRouteTest.java
------------------------------------------------------------------------------
svn:keywords = Rev Date
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/language/XPathTest.java Sat Sep 20 06:08:47 2008
@@ -19,7 +19,7 @@
import javax.xml.xpath.XPathConstants;
import org.apache.camel.LanguageTestSupport;
-import org.apache.camel.builder.xml.XPathLanguage;
+import org.apache.camel.language.xpath.XPathLanguage;
import org.apache.camel.spi.Language;
/**
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/management/CamelChoiceWithManagementTest.java Sat Sep 20 06:08:47 2008
@@ -72,7 +72,7 @@
}
});
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@@ -88,7 +88,7 @@
}
});
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
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=697361&r1=697360&r2=697361&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 Sat Sep 20 06:08:47 2008
@@ -42,7 +42,7 @@
sendBody("direct:start", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testLotsOfAttemptsFail() throws Exception {
@@ -54,7 +54,7 @@
sendBody("direct:start", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
Throwable t = deadEndpoint.getExchanges().get(0).getProperty(DeadLetterChannel.EXCEPTION_CAUSE_PROPERTY, Throwable.class);
assertNotNull("Should have been a cause property", t);
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/InterceptRouteTestSupport.java Sat Sep 20 06:08:47 2008
@@ -29,13 +29,13 @@
public void testSendMatchingMessage() throws Exception {
prepareMatchingTest();
template.sendBodyAndHeader("direct:start", "<matched/>", "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNonMatchingMessage() throws Exception {
prepareNonMatchingTest();
template.sendBodyAndHeader("direct:start", "<notMatched/>", "foo", "notMatchedHeaderValue");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/LoadBalanceTest.java Sat Sep 20 06:08:47 2008
@@ -52,19 +52,19 @@
x.expectedBodiesReceived(body);
expectsMessageCount(0, y, z);
sendMessage("bar", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
body = "<two/>";
y.expectedBodiesReceived(body);
expectsMessageCount(0, x, z);
sendMessage("bar", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
body = "<three/>";
z.expectedBodiesReceived(body);
expectsMessageCount(0, x, y);
sendMessage("bar", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MethodFilterTest.java Sat Sep 20 06:08:47 2008
@@ -33,7 +33,7 @@
template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, body, "foo", "London");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -42,7 +42,7 @@
template.sendBodyAndHeader("direct:start", ExchangePattern.InOut, body, "foo", "Tampa");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MultiCastAggregatorTest.java Sat Sep 20 06:08:47 2008
@@ -61,7 +61,7 @@
assertNotNull("We should get result here", exchange);
assertEquals("Can't get the right result", "inputx+inputy+inputz", exchange.getOut().getBody(String.class));
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/MulticastStreamCachingTest.java Sat Sep 20 06:08:47 2008
@@ -50,7 +50,7 @@
}
});
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
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=697361&r1=697360&r2=697361&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 Sat Sep 20 06:08:47 2008
@@ -46,7 +46,7 @@
}
});
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
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=697361&r1=697360&r2=697361&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 Sat Sep 20 06:08:47 2008
@@ -36,7 +36,7 @@
sendBody();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendBody() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithArrayHeaderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithArrayHeaderTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithArrayHeaderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/RecipientListWithArrayHeaderTest.java Sat Sep 20 06:08:47 2008
@@ -36,7 +36,7 @@
sendBody();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendBody() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderTest.java Sat Sep 20 06:08:47 2008
@@ -36,7 +36,7 @@
sendBody("direct:start", matchingBody);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> list = resultEndpoint.getReceivedExchanges();
Exchange exchange = list.get(0);
Object value = exchange.getIn().getHeader("foo");
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/SetHeaderUsingDslExpressionsTest.java Sat Sep 20 06:08:47 2008
@@ -39,7 +39,7 @@
template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUseConstantParameter() throws Exception {
@@ -53,7 +53,7 @@
template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUseExpression() throws Exception {
@@ -69,7 +69,7 @@
template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUseHeaderExpression() throws Exception {
@@ -83,7 +83,7 @@
template.sendBodyAndHeader("direct:start", body, "bar", "ABC");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUseBodyExpression() throws Exception {
@@ -97,7 +97,7 @@
template.sendBody("direct:start", "ABC");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUseBodyAsTypeExpression() throws Exception {
@@ -111,7 +111,7 @@
template.sendBody("direct:start", "ABC".getBytes());
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorWithHeaderTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorWithHeaderTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorWithHeaderTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/TransformProcessorWithHeaderTest.java Sat Sep 20 06:08:47 2008
@@ -34,7 +34,7 @@
template.sendBodyAndHeader("direct:in",
"<person name='James' city='London'/>", "foo", "bar");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/XPathChoiceTest.java Sat Sep 20 06:08:47 2008
@@ -36,7 +36,7 @@
sendMessage("bar", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendToSecondWhen() throws Exception {
@@ -46,7 +46,7 @@
sendMessage("cheese", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendToOtherwiseClause() throws Exception {
@@ -56,7 +56,7 @@
sendMessage("somethingUndefined", body);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendMessage(final Object headerValue, final Object body) throws Exception {
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=697361&r1=697360&r2=697361&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 Sat Sep 20 06:08:47 2008
@@ -31,7 +31,7 @@
sendBody("direct:start", matchingBody);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testSendNotMatchingMessage() throws Exception {
@@ -39,7 +39,7 @@
sendBody("direct:start", notMatchingBody);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected RouteBuilder createRouteBuilder() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/aggregator/AlbertoAggregatorTest.java Sat Sep 20 06:08:47 2008
@@ -68,7 +68,7 @@
ProducerTemplate template = context.createProducerTemplate();
template.sendBody("direct:start", allNames);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
@Override
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/interceptor/StreamCachingInterceptorTest.java Sat Sep 20 06:08:47 2008
@@ -43,7 +43,7 @@
StreamSource message = new StreamSource(new StringReader("<hello>world!</hello>"));
template.sendBody("direct:a", message);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertTrue(a.assertExchangeReceived(0).getIn().getBody() instanceof StreamCache);
}
@@ -53,7 +53,7 @@
StreamSource message = new StreamSource(new StringReader("<hello>world!</hello>"));
template.sendBody("direct:b", message);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertTrue(b.assertExchangeReceived(0).getIn().getBody() instanceof StreamCache);
assertEquals(b.assertExchangeReceived(0).getIn().getBody(String.class), "<hello>world!</hello>");
}
@@ -64,7 +64,7 @@
InputStream message = new ByteArrayInputStream("<hello>world!</hello>".getBytes());
template.sendBody("direct:a", message);
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertTrue(a.assertExchangeReceived(0).getIn().getBody() instanceof StreamCache);
assertEquals(a.assertExchangeReceived(0).getIn().getBody(String.class), "<hello>world!</hello>");
}
@@ -74,7 +74,7 @@
template.sendBody("direct:a", "<hello>world!</hello>");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
assertTrue(a.assertExchangeReceived(0).getIn().getBody() instanceof String);
}
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipDataModificationTest.java Sat Sep 20 06:08:47 2008
@@ -46,7 +46,7 @@
sendBody();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendBody() {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipTest.java Sat Sep 20 06:08:47 2008
@@ -39,7 +39,7 @@
sendBody("direct:a", ROUTING_SLIP_HEADER, ",");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUpdatingOfRoutingSlipHeaderSet() throws Exception {
@@ -55,7 +55,7 @@
sendBody("direct:b", "aRoutingSlipHeader", ",");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testUpdatingOfRoutingSlipHeaderAndDelimiterSet() throws Exception {
@@ -71,7 +71,7 @@
sendBody("direct:c", "aRoutingSlipHeader", "#");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testMessagePassingThrough() throws Exception {
@@ -80,7 +80,7 @@
sendBody("direct:a", ROUTING_SLIP_HEADER, ",");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testEmptyRoutingSlip() throws Exception {
@@ -89,7 +89,7 @@
sendBodyWithEmptyRoutingSlip();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
public void testNoRoutingSlip() throws Exception {
@@ -98,7 +98,7 @@
sendBodyWithNoRoutingSlip();
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
}
protected void sendBody(String endpoint, String header, String delimiter) {
Modified: activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithNonStandardExchangeTest.java
URL: http://svn.apache.org/viewvc/activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithNonStandardExchangeTest.java?rev=697361&r1=697360&r2=697361&view=diff
==============================================================================
--- activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithNonStandardExchangeTest.java (original)
+++ activemq/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/routingslip/RoutingSlipWithNonStandardExchangeTest.java Sat Sep 20 06:08:47 2008
@@ -37,7 +37,7 @@
sendBody("direct:a", ROUTING_SLIP_HEADER, ",");
- assertMockEndpointsSatisifed();
+ assertMockEndpointsSatisfied();
List<Exchange> exchanges = end.getExchanges();
Exchange exchange = exchanges.get(0);