[jboss-cvs] JBossAS SVN: r75464 - trunk/testsuite/src/main/org/jboss/test/jca/test.

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

Author: jeff.zhang
Date: 2008-07-07 23:06:34 -0400 (Mon, 07 Jul 2008)
New Revision: 75464

Modified:
   trunk/testsuite/src/main/org/jboss/test/jca/test/StatisticsFormatterUnitTestCase.java
Log:
[JBAS-5690] fix org.jboss.test.jca.test.StatisticsFormatterUnitTestCase.testXmlFormatterStatistics test on JDK6

Modified: trunk/testsuite/src/main/org/jboss/test/jca/test/StatisticsFormatterUnitTestCase.java
===================================================================
--- trunk/testsuite/src/main/org/jboss/test/jca/test/StatisticsFormatterUnitTestCase.java	2008-07-08 02:46:38 UTC (rev 75463)
+++ trunk/testsuite/src/main/org/jboss/test/jca/test/StatisticsFormatterUnitTestCase.java	2008-07-08 03:06:34 UTC (rev 75464)
@@ -23,6 +23,7 @@
 
 import java.io.Serializable;
 import java.io.StringReader;
+import java.io.StringWriter;
 import java.net.URL;
 import java.sql.Connection;
 
@@ -30,7 +31,12 @@
 import javax.management.ObjectName;
 import javax.naming.InitialContext;
 import javax.sql.DataSource;
+import javax.xml.parsers.DocumentBuilder;
 import javax.xml.parsers.DocumentBuilderFactory;
+import javax.xml.transform.Transformer;
+import javax.xml.transform.TransformerFactory;
+import javax.xml.transform.dom.DOMSource;
+import javax.xml.transform.stream.StreamResult;
 
 import junit.framework.Test;
 
@@ -135,17 +141,33 @@
       assertTrue(formattedStats instanceof String);
       
       String xml = (String)formattedStats;
+     
+      DocumentBuilder builder = DocumentBuilderFactory.newInstance().newDocumentBuilder();
+      Document doc = builder.parse(new InputSource(new StringReader(xml)));   
       
-      StringReader reader = new StringReader(xml);
-      InputSource source = new InputSource(reader);
+      TransformerFactory transformerFactory = TransformerFactory.newInstance();
+      Transformer transformer = transformerFactory.newTransformer();
       
-      Document doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(source);   
-         
+      StringWriter xmlout = new StringWriter();
+      StreamResult result = new StreamResult(xmlout);
+
+      transformer.transform(new DOMSource(doc.getFirstChild()), result);
+      
       ManagedConnectionPoolStatistics rawStatistics = (ManagedConnectionPoolStatistics)getServer().invoke(POOL_NAME, RAW_STATS_METHOD, new Object[0], new String[0]);
       JBossXmlSubPoolStatisticFormatter xmlFormatter = new JBossXmlSubPoolStatisticFormatter();
       String xml2 = (String)xmlFormatter.formatSubPoolStatistics(rawStatistics);
-      assertEquals(xml, xml2);
       
+      Document doc2 = builder.parse(new InputSource(new StringReader(xml2)));
+
+
+      StringWriter xmlout2 = new StringWriter();
+      StreamResult result2 = new StreamResult(xmlout2);
+
+      transformer.transform(new DOMSource(doc2.getFirstChild()), result2);
+      
+      //only compare xml content, ignore standalone="no"
+      assertEquals(xmlout.toString(), xmlout2.toString());
+
       conn.close();
       
    }