From ccec33dc572e6d867981af25fb07917907d5234a Mon Sep 17 00:00:00 2001 From: Oleg Zhurakousky Date: Wed, 21 Jul 2010 19:31:03 +0000 Subject: [PATCH] =?UTF-8?q?INT-896,=20Reverted=20the=20changes=20as=20they?= =?UTF-8?q?=20were=20unnecessary=20at=20the=20end=C2=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../xml/config/MarshallingTransformerParserTests.java | 4 ++-- .../integration/xml/config/StubMarshaller.java | 9 ++------- 2 files changed, 4 insertions(+), 9 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 73d2f7dca8..8915e3a6ba 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,7 +37,6 @@ import org.springframework.xml.transform.StringResult; /** * @author Jonas Partner * @author Mark Fisher - * @author Oleg Zhurakousky */ public class MarshallingTransformerParserTests { @@ -112,7 +111,8 @@ public class MarshallingTransformerParserTests { Message result = output.receive(0); assertTrue("Wrong payload type", result.getPayload() instanceof DOMResult); Document doc = (Document) ((DOMResult) result.getPayload()).getNode(); - assertEquals("Wrong payload", "hello", doc.getDocumentElement().getTextContent()); + String expected = "[Payload=hello][Headers="; + assertEquals("Wrong payload", expected, doc.getDocumentElement().getTextContent().substring(0, expected.length())); } } 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 6a986b439c..580a812c0d 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,7 +22,6 @@ 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; @@ -30,16 +29,12 @@ import org.springframework.xml.transform.StringSource; /** * * @author Jonas Partner - * @author Oleg Zhurakousky + * */ public class StubMarshaller implements Marshaller { - public void marshal(Object source, Result result) throws XmlMappingException, IOException { + public void marshal(Object graph, 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);