8015092: SchemaFactory cannot parse schema if whitespace added within patterns in Selector XPath expression

Reviewed-by: lancea, alanb

5 files changed, 116 insertions, 0 deletions

diff --git a/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java b/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java
new file mode 100644
index 000000000..c4c4fa2ae
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8015092/XPathWhiteSpaceTest.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright (c) 2013, 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 8015092
+ * @summary whitespace within patterns in Selector XPath expression is accepted
+ * @run main/othervm XPathWhiteSpaceTest
+ */
+
+import java.io.*;
+import javax.xml.XMLConstants;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import org.xml.sax.SAXException;
+
+/**
+ * http://www.w3.org/TR/xmlschema-1/#coss-identity-constraint
+ * For readability, whitespace may be used in selector XPath expressions even though
+ * not explicitly allowed by the grammar:
+ * whitespace may be freely added within patterns before or after any token.
+ *
+ * @author huizhe.wang@oracle.com
+ */
+public class XPathWhiteSpaceTest {
+    static final String XSDFILE = "idJ029.xsd";
+
+    public static void main(String[] args) throws Exception {
+        try{
+            SchemaFactory schemaFactory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+            Schema schema = schemaFactory.newSchema(new File(System.getProperty("test.src", "."), XSDFILE));
+        } catch (SAXException e) {
+            throw new RuntimeException(e.getMessage());
+        }
+
+
+    }
+
+}
diff --git a/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd b/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd
new file mode 100644
index 000000000..941695faf
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8015092/idIxpns.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns.org" xmlns:xpns="xpns.org">

+	<xsd:element name="xsid" type="xsd:string"/>

+	<xsd:element name="xiid">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>

+			</xsd:sequence>

+			<xsd:attribute name="val" type="xsd:string"/>

+		</xsd:complexType>

+	</xsd:element>

+</xsd:schema>

diff --git a/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd b/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd
new file mode 100644
index 000000000..d0ff89a78
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8015092/idIxpns1.xsd
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="xpns1.org" xmlns:xpns="xpns1.org">

+	<xsd:element name="xsid" type="xsd:string"/>

+	<xsd:element name="xiid">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element name="xiid2" type="xsd:string" maxOccurs="unbounded"/>

+			</xsd:sequence>

+			<xsd:attribute name="val" type="xsd:string"/>

+		</xsd:complexType>

+	</xsd:element>

+</xsd:schema>

diff --git a/test/javax/xml/jaxp/validation/8015092/idJ029.xsd b/test/javax/xml/jaxp/validation/8015092/idJ029.xsd
new file mode 100644
index 000000000..9b83e2958
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8015092/idJ029.xsd
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xpns="xpns.org" xmlns:xpns1="xpns1.org" xmlns:xpns2="xpns2.org" xmlns:imp="importNS">

+	<xsd:import namespace="importNS" schemaLocation="idJimp.xsd"/>

+	<xsd:import namespace="xpns.org" schemaLocation="idIxpns.xsd"/>

+	<xsd:import namespace="xpns1.org" schemaLocation="idIxpns1.xsd"/>

+	<xsd:element name="root">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element ref="tid" maxOccurs="unbounded"/>

+				<xsd:element ref="imp:iid1" maxOccurs="unbounded"/>

+				<xsd:element ref="imp:sid" maxOccurs="unbounded"/>

+				<xsd:element ref="xpns:xiid" maxOccurs="unbounded"/>

+			</xsd:sequence>

+		</xsd:complexType>

+		<xsd:unique id="foo123" name="uid">

+			<xsd:selector xpath=".//tid"/>

+			<xsd:field xpath=". //."/>

+		</xsd:unique>

+	</xsd:element>

+	<xsd:element name="tid" type="xsd:string"/>

+</xsd:schema>

diff --git a/test/javax/xml/jaxp/validation/8015092/idJimp.xsd b/test/javax/xml/jaxp/validation/8015092/idJimp.xsd
new file mode 100644
index 000000000..c2b966af9
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8015092/idJimp.xsd
@@ -0,0 +1,11 @@
+<?xml version="1.0"?>

+<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="importNS" xmlns:imp="importNS">

+	<xsd:element name="sid" type="xsd:string"/>

+	<xsd:element name="iid1">

+		<xsd:complexType>

+			<xsd:sequence>

+				<xsd:element name="iid2" type="xsd:string" maxOccurs="unbounded"/>

+			</xsd:sequence>

+		</xsd:complexType>

+	</xsd:element>

+</xsd:schema>