test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java

*** 1,7 ****
  /*
!  * 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.
--- 1,7 ----
  /*
!  * Copyright (c) 2014, 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.
*** 26,64 ****
  import javax.xml.stream.XMLInputFactory;
  import javax.xml.stream.XMLStreamConstants;
  import javax.xml.stream.XMLStreamReader;
  
  import org.testng.Assert;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
  /*
   * @test
   * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
   * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.StreamReaderTest
   * @run testng/othervm stream.XMLStreamReaderTest.StreamReaderTest
!  * @summary Test XMLStreamReader.hasName() returns false for ENTITY_REFERENCE.
   */
  @Listeners({jaxp.library.FilePolicy.class})
  public class StreamReaderTest {
  
      /**
       * CR 6631264 / sjsxp Issue 45:
       * https://sjsxp.dev.java.net/issues/show_bug.cgi?id=45
       * XMLStreamReader.hasName() should return false for ENTITY_REFERENCE
       */
      @Test
      public void testHasNameOnEntityEvent() throws Exception {
          XMLInputFactory xif = XMLInputFactory.newInstance();
          xif.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
!         XMLStreamReader r = xif.createXMLStreamReader(this.getClass().getResourceAsStream("ExternalDTD.xml"));
          while (r.next() != XMLStreamConstants.ENTITY_REFERENCE) {
              System.out.println("event type: " + r.getEventType());
              continue;
          }
          if (r.hasName()) {
              System.out.println("hasName returned true on ENTITY_REFERENCE event.");
          }
          Assert.assertFalse(r.hasName()); // fails
      }
  
  }
--- 26,104 ----
  import javax.xml.stream.XMLInputFactory;
  import javax.xml.stream.XMLStreamConstants;
  import javax.xml.stream.XMLStreamReader;
  
  import org.testng.Assert;
+ import org.testng.annotations.DataProvider;
  import org.testng.annotations.Listeners;
  import org.testng.annotations.Test;
  
  /*
   * @test
+  * @bug 8167340
   * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest
   * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.StreamReaderTest
   * @run testng/othervm stream.XMLStreamReaderTest.StreamReaderTest
!  * @summary Verifies patches for StreamReader bugs
   */
  @Listeners({jaxp.library.FilePolicy.class})
  public class StreamReaderTest {
+     /**
+      * Verifies that after switching to a different XML Version (1.1), the parser
+      * is initialized properly (the listener was not registered in this case).
+      * 
+      * @param path the path to XML source
+      * @throws Exception 
+      */
+     @Test(dataProvider = "getPaths")
+     public void testSwitchXMLVersions(String path) throws Exception {
+         XMLInputFactory xmlInputFactory = XMLInputFactory.newInstance();
+         xmlInputFactory.setProperty("javax.xml.stream.isCoalescing", true);
+         XMLStreamReader xmlStreamReader = xmlInputFactory.createXMLStreamReader(
+                 this.getClass().getResourceAsStream(path));
+ 
+         while (xmlStreamReader.hasNext()) {
+             int event = xmlStreamReader.next();
+             if (event == XMLStreamConstants.START_ELEMENT) {
+                 if (xmlStreamReader.getLocalName().equals("body"))
+                 {
+                     String elementText = xmlStreamReader.getElementText();
+                     Assert.assertTrue(!elementText.contains("</body>"), 
+                             "Fail: elementText contains </body>");
+                 }
+             }
+         }
+     }
  
      /**
       * CR 6631264 / sjsxp Issue 45:
       * https://sjsxp.dev.java.net/issues/show_bug.cgi?id=45
       * XMLStreamReader.hasName() should return false for ENTITY_REFERENCE
       */
      @Test
      public void testHasNameOnEntityEvent() throws Exception {
          XMLInputFactory xif = XMLInputFactory.newInstance();
          xif.setProperty(XMLInputFactory.IS_REPLACING_ENTITY_REFERENCES, false);
!         XMLStreamReader r = xif.createXMLStreamReader(
!                 this.getClass().getResourceAsStream("ExternalDTD.xml"));
          while (r.next() != XMLStreamConstants.ENTITY_REFERENCE) {
              System.out.println("event type: " + r.getEventType());
              continue;
          }
          if (r.hasName()) {
              System.out.println("hasName returned true on ENTITY_REFERENCE event.");
          }
          Assert.assertFalse(r.hasName()); // fails
      }
  
+     /*
+        DataProvider: provides paths to xml sources
+        Data: path to xml source
+      */
+     @DataProvider(name = "getPaths")
+     public Object[][] getPaths() {
+         return new Object[][]{
+             {"Bug8167340_1-0.xml"},
+             {"Bug8167340_1-1.xml"}
+         };
+     }
  }