[jboss-svn-commits] JBL Code SVN: r13949 - in labs/jbossesb/trunk/product/rosetta: tests/src/org/jboss/soa/esb/util and 1 other directory.

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

Author: beve
Date: 2007-08-02 02:49:39 -0400 (Thu, 02 Aug 2007)
New Revision: 13949

Modified:
   labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/XPathUtil.java
   labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java
Log:
Updated to specify that UTF-8 should be used and not the platforms default charset.


Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/XPathUtil.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/XPathUtil.java	2007-08-02 06:23:17 UTC (rev 13948)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/soa/esb/util/XPathUtil.java	2007-08-02 06:49:39 UTC (rev 13949)
@@ -71,7 +71,7 @@
 		{
 			DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
 			DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
-			inputStream = new ByteArrayInputStream( xml.getBytes() );
+			inputStream = new ByteArrayInputStream( xml.getBytes("UTF-8") );
 			return documentBuilder.parse( inputStream );
 		} 
 		finally

Modified: labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java	2007-08-02 06:23:17 UTC (rev 13948)
+++ labs/jbossesb/trunk/product/rosetta/tests/src/org/jboss/soa/esb/util/XPathUtilTest.java	2007-08-02 06:49:39 UTC (rev 13949)
@@ -29,6 +29,8 @@
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.xpath.XPathExpressionException;
 
+import junit.framework.JUnit4TestAdapter;
+
 import org.junit.Test;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
@@ -76,12 +78,12 @@
 	@Test
 	public void getNodeFromXPathExpression_sibling( ) throws SAXException, IOException, ParserConfigurationException, XPathExpressionException
 	{
-		String xml = "<someNode><childnode><name>Daniel</name></childnode><childnode><name>Bevenius</name></childnode></someNode>";
+		String xml = "<someNode><childnode><name>Daniel</name></childnode><childnode><name>Bövenius</name></childnode></someNode>";
 		Element node = XPathUtil.getNodeFromXPathExpression( XPathUtil.getDocument( xml ), "/someNode/childnode[2]" );
 		assertEquals( "childnode", node.getNodeName() );
 		Node nameNode = node.getElementsByTagName( "name" ).item( 0 );
 		assertNotNull( nameNode );
-		assertEquals( "Bevenius", nameNode.getTextContent() );
+		assertEquals( "Bövenius", nameNode.getTextContent() );
 	}
 	
 	@Test
@@ -90,5 +92,13 @@
 		Element node = XPathUtil.getNodeFromXPathExpression( xml, "/someNode/childnode" );
 		assertEquals( "childnode", node.getNodeName() );
 	}
+	
+	/*
+	 * Just here to help Ant to find annotated test.
+	 */
+	public static junit.framework.Test suite()
+	{
+		return new JUnit4TestAdapter( XPathUtilTest.class );
+	}	
 
 }