Author: richard.opalka(a)jboss.com
Date: 2010-02-19 04:57:56 -0500 (Fri, 19 Feb 2010)
New Revision: 11625
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java
Log:
refactoring XML helper methods
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2010-02-19
09:46:20 UTC (rev 11624)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/endpointReference/EndpointReferenceBuilderTestCase.java 2010-02-19
09:57:56 UTC (rev 11625)
@@ -21,17 +21,12 @@
*/
package org.jboss.test.ws.jaxws.endpointReference;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
-
import javax.xml.namespace.QName;
import javax.xml.transform.dom.DOMResult;
import javax.xml.ws.wsaddressing.W3CEndpointReference;
import javax.xml.ws.wsaddressing.W3CEndpointReferenceBuilder;
-import org.jboss.ws.Constants;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.test.JBossWSTest;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -82,7 +77,7 @@
DOMResult dr = new DOMResult();
epr.writeTo(dr);
Node endpointReferenceElement = dr.getNode();
- System.out.println(getXml(endpointReferenceElement));
+ System.out.println(DOMUtils.node2String(endpointReferenceElement));
assertMetaData(endpointReferenceElement);
assertRefParam(endpointReferenceElement, PARAM1_QNAME, "Hello");
assertRefParam(endpointReferenceElement, PARAM2_QNAME, "World");
@@ -104,20 +99,12 @@
DOMResult dr = new DOMResult();
epr.writeTo(dr);
Node endpointReferenceElement = dr.getNode();
- System.out.println(getXml(endpointReferenceElement));
+ System.out.println(DOMUtils.node2String(endpointReferenceElement));
assertMetaData(endpointReferenceElement);
assertRefParam(endpointReferenceElement, PARAM1_QNAME, "Hello");
assertRefParam(endpointReferenceElement, PARAM2_QNAME, "World");
}
- private static String getXml(final Node node) throws Exception
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(baos);
- new DOMWriter(pw, Constants.DEFAULT_XML_CHARSET).setPrettyprint(true).print(node);
- return baos.toString("utf-8");
- }
-
private static void assertRefParam(final Node root, final QName nodeName, final String
refParamValue)
{
Element e = (Element)DOMUtils.getFirstChildElement(root, nodeName, true);
Modified:
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java
===================================================================
---
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2010-02-19
09:46:20 UTC (rev 11624)
+++
framework/trunk/testsuite/test/java/org/jboss/test/ws/jaxws/jbws2917/JBWS2917TestCase.java 2010-02-19
09:57:56 UTC (rev 11625)
@@ -21,18 +21,13 @@
*/
package org.jboss.test.ws.jaxws.jbws2917;
-import java.io.ByteArrayOutputStream;
-import java.io.PrintWriter;
import java.io.StringReader;
import javax.xml.transform.stream.StreamSource;
import javax.xml.ws.EndpointReference;
-import org.jboss.ws.Constants;
import org.jboss.wsf.common.DOMUtils;
-import org.jboss.wsf.common.DOMWriter;
import org.jboss.wsf.test.JBossWSTest;
-import org.w3c.dom.Element;
/**
* [JBWS-2917] We're using buggy xalan version causing namespaces issues
@@ -54,22 +49,14 @@
public void testToString() throws Exception
{
- assertTrue("lost xmlns:wsns namespace declaration",
this.getXml(XML_SOURCE).indexOf("xmlns:wsns") != -1);
+ assertTrue("lost xmlns:wsns namespace declaration",
this.getXML(XML_SOURCE).indexOf("xmlns:wsns") != -1);
StreamSource source = new StreamSource(new StringReader(XML_SOURCE));
EndpointReference epRef = EndpointReference.readFrom(source);
assertTrue("lost xmlns:wsns namespace declaration",
epRef.toString().indexOf("xmlns:wsns") != -1);
}
- private String getXml(final String s) throws Exception
+ private String getXML(final String s) throws Exception
{
- return this.getXml(DOMUtils.parse(s));
+ return DOMUtils.node2String(DOMUtils.parse(s));
}
-
- private String getXml(final Element e) throws Exception
- {
- ByteArrayOutputStream baos = new ByteArrayOutputStream();
- PrintWriter pw = new PrintWriter(baos);
- new DOMWriter(pw, Constants.DEFAULT_XML_CHARSET).setPrettyprint(true).print(e);
- return baos.toString("utf-8");
- }
}
Show replies by date