--- /dev/null	Mon Nov 17 20:02:52 2014
+++ new/test/javax/xml/jaxp/unittest/javax/xml/stream/XMLEventWriterTest/XMLEventWriterTest.java	Mon Nov 17 20:02:51 2014
@@ -0,0 +1,152 @@
+/*
+ * 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.stream.XMLEventWriterTest;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.InputStream;
+
+import javax.xml.namespace.QName;
+import javax.xml.stream.XMLEventReader;
+import javax.xml.stream.XMLEventWriter;
+import javax.xml.stream.XMLInputFactory;
+import javax.xml.stream.XMLOutputFactory;
+import javax.xml.stream.events.XMLEvent;
+import javax.xml.transform.stream.StreamSource;
+
+import org.testng.Assert;
+import org.testng.annotations.Test;
+
+/*
+ * @summary Test XMLEventWriter.
+ */
+public class XMLEventWriterTest {
+
+    /**
+     * Test XMLStreamWriter parsing a file with an external entity reference.
+     */
+    @Test
+    public void testXMLStreamWriter() {
+
+        try {
+            XMLOutputFactory outputFactory = XMLOutputFactory.newInstance();
+            XMLEventWriter eventWriter = outputFactory.createXMLEventWriter(System.out);
+            XMLInputFactory inputFactory = XMLInputFactory.newInstance();
+            String file = getClass().getResource("XMLEventWriterTest.xml").getPath();
+            XMLEventReader eventReader = inputFactory.createXMLEventReader(new StreamSource(new File(file)));
+
+            // adds the event to the consumer.
+            eventWriter.add(eventReader);
+            eventWriter.flush();
+            eventWriter.close();
+
+            // expected success
+        } catch (Exception exception) {
+            exception.printStackTrace();
+            Assert.fail(exception.toString());
+        }
+    }
+
+    /**
+     * Inspired by CR 6245284 Sun Stax /sjsxp.jar does not behave properly
+     * during merge of xml files.
+     */
+    @Test
+    public void testMerge() {
+
+        try {
+            // Create the XML input factory
+            XMLInputFactory factory = XMLInputFactory.newInstance();
+
+            // Create XML event reader 1
+            InputStream inputStream1 = new FileInputStream(new File(XMLEventWriterTest.class.getResource("merge-1.xml").toURI()));
+            XMLEventReader r1 = factory.createXMLEventReader(inputStream1);
+
+            // Create XML event reader 2
+            InputStream inputStream2 = new FileInputStream(new File(XMLEventWriterTest.class.getResource("merge-2.xml").toURI()));
+            XMLEventReader r2 = factory.createXMLEventReader(inputStream2);
+
+            // Create the output factory
+            XMLOutputFactory xmlof = XMLOutputFactory.newInstance();
+
+            // Create XML event writer
+            XMLEventWriter xmlw = xmlof.createXMLEventWriter(System.out);
+
+            // Read to first <product> element in document 1
+            // and output to result document
+            QName bName = new QName("b");
+
+            while (r1.hasNext()) {
+                // Read event to be written to result document
+                XMLEvent event = r1.nextEvent();
+
+                if (event.getEventType() == XMLEvent.END_ELEMENT) {
+
+                    // Start element - stop at <product> element
+                    QName name = event.asEndElement().getName();
+                    if (name.equals(bName)) {
+
+                        QName zName = new QName("z");
+
+                        boolean isZr = false;
+
+                        while (r2.hasNext()) {
+                            // Read event to be written to result document
+                            XMLEvent event2 = r2.nextEvent();
+                            // Output event
+                            if (event2.getEventType() == XMLEvent.START_ELEMENT && event2.asStartElement().getName().equals(zName)) {
+                                isZr = true;
+                            }
+
+                            if (xmlw != null && isZr) {
+                                xmlw.add(event2);
+                            }
+
+                            // stop adding events after </z>
+                            // i.e. do not write END_DOCUMENT :)
+                            if (isZr && event2.getEventType() == XMLEvent.END_ELEMENT && event2.asEndElement().getName().equals(zName)) {
+                                isZr = false;
+                            }
+                        }
+                        xmlw.flush();
+                    }
+                }
+
+                // Output event
+                if (xmlw != null) {
+                    xmlw.add(event);
+                }
+            }
+
+            // Read to first <product> element in document 1
+            // without writing to result document
+            xmlw.close();
+
+            // expected success
+        } catch (Exception ex) {
+            ex.printStackTrace();
+            Assert.fail(ex.toString());
+        }
+    }
+}