Author: ningjiang
Date: Sat Sep 25 11:54:51 2010
New Revision: 1001198
URL: http://svn.apache.org/viewvc?rev=1001198&view=rev
Log:
Clean up the SpringMarshalOmitFieldsTest and XStreamDataFormatOmitFieldsTest
Modified:
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
Modified:
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java?rev=1001198&r1=1001197&r2=1001198&view=diff
==============================================================================
---
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java
(original)
+++
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.java
Sat Sep 25 11:54:51 2010
@@ -16,7 +16,10 @@
*/
package org.apache.camel.dataformat.xstream;
+import org.apache.camel.CamelContext;
+import org.apache.camel.Service;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.spring.SpringCamelContext;
import org.apache.camel.test.junit4.CamelSpringTestSupport;
import org.junit.Test;
import org.springframework.context.support.AbstractXmlApplicationContext;
@@ -25,31 +28,25 @@ import org.springframework.context.suppo
/**
* @version $Revision$
*/
-public class SpringMarshalOmitFieldsTest extends CamelSpringTestSupport {
+public class SpringMarshalOmitFieldsTest extends
XStreamDataFormatOmitFieldsTest {
- @Override
- protected AbstractXmlApplicationContext createApplicationContext() {
- return new
ClassPathXmlApplicationContext("org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.xml");
- }
+ protected CamelContext createCamelContext() throws Exception {
+ setUseRouteBuilder(false);
- @Test
- public void testOmitPrice() throws InterruptedException {
- MockEndpoint mock = getMockEndpoint("mock:result");
- mock.expectedMessageCount(1);
-
- PurchaseOrder purchaseOrder = new PurchaseOrder();
- purchaseOrder.setName("foo");
- purchaseOrder.setPrice(49);
- purchaseOrder.setAmount(3);
-
- template.sendBody("direct:start", purchaseOrder);
-
- assertMockEndpointsSatisfied();
-
- String body =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
- assertTrue("Should contain name field", body.contains("<name>"));
- assertFalse("Should not contain price field", body.contains("price"));
- assertTrue("Should contain amount field", body.contains("<amount>"));
- }
+ final AbstractXmlApplicationContext applicationContext = new
ClassPathXmlApplicationContext(
+
"org/apache/camel/dataformat/xstream/SpringMarshalOmitFieldsTest.xml");
+
+ setCamelContextService(new Service() {
+ public void start() throws Exception {
+ applicationContext.start();
+ }
+ public void stop() throws Exception {
+ applicationContext.stop();
+ }
+ });
+
+ return SpringCamelContext.springCamelContext(applicationContext);
+ }
+
}
Modified:
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java?rev=1001198&r1=1001197&r2=1001198&view=diff
==============================================================================
---
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
(original)
+++
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatDriverConfigTest.java
Sat Sep 25 11:54:51 2010
@@ -37,5 +37,8 @@ public class XStreamDataFormatDriverConf
assertEquals("{", marshalledOrder.substring(0, 1));
}
+
+
+
}
Modified:
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java?rev=1001198&r1=1001197&r2=1001198&view=diff
==============================================================================
---
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
(original)
+++
camel/trunk/components/camel-xstream/src/test/java/org/apache/camel/dataformat/xstream/XStreamDataFormatOmitFieldsTest.java
Sat Sep 25 11:54:51 2010
@@ -20,6 +20,10 @@ import java.util.HashMap;
import java.util.Map;
import com.thoughtworks.xstream.XStream;
+import org.apache.camel.Exchange;
+import org.apache.camel.Processor;
+import org.apache.camel.builder.RouteBuilder;
+import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultClassResolver;
import org.apache.camel.test.junit4.CamelTestSupport;
import org.junit.Test;
@@ -30,20 +34,41 @@ import org.junit.Test;
public class XStreamDataFormatOmitFieldsTest extends CamelTestSupport {
@Test
- public void testOmitPrice() {
+ public void testOmitPrice() throws InterruptedException {
+ MockEndpoint mock = getMockEndpoint("mock:result");
+ mock.expectedMessageCount(1);
+
PurchaseOrder purchaseOrder = new PurchaseOrder();
purchaseOrder.setName("foo");
- purchaseOrder.setPrice(1);
+ purchaseOrder.setPrice(49);
+ purchaseOrder.setAmount(3);
+
+ template.sendBody("direct:start", purchaseOrder);
- XStreamDataFormat xStreamDataFormat = new XStreamDataFormat();
- Map<String, String[]> omitFields = new HashMap<String, String[]>();
- omitFields.put(PurchaseOrder.class.getName(), new String[]{"price"});
- xStreamDataFormat.setOmitFields(omitFields);
+ assertMockEndpointsSatisfied();
- XStream xStream = xStreamDataFormat.createXStream(new
DefaultClassResolver());
- String marshalledOrder = xStream.toXML(purchaseOrder);
+ String body =
mock.getReceivedExchanges().get(0).getIn().getBody(String.class);
+ assertTrue("Should contain name field", body.contains("<name>"));
+ assertFalse("Should not contain price field", body.contains("price"));
+ assertTrue("Should contain amount field", body.contains("<amount>"));
+ }
+
- assertTrue(!marshalledOrder.contains("<price>"));
+ protected RouteBuilder createRouteBuilder() {
+ return new RouteBuilder() {
+ public void configure() {
+ XStreamDataFormat xStreamDataFormat = new XStreamDataFormat();
+ Map<String, String[]> omitFields = new HashMap<String,
String[]>();
+ omitFields.put(PurchaseOrder.class.getName(), new
String[]{"price"});
+ xStreamDataFormat.setOmitFields(omitFields);
+
+ from("direct:start").
+ marshal(xStreamDataFormat).
+ convertBodyTo(String.class).
+ to("mock:result");
+ }
+ };
}
+
}
