From 54f64f1cc04b97b82186db60a05ddede753b7a19 Mon Sep 17 00:00:00 2001
From: aefimov <unknown>
Date: Mon, 29 Feb 2016 15:59:02 +0300
Subject: [PATCH] 8149915: enabling validate-annotations feature for xsd schema
 with annotation causes NPE Reviewed-by: joehw

---
 .../jaxp/validation/8149915/Bug8149915.xsd    |  7 +++
 .../jaxp/validation/8149915/SchemaTest.java   | 49 +++++++++++++++++++
 2 files changed, 56 insertions(+)
 create mode 100644 test/javax/xml/jaxp/validation/8149915/Bug8149915.xsd
 create mode 100644 test/javax/xml/jaxp/validation/8149915/SchemaTest.java

diff --git a/test/javax/xml/jaxp/validation/8149915/Bug8149915.xsd b/test/javax/xml/jaxp/validation/8149915/Bug8149915.xsd
new file mode 100644
index 000000000..872033f5d
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8149915/Bug8149915.xsd
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+<xs:annotation>
+   <xs:appinfo>Testapp for XSD annotation issue</xs:appinfo>
+   <xs:documentation xml:lang="en">This is an XSD annotation, just for the sake of it.</xs:documentation>
+</xs:annotation>
+</xs:schema>
diff --git a/test/javax/xml/jaxp/validation/8149915/SchemaTest.java b/test/javax/xml/jaxp/validation/8149915/SchemaTest.java
new file mode 100644
index 000000000..c58d84242
--- /dev/null
+++ b/test/javax/xml/jaxp/validation/8149915/SchemaTest.java
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2016, 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
+ * @summary Test Schema creation
+ * @bug 8149915
+ * @run testng/othervm SchemaTest
+ */
+
+import java.io.File;
+import javax.xml.XMLConstants;
+import javax.xml.validation.SchemaFactory;
+import org.testng.annotations.Test;
+
+public class SchemaTest {
+
+    /*
+     * @bug 8149915
+     * Verifies that the annotation validator is initialized with the security manager for schema
+     * creation with http://apache.org/xml/features/validate-annotations=true.
+     */
+    @Test
+    public void testValidation() throws Exception {
+        SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI);
+        factory.setFeature("http://apache.org/xml/features/validate-annotations", true);
+        factory.newSchema(new File(getClass().getResource("Bug8149915.xsd").getFile()));
+    }
+}
-- 
GitLab