--- /dev/null Mon Nov 17 20:18:06 2014
+++ new/test/javax/xml/jaxp/unittest/javax/xml/validation/Bug4969042.java Mon Nov 17 20:18:05 2014
@@ -0,0 +1,107 @@
+/*
+ * 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.
+ */
+
+package javax.xml.validation;
+
+import java.io.IOException;
+import java.io.StringReader;
+
+import javax.xml.parsers.ParserConfigurationException;
+import javax.xml.parsers.SAXParserFactory;
+import javax.xml.transform.stream.StreamSource;
+import javax.xml.validation.Schema;
+import javax.xml.validation.SchemaFactory;
+import javax.xml.validation.ValidatorHandler;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.DefaultHandler;
+
+/*
+ * @bug 4969042
+ * @summary Test ValidationHandler shall invoke ignorableWhitespace() of the
+ * user-defined ContentHandler once the validator detects any ignorable whitespaces.
+ */
+public class Bug4969042 {
+
+ public static final String XSD = "\n" + "\n" + " \n"
+ + " \n" + " \n" + " \n" + " \n"
+ + " \n" + " \n" + "\n";
+
+ public static final String XML = "\n" + "\n" + " \n" + " 123abc\n" + " \n"
+ + "\n";
+
+ private ValidatorHandler createValidatorHandler(String xsd) throws SAXException {
+ SchemaFactory schemaFactory = SchemaFactory.newInstance("http://www.w3.org/2001/XMLSchema");
+
+ StringReader reader = new StringReader(xsd);
+ StreamSource xsdSource = new StreamSource(reader);
+
+ Schema schema = schemaFactory.newSchema(xsdSource);
+ return schema.newValidatorHandler();
+ }
+
+ private XMLReader createXMLReader() throws ParserConfigurationException, SAXException {
+ SAXParserFactory parserFactory = SAXParserFactory.newInstance();
+ if (!parserFactory.isNamespaceAware()) {
+ parserFactory.setNamespaceAware(true);
+ }
+
+ return parserFactory.newSAXParser().getXMLReader();
+ }
+
+ private void parse(XMLReader xmlReader, String xml) throws SAXException, IOException {
+ StringReader reader = new StringReader(xml);
+ InputSource inSource = new InputSource(reader);
+
+ xmlReader.parse(inSource);
+ }
+
+ @Test
+ public void test() throws SAXException, ParserConfigurationException, IOException {
+ XMLReader xmlReader = createXMLReader();
+ ValidatorHandler validatorHandler = createValidatorHandler(XSD);
+ xmlReader.setContentHandler(validatorHandler);
+
+ final boolean[] invoked = { false, false };
+ DefaultHandler contentHandler = new DefaultHandler() {
+ public void ignorableWhitespace(char[] ch, int start, int length) throws SAXException {
+ invoked[0] = true;
+ }
+
+ public void characters(char[] ch, int start, int length) throws SAXException {
+ invoked[1] = true;
+ }
+ };
+ validatorHandler.setContentHandler(contentHandler);
+
+ parse(xmlReader, XML);
+
+ Assert.assertTrue(invoked[0], "Method ignorableWhitespace() was not invoked.");
+ Assert.assertTrue(invoked[1], "Method characters() was not invoked.");
+ }
+}