From 13356b2d96f33336fdba4bf4eeb635cc87d43750 Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 21 Jul 2010 19:04:28 +0000 Subject: [PATCH] INT-896, Fixed the test to cover that it actually works --- .../xml/config/MarshallingTransformerParserTests.java | 4 ++-- .../integration/xml/config/StubMarshaller.java | 9 +++++++-- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java index 8915e3a6ba..73d2f7dca8 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/MarshallingTransformerParserTests.java @@ -37,6 +37,7 @@ import org.springframework.xml.transform.StringResult; /** * @author Jonas Partner * @author Mark Fisher + * @author Oleg Zhurakousky */ public class MarshallingTransformerParserTests { @@ -111,8 +112,7 @@ public class MarshallingTransformerParserTests { Message result = output.receive(0); assertTrue("Wrong payload type", result.getPayload() instanceof DOMResult); Document doc = (Document) ((DOMResult) result.getPayload()).getNode(); - String expected = "[Payload=hello][Headers="; - assertEquals("Wrong payload", expected, doc.getDocumentElement().getTextContent().substring(0, expected.length())); + assertEquals("Wrong payload", "hello", doc.getDocumentElement().getTextContent()); } } diff --git a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubMarshaller.java b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubMarshaller.java index 580a812c0d..6a986b439c 100644 --- a/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubMarshaller.java +++ b/spring-integration-xml/src/test/java/org/springframework/integration/xml/config/StubMarshaller.java @@ -22,6 +22,7 @@ import javax.xml.transform.Result; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; +import org.springframework.integration.core.Message; import org.springframework.oxm.Marshaller; import org.springframework.oxm.XmlMappingException; import org.springframework.xml.transform.StringSource; @@ -29,12 +30,16 @@ import org.springframework.xml.transform.StringSource; /** * * @author Jonas Partner - * + * @author Oleg Zhurakousky */ public class StubMarshaller implements Marshaller { - public void marshal(Object graph, Result result) throws XmlMappingException, IOException { + public void marshal(Object source, Result result) throws XmlMappingException, IOException { try { + Object graph = source; + if (source instanceof Message) { + graph = ((Message)source).getPayload(); + } Transformer transformer = TransformerFactory.newInstance().newTransformer(); StringSource stringSource = new StringSource("" + graph.toString() + ""); transformer.transform(stringSource, result);