Author: davsclaus
Date: Sun May 31 07:55:15 2009
New Revision: 780379
URL: http://svn.apache.org/viewvc?rev=780379&view=rev
Log:
Fixed bug with outBody() in assertion clause. Renamed bodyAs() to body() to be
aligned like the other.
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
camel/trunk/components/camel-hl7/pom.xml
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
Modified:
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
(original)
+++
camel/trunk/camel-core/src/main/java/org/apache/camel/component/mock/AssertionClause.java
Sun May 31 07:55:15 2009
@@ -16,7 +16,6 @@
*/
package org.apache.camel.component.mock;
-
import java.util.ArrayList;
import java.util.List;
@@ -26,9 +25,7 @@
import org.apache.camel.builder.ExpressionClause;
import org.apache.camel.builder.ValueBuilder;
import org.apache.camel.util.PredicateAssertHelper;
-import static org.apache.camel.builder.ExpressionBuilder.bodyExpression;
-import static org.apache.camel.builder.ExpressionBuilder.headerExpression;
-import static org.apache.camel.builder.ExpressionBuilder.propertyExpression;
+import static org.apache.camel.builder.ExpressionBuilder.*;
/**
* A builder of assertions on message exchanges
@@ -84,7 +81,7 @@
* Returns a predicate and value builder for the inbound message body as a
* specific type
*/
- public <T> PredicateValueBuilder bodyAs(Class<T> type) {
+ public <T> PredicateValueBuilder body(Class<T> type) {
Expression expression = bodyExpression(type);
return new PredicateValueBuilder(expression);
}
@@ -94,7 +91,7 @@
* exchange
*/
public PredicateValueBuilder outBody() {
- Expression expression = bodyExpression();
+ Expression expression = outBodyExpression();
return new PredicateValueBuilder(expression);
}
@@ -103,7 +100,7 @@
* specific type
*/
public <T> PredicateValueBuilder outBody(Class<T> type) {
- Expression expression = bodyExpression(type);
+ Expression expression = outBodyExpression(type);
return new PredicateValueBuilder(expression);
}
Modified:
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
(original)
+++
camel/trunk/camel-core/src/test/java/org/apache/camel/processor/DeadLetterChannelUseOriginalInBodyWithFileTest.java
Sun May 31 07:55:15 2009
@@ -32,7 +32,7 @@
MockEndpoint dead = getMockEndpoint("mock:dead");
dead.expectedMessageCount(1);
dead.message(0).body().isInstanceOf(GenericFile.class);
- dead.message(0).bodyAs(String.class).isEqualTo("Hello");
+ dead.message(0).body(String.class).isEqualTo("Hello");
template.sendBodyAndHeader("file://target/originalexchange", "Hello",
Exchange.FILE_NAME, "hello.txt");
Modified: camel/trunk/components/camel-hl7/pom.xml
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/pom.xml?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
--- camel/trunk/components/camel-hl7/pom.xml (original)
+++ camel/trunk/components/camel-hl7/pom.xml Sun May 31 07:55:15 2009
@@ -34,7 +34,7 @@
<description>Camel HL7 support</description>
<properties>
-
<camel.osgi.export.pkg>org.apache.camel.component.hl7.*;org.apache.camel.dataformat.hl7.*</camel.osgi.export.pkg>
+
<camel.osgi.export.pkg>org.apache.camel.component.hl7.*</camel.osgi.export.pkg>
</properties>
<repositories>
Modified:
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
(original)
+++
camel/trunk/components/camel-hl7/src/test/java/org/apache/camel/component/hl7/HL7DataFormatTest.java
Sun May 31 07:55:15 2009
@@ -34,8 +34,8 @@
MockEndpoint mock = getMockEndpoint("mock:marshal");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(byte[].class);
- mock.message(0).bodyAs(String.class).contains("MSA|AA|123");
- mock.message(0).bodyAs(String.class).contains("QRD|20080805120000");
+ mock.message(0).body(String.class).contains("MSA|AA|123");
+ mock.message(0).body(String.class).contains("QRD|20080805120000");
Message message = createHL7AsMessage();
template.sendBody("direct:marshal", message);
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/FileRouteToJmsTest.java
Sun May 31 07:55:15 2009
@@ -38,7 +38,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(byte[].class);
- mock.message(0).bodyAs(String.class).isEqualTo("Hello World");
+ mock.message(0).body(String.class).isEqualTo("Hello World");
deleteDirectory("target/routefromfile");
template.sendBodyAndHeader("file://target/routefromfile", "Hello
World", Exchange.FILE_NAME, "hello.txt");
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/JmsXMLRouteTest.java
Sun May 31 07:55:15 2009
@@ -44,7 +44,7 @@
public void testLondonWithFileStreamAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StreamSource(new FileInputStream(TEST_LONDON));
assertNotNull(source);
@@ -57,7 +57,7 @@
public void testLondonWithFileStreamAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StreamSource(new FileInputStream(TEST_LONDON));
assertNotNull(source);
@@ -70,7 +70,7 @@
public void testLondonWithFileStreamAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StreamSource(new FileInputStream(TEST_LONDON));
assertNotNull(source);
@@ -83,7 +83,7 @@
public void testTampaWithFileStreamAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("Hiram");
+ mock.message(0).body(String.class).contains("Hiram");
Source source = new StreamSource(new FileInputStream(TEST_TAMPA));
assertNotNull(source);
@@ -96,7 +96,7 @@
public void testTampaWithFileStreamAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("Hiram");
+ mock.message(0).body(String.class).contains("Hiram");
Source source = new StreamSource(new FileInputStream(TEST_TAMPA));
assertNotNull(source);
@@ -109,7 +109,7 @@
public void testTampaWithFileStreamAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:tampa");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("Hiram");
+ mock.message(0).body(String.class).contains("Hiram");
Source source = new StreamSource(new FileInputStream(TEST_TAMPA));
assertNotNull(source);
@@ -122,7 +122,7 @@
public void testLondonWithStringSourceAsObject() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StringSource("<person user=\"james\">\n"
+ " <firstName>James</firstName>\n"
@@ -139,7 +139,7 @@
public void testLondonWithStringSourceAsBytes() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StringSource("<person user=\"james\">\n"
+ " <firstName>James</firstName>\n"
@@ -156,7 +156,7 @@
public void testLondonWithStringSourceAsDefault() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:london");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains("James");
+ mock.message(0).body(String.class).contains("James");
Source source = new StringSource("<person user=\"james\">\n"
+ " <firstName>James</firstName>\n"
Modified:
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
(original)
+++
camel/trunk/components/camel-jms/src/test/java/org/apache/camel/component/jms/PayloadByteArrayJmsTest.java
Sun May 31 07:55:15 2009
@@ -45,7 +45,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(byte[].class);
- mock.message(0).bodyAs(String.class).isEqualTo("Hello World");
+ mock.message(0).body(String.class).isEqualTo("Hello World");
Reader body = new StringReader("Hello World");
@@ -58,7 +58,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(byte[].class);
- mock.message(0).bodyAs(String.class).isEqualTo("Hello World");
+ mock.message(0).body(String.class).isEqualTo("Hello World");
InputStream body = new ByteArrayInputStream("Hello World".getBytes());
@@ -71,7 +71,7 @@
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(byte[].class);
- mock.message(0).bodyAs(String.class).isEqualTo("Hello World");
+ mock.message(0).body(String.class).isEqualTo("Hello World");
ByteBuffer body = ByteBuffer.wrap("Hello World".getBytes());
Modified:
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java?rev=780379&r1=780378&r2=780379&view=diff
==============================================================================
---
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
(original)
+++
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
Sun May 31 07:55:15 2009
@@ -35,7 +35,7 @@
public void testMarshalling() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:marshal");
mock.expectedMessageCount(1);
- mock.message(0).bodyAs(String.class).contains(feedXml);
+ mock.message(0).body(String.class).contains(feedXml);
mock.assertIsSatisfied();
}
@@ -43,7 +43,7 @@
MockEndpoint mock = getMockEndpoint("mock:unmarshal");
mock.expectedMessageCount(1);
mock.message(0).body().isInstanceOf(SyndFeed.class);
- mock.message(0).bodyAs(SyndFeed.class).equals(feed);
+ mock.message(0).body(SyndFeed.class).equals(feed);
mock.assertIsSatisfied();
}
