diff --git a/org.springframework.integration.xml/.classpath b/org.springframework.integration.xml/.classpath index 353a778842..99f677533e 100644 --- a/org.springframework.integration.xml/.classpath +++ b/org.springframework.integration.xml/.classpath @@ -13,5 +13,6 @@ + diff --git a/org.springframework.integration.xml/ivy.xml b/org.springframework.integration.xml/ivy.xml index 2609eb2f9c..681c84f550 100644 --- a/org.springframework.integration.xml/ivy.xml +++ b/org.springframework.integration.xml/ivy.xml @@ -21,6 +21,7 @@ + diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java index d0a44debaa..505e2c0220 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/DomSourceFactoryTests.java @@ -16,7 +16,7 @@ package org.springframework.integration.xml.source; -import static org.junit.Assert.*; +import static org.custommonkey.xmlunit.XMLAssert.*; import java.io.StringReader; @@ -57,7 +57,7 @@ public class DomSourceFactoryTests { Source source = sourceFactory.createSource(doc); assertNotNull("Returned source was null", source); assertEquals("Expected DOMSource", DOMSource.class, source.getClass()); - assertEquals("Wrong content in source ", docContent, getAsString(source)); + assertXMLEqual("Wrong content in source ", docContent, getAsString(source)); } @Test @@ -65,7 +65,7 @@ public class DomSourceFactoryTests { Source source = sourceFactory.createSource(docContent); assertNotNull("Returned source was null", source); assertEquals("Expected DOMSource", DOMSource.class, source.getClass()); - assertEquals("Wrong content in source ", docContent, getAsString(source)); + assertXMLEqual("Wrong content in source ", docContent, getAsString(source)); } @Test(expected = MessagingException.class) diff --git a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java index 9f01df6614..ebdb8e8846 100644 --- a/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java +++ b/org.springframework.integration.xml/src/test/java/org/springframework/integration/xml/source/StringSourceTests.java @@ -16,6 +16,7 @@ package org.springframework.integration.xml.source; import static org.junit.Assert.*; +import static org.custommonkey.xmlunit.XMLAssert.*; import java.io.BufferedReader; @@ -42,7 +43,7 @@ public class StringSourceTests { StringSource source = (StringSource)sourceFactory.createSource(doc); BufferedReader reader = new BufferedReader(source.getReader()); String docAsString =reader.readLine(); - assertEquals("Wrong content in StringSource","one", docAsString); + assertXMLEqual("Wrong content in StringSource","one", docAsString); } @@ -52,7 +53,7 @@ public class StringSourceTests { StringSource source = (StringSource)sourceFactory.createSource(docString); BufferedReader reader = new BufferedReader(source.getReader()); String docAsString =reader.readLine(); - assertEquals("Wrong content in StringSource","one", docAsString); + assertXMLEqual("Wrong content in StringSource","one", docAsString); } @@ -63,7 +64,7 @@ public class StringSourceTests { StringSource source = (StringSource)sourceFactory.createSource(buffer); BufferedReader reader = new BufferedReader(source.getReader()); String docAsString =reader.readLine(); - assertEquals("Wrong content in StringSource","one", docAsString); + assertXMLEqual("Wrong content in StringSource","one", docAsString); } }