SWS-993 Use 'similar' assertions when namespace not critical

Author: gregturn

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/AbstractWsAddressingTestCase.java

@@ -23,13 +23,14 @@
 import javax.xml.soap.SOAPConstants;
 import javax.xml.soap.SOAPException;
 
-import org.springframework.ws.soap.saaj.SaajSoapMessage;
-
 import org.custommonkey.xmlunit.XMLUnit;
 import org.junit.Before;
 import org.w3c.dom.Document;
 
-import static org.junit.Assert.assertNotNull;
+import org.springframework.ws.soap.saaj.SaajSoapMessage;
+
+import static org.custommonkey.xmlunit.XMLUnit.compareXML;
+import static org.junit.Assert.*;
 
 public abstract class AbstractWsAddressingTestCase {
 
@@ -60,4 +61,10 @@ protected void assertXMLEqual(String message, SaajSoapMessage expected, SaajSoap
 		Document resultDocument = result.getSaajMessage().getSOAPPart();
 		org.custommonkey.xmlunit.XMLAssert.assertXMLEqual(message, expectedDocument, resultDocument);
 	}
+
+	protected void assertXMLSimilar(String message, SaajSoapMessage expected, SaajSoapMessage result) {
+		Document expectedDocument = expected.getSaajMessage().getSOAPPart();
+		Document resultDocument = result.getSaajMessage().getSOAPPart();
+		org.custommonkey.xmlunit.XMLAssert.assertXMLEqual(compareXML(expectedDocument, resultDocument), false);
+	}
 }

spring-ws-core/src/test/java/org/springframework/ws/soap/addressing/client/AbstractActionCallbackTestCase.java

@@ -17,13 +17,18 @@
 package org.springframework.ws.soap.addressing.client;
 
 import java.net.URI;
+import java.util.Iterator;
 import javax.xml.namespace.QName;
 import javax.xml.soap.SOAPBody;
 import javax.xml.soap.SOAPBodyElement;
 import javax.xml.soap.SOAPElement;
 import javax.xml.soap.SOAPException;
 import javax.xml.soap.SOAPMessage;
 
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
 import org.springframework.ws.soap.addressing.AbstractWsAddressingTestCase;
 import org.springframework.ws.soap.addressing.core.EndpointReference;
 import org.springframework.ws.soap.addressing.messageid.MessageIdStrategy;
@@ -34,10 +39,6 @@
 import org.springframework.ws.transport.context.TransportContext;
 import org.springframework.ws.transport.context.TransportContextHolder;
 
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
 import static org.easymock.EasyMock.*;
 
 public abstract class AbstractActionCallbackTestCase extends AbstractWsAddressingTestCase {
@@ -78,7 +79,8 @@ public void testValid() throws Exception {
 		callback.doWithMessage(message);
 
 		SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml");
-		assertXMLEqual("Invalid message", expected, message);
+//		assertXMLEqual("Invalid message", expected, message);
+		assertXMLSimilar("Invalid message", expected, message);
 
 		verify(strategyMock, connectionMock);
 	}
@@ -100,13 +102,16 @@ public void testDefaults() throws Exception {
 		callback.doWithMessage(message);
 
 		SaajSoapMessage expected = loadSaajMessage(getTestPath() + "/valid.xml");
-		assertXMLEqual("Invalid message", expected, message);
+		assertXMLSimilar("Invalid message", expected, message);
 		verify(strategyMock, connectionMock);
 	}
 
 	private SaajSoapMessage createDeleteMessage() throws SOAPException {
 		SOAPMessage saajMessage = messageFactory.createMessage();
 		SOAPBody saajBody = saajMessage.getSOAPBody();
+		for (Iterator<?> iterator = saajBody.getNamespacePrefixes(); iterator.hasNext(); ) {
+			System.out.println(iterator.next());
+		}
 		SOAPBodyElement delete = saajBody.addBodyElement(new QName("http://example.com/fabrikam", "Delete"));
 		SOAPElement maxCount = delete.addChildElement(new QName("maxCount"));
 		maxCount.setTextContent("42");