[jboss-svn-commits] JBL Code SVN: r12388 - labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui.

[jboss-svn-commits at lists.jboss.org]

Author: kevin.conner at jboss.com
Date: 2007-06-07 15:27:31 -0400 (Thu, 07 Jun 2007)
New Revision: 12388

Modified:
   labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
Log:
Changed XML comparison in test case

Modified: labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java
===================================================================
--- labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2007-06-07 17:33:19 UTC (rev 12387)
+++ labs/jbossesb/trunk/product/services/soapui-client/src/test/java/org/jboss/soa/esb/services/soapui/SoapUIClientServiceMBeanUnitTest.java	2007-06-07 19:27:31 UTC (rev 12388)
@@ -28,6 +28,11 @@
 import java.util.ArrayList;
 import java.math.BigDecimal;
 
+import javax.xml.transform.stream.StreamResult;
+
+import org.jboss.soa.esb.ConfigurationException;
+import org.jboss.soa.esb.dom.YADOMUtil;
+import org.w3c.dom.Document;
 import org.xml.sax.SAXException;
 
 /**
@@ -118,15 +123,24 @@
 
     // Lifted from milyn commons
     public static boolean compareCharStreams(InputStream s1, InputStream s2) {
-        StringBuffer s1Buf, s2Buf;
-
         try {
-            s1Buf = trimLines(s1);
-            s2Buf = trimLines(s2);
-
-            return s1Buf.toString().equals(s2Buf.toString());
+            final String xml1 = trimLines(s1).toString() ;
+            final String xml2 = trimLines(s2).toString() ;
+            
+            final Document doc1 = YADOMUtil.parse(xml1) ;
+            final Document doc2 = YADOMUtil.parse(xml2) ;
+            
+            final StringWriter writer1 = new StringWriter() ;
+            final StringWriter writer2 = new StringWriter() ;
+            YADOMUtil.serialize(doc1, new StreamResult(writer1)) ;
+            YADOMUtil.serialize(doc2, new StreamResult(writer2)) ;
+            return (writer1.toString().equals(writer2.toString())) ;
         } catch (IOException e) {
             // fail the comparison
+        } catch (SAXException e) {
+            // fail the comparison
+        } catch (ConfigurationException e) {
+            // fail the comparison
         }
 
         return false;
@@ -142,4 +156,12 @@
 
         return stringBuf;
     }
+    
+    public static void main(final String[] args)
+    {
+        final InputStream expectedIS = SoapUIClientServiceMBeanUnitTest.class.getResourceAsStream("expected_02.xml") ;
+        final InputStream outputIS = SoapUIClientServiceMBeanUnitTest.class.getResourceAsStream("output.xml") ;
+        
+        System.out.println("compare returns: " + compareCharStreams(expectedIS, outputIS));
+    }
 }