# HG changeset patch # User aefimov # Date 1406791917 -14400 # Node ID 671124b407ce4939d0b00f5df813b7cd9f6db214 # Parent c6b97b1f9feed7432fc14b22872effaa67d087b9 8032908: getTextContent doesn't return string in JAXP Reviewed-by: joehw diff -r c6b97b1f9fee -r 671124b407ce jdk/test/javax/xml/jaxp/common/8032908/TestFunc.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/jaxp/common/8032908/TestFunc.java Thu Jul 31 11:31:57 2014 +0400 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +import org.w3c.dom.Node; + +public class TestFunc { + + public static String test(Node node) { + String s = node.getTextContent(); + return s; + } + +} diff -r c6b97b1f9fee -r 671124b407ce jdk/test/javax/xml/jaxp/common/8032908/XSLT.java --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/jaxp/common/8032908/XSLT.java Thu Jul 31 11:31:57 2014 +0400 @@ -0,0 +1,55 @@ +/* + * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * @test + * @bug 8032908 + * @summary Test if Node.getTextContent() function correctly returns children + * content + * @compile TestFunc.java XSLT.java + * @run main/othervm XSLT + */ +import java.io.ByteArrayOutputStream; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.stream.StreamResult; +import javax.xml.transform.stream.StreamSource; + +public class XSLT { + + static final String XMLTOTRANSFORM = "/in.xml"; + static final String XSLTRANSFORMER = "/test.xsl"; + static final String EXPECTEDRESULT = "ABCDEFG"; + + public static void main(String[] args) throws TransformerException { + ByteArrayOutputStream resStream = new ByteArrayOutputStream(); + TransformerFactory trf = TransformerFactory.newInstance(); + Transformer tr = trf.newTransformer(new StreamSource(System.getProperty("test.src", ".") + XSLTRANSFORMER)); + tr.transform(new StreamSource(System.getProperty("test.src", ".") + XMLTOTRANSFORM), new StreamResult(resStream)); + System.out.println("Transformation completed. Result:" + resStream.toString()); + if (!resStream.toString().equals(EXPECTEDRESULT)) { + throw new RuntimeException("Incorrect transformation result"); + } + } +} diff -r c6b97b1f9fee -r 671124b407ce jdk/test/javax/xml/jaxp/common/8032908/in.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/jaxp/common/8032908/in.xml Thu Jul 31 11:31:57 2014 +0400 @@ -0,0 +1,2 @@ + +ABCDEFG diff -r c6b97b1f9fee -r 671124b407ce jdk/test/javax/xml/jaxp/common/8032908/test.xsl --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jdk/test/javax/xml/jaxp/common/8032908/test.xsl Thu Jul 31 11:31:57 2014 +0400 @@ -0,0 +1,8 @@ + + + + + +