From 7cef8fd674e140d2e9d4a93d7f73b9b66cb40fc8 Mon Sep 17 00:00:00 2001 From: Aleksei Efimov Date: Fri, 21 Feb 2014 16:55:25 +0400 Subject: [PATCH] 8032909: XSLT string-length returns incorrect length when string includes complementary chars Reviewed-by: joehw, dfuchs --- .../javax/xml/jaxp/parsers/8032909/XSLT.java | 54 ++++++++++++++++++ .../xml/jaxp/parsers/8032909/a_utf16.xml | Bin 0 -> 394 bytes .../xml/jaxp/parsers/8032909/a_utf16.xsl | Bin 0 -> 1050 bytes .../javax/xml/jaxp/parsers/8032909/a_utf8.xml | 5 ++ .../javax/xml/jaxp/parsers/8032909/a_utf8.xsl | 13 +++++ .../jaxp/parsers/8032909/a_windows1252.xml | 5 ++ .../jaxp/parsers/8032909/a_windows1252.xsl | 13 +++++ 7 files changed, 90 insertions(+) create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xml create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml create mode 100644 jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java b/jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java new file mode 100644 index 00000000000..d133920f40a --- /dev/null +++ b/jdk/test/javax/xml/jaxp/parsers/8032909/XSLT.java @@ -0,0 +1,54 @@ +/* + * 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); + } +} diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml b/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xml new file mode 100644 index 0000000000000000000000000000000000000000..fae65cc655c6b96f810da8b6316c0227738f5da5 GIT binary patch literal 394 zcmZvY!3x4K5JcbEuP6%MY_*CPt3Bz>oBn{Nh@cVLBK>@4?Ws)&Brr4kb~gnj9dBMF ze5t5uc=ExsXUd9{rQSr2=PupJ^*sLWl?x{pN^O-XIWVE1RkqRHQ+w?wex)u(X_cEZ zlb?%i=f+NT8RL}EhFTu29nxHsW|bjt9p#<1W2af&XwEp<7$JEhHQdQm%Vv>Z`T=${ BJRbl6 literal 0 HcmV?d00001 diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl b/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf16.xsl new file mode 100644 index 0000000000000000000000000000000000000000..4d886036cd138295d2a5cbe4519daf2cd608b884 GIT binary patch literal 1050 zcmdUuO;5r=5Qg8gzoPM^2PlX!fmAr@$(xvXHFcpT?bgtW`0ssYz-ZBMRkO+L?0h~u z?Pi*3qe`U`trfIVqbJphy410T>TAHB;EBqyKjMvAy7x|VU8_gb1u-*Cb)<}H4b>*d zR&Qtltw09OhkI-}BJq=56=NvKYxRsRWxe|9BS)~+@Gh|qHTIS2UbnizGRN}(X`_Wl zRa7#*uY|Q;yt2uJ85m*VceK7O=MB9-F%Ho#+(*mMCNYnD;(Wx8uI|Fz*>1y7_;dc=Ydx S&wq{B-oWR7^V2)EZ~qQXR + +UTF-8_Element + + diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl b/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl new file mode 100644 index 00000000000..b7e222be192 --- /dev/null +++ b/jdk/test/javax/xml/jaxp/parsers/8032909/a_utf8.xsl @@ -0,0 +1,13 @@ + + + + + + + + + + + + + diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml b/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml new file mode 100644 index 00000000000..6d5726eb442 --- /dev/null +++ b/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xml @@ -0,0 +1,5 @@ + + +Windows-1252_Element + + diff --git a/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl b/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl new file mode 100644 index 00000000000..ff50bf8f8a0 --- /dev/null +++ b/jdk/test/javax/xml/jaxp/parsers/8032909/a_windows1252.xsl @@ -0,0 +1,13 @@ + + + + + + + + + + + + +