Mercurial > hg > shenandoah-preopenjdk-archive > openjdk8 > jaxp
changeset 652:c356de7051ea jdk8u20-b10
Merge
author | asaha |
---|---|
date | Wed, 09 Apr 2014 12:24:56 -0700 |
parents | 2f9dd059f425 (current diff) d390f044fbc7 (diff) |
children | 40b6440e569e |
files | .hgtags test/javax/xml/jaxp/parsers/8032909/XSLT.java test/javax/xml/jaxp/parsers/8032909/a_utf16.xml test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl test/javax/xml/jaxp/parsers/8032909/a_utf8.xml test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl |
diffstat | 8 files changed, 1 insertions(+), 90 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Apr 02 10:00:25 2014 -0700 +++ b/.hgtags Wed Apr 09 12:24:56 2014 -0700 @@ -279,3 +279,4 @@ 7b1a6da8ad82b8f576f21ae0692e825395f8b31b jdk8u20-b06 30b8baceb72bcec111c6aad37eef96d18c09e4ef jdk8u20-b07 68e2ea32f92731b8ad8157252116db89903b51a3 jdk8u20-b08 +b706e9775bf7512845120740870f717341e2b497 jdk8u20-b09
--- a/test/javax/xml/jaxp/parsers/8032909/XSLT.java Wed Apr 02 10:00:25 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,54 +0,0 @@ -/* - * 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 8032909 - * @summary Test for XSLT string-length function with complementary chars - * @compile XSLT.java - * @run main/othervm XSLT a_utf16.xml a_utf16.xsl 1270 - * @run main/othervm XSLT a_utf8.xml a_utf8.xsl 130 - * @run main/othervm XSLT a_windows1252.xml a_windows1252.xsl 200 - */ - -import java.io.ByteArrayOutputStream; -import javax.xml.transform.stream.StreamResult; -import javax.xml.transform.stream.StreamSource; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerFactory; - -public class XSLT { - public static void main(String[] args) throws Exception { - - ByteArrayOutputStream resStream = new ByteArrayOutputStream(); - TransformerFactory trf = TransformerFactory.newInstance(); - Transformer tr = trf.newTransformer(new StreamSource(System.getProperty("test.src", ".")+"/"+args[1])); - String res, expectedRes; - tr.transform( new StreamSource(System.getProperty("test.src", ".")+"/"+args[0]), new StreamResult(resStream)); - res = resStream.toString(); - System.out.println("Transformation completed. Result:"+res); - - if (!res.replaceAll("\\s","").equals(args[2])) - throw new RuntimeException("Incorrect transformation result. Expected:"+args[2]+" Observed:"+res); - } -}
--- a/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml Wed Apr 02 10:00:25 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<testxml> -<Element>UTF-8_Element</Element> -<Element2></Element2> -</testxml>
--- a/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl Wed Apr 02 10:00:25 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - -<xsl:output method="text" /> - -<xsl:template match="Element"> -<xsl:value-of select="string-length(.)"/> -</xsl:template> -<xsl:template match="Element2"> -<xsl:value-of select="string-length(.)"/> -</xsl:template> - -</xsl:stylesheet>
--- a/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml Wed Apr 02 10:00:25 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,5 +0,0 @@ -<?xml version="1.0" encoding="windows-1252"?> -<testxml> -<Element>Windows-1252_Element</Element> -<Element2></Element2> -</testxml>
--- a/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl Wed Apr 02 10:00:25 2014 -0700 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="windows-1252"?> -<xsl:stylesheet version="1.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"> - -<xsl:output method="text" /> - -<xsl:template match="Element"> -<xsl:value-of select="string-length(.)"/> -</xsl:template> -<xsl:template match="Element2"> -<xsl:value-of select="string-length(.)"/> -</xsl:template> - -</xsl:stylesheet>