test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.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) 2003, 2015, 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.
*** 21,34 ****
   * questions.
   */
  package org.xml.sax.ptests;
  
  import java.io.FileInputStream;
! import java.io.IOException;
! import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParserFactory;
! import static jaxp.library.JAXPTestUtilities.failUnexpected;
  import static org.testng.Assert.assertNotNull;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.HandlerBase;
  import org.xml.sax.InputSource;
--- 21,33 ----
   * questions.
   */
  package org.xml.sax.ptests;
  
  import java.io.FileInputStream;
! import java.io.FilePermission;
  import javax.xml.parsers.SAXParserFactory;
! import jaxp.library.JAXPBaseTest;
  import static org.testng.Assert.assertNotNull;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.HandlerBase;
  import org.xml.sax.InputSource;
*** 38,48 ****
  import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
  
  /**
   * Class containing the test cases for XMLReaderAdapter API
   */
! public class XMLReaderAdapterTest {
      /**
       * http://xml.org/sax/features/namespace-prefixes property name.
       */
      private final static String NM_PREFIXES_PROPERTY
              = "http://xml.org/sax/features/namespace-prefixes";
--- 37,47 ----
  import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
  
  /**
   * Class containing the test cases for XMLReaderAdapter API
   */
! public class XMLReaderAdapterTest extends JAXPBaseTest {
      /**
       * http://xml.org/sax/features/namespace-prefixes property name.
       */
      private final static String NM_PREFIXES_PROPERTY
              = "http://xml.org/sax/features/namespace-prefixes";
*** 56,117 ****
      public void constructor01() throws SAXException {
          assertNotNull(new XMLReaderAdapter());
      }
  
      /**
!      * To test the constructor that uses XMLReader
       */
      @Test
!     public void constructor02() {
!         try {
!             SAXParserFactory spf = SAXParserFactory.newInstance();
!             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
! 
              assertNotNull(new XMLReaderAdapter(xmlReader));
-         } catch (ParserConfigurationException | SAXException ex) {
-             failUnexpected(ex);
-         }
      }
  
      /**
       * To test the parse method. The specification says that this method
       * will throw an exception if the embedded XMLReader does not support
       * the http://xml.org/sax/features/namespace-prefixes property.
       */
      @Test
!     public void nsfeature01() {
!         try {
!             SAXParserFactory spf = SAXParserFactory.newInstance();
!             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
              if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
                  xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
              }
- 
              assertTrue(xmlReader.getFeature(NM_PREFIXES_PROPERTY));
-         } catch (SAXException | ParserConfigurationException ex) {
-             failUnexpected(ex);
-         }
      }
  
      /**
       * To test the parse method. The specification says that this method
       * will throw an exception if the embedded XMLReader does not support
       * the http://xml.org/sax/features/namespace-prefixes property.
       */
      @Test
!     public void parse01() {
          try (FileInputStream fis = new FileInputStream(XML_DIR + "namespace1.xml")) {
!             SAXParserFactory spf = SAXParserFactory.newInstance();
!             XMLReader xmlReader = spf.newSAXParser().getXMLReader();
              if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
                  xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
              }
              XMLReaderAdapter xmlRA = new XMLReaderAdapter(xmlReader);
- 
-             InputSource is = new InputSource(fis);
              xmlRA.setDocumentHandler(new HandlerBase());
!             xmlRA.parse(is);
!         } catch (IOException | SAXException | ParserConfigurationException ex) {
!             failUnexpected(ex);
          }
      }
  }
--- 55,107 ----
      public void constructor01() throws SAXException {
          assertNotNull(new XMLReaderAdapter());
      }
  
      /**
!      * To test the constructor that uses XMLReader.
!      * 
!      * @throws Exception If any errors occur.
       */
      @Test
!     public void constructor02() throws Exception {
!         XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
          assertNotNull(new XMLReaderAdapter(xmlReader));
      }
  
      /**
       * To test the parse method. The specification says that this method
       * will throw an exception if the embedded XMLReader does not support
       * the http://xml.org/sax/features/namespace-prefixes property.
+      * 
+      * @throws Exception If any errors occur.
       */
      @Test
!     public void nsfeature01() throws Exception {
!         XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
          if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
              xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
          }
          assertTrue(xmlReader.getFeature(NM_PREFIXES_PROPERTY));
      }
  
      /**
       * To test the parse method. The specification says that this method
       * will throw an exception if the embedded XMLReader does not support
       * the http://xml.org/sax/features/namespace-prefixes property.
+      * 
+      * @throws Exception If any errors occur.
       */
      @Test
!     public void parse01() throws Exception {
!         setPermissions(new FilePermission(XML_DIR + "/-", "read"));
          try (FileInputStream fis = new FileInputStream(XML_DIR + "namespace1.xml")) {
!             XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
              if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) {
                  xmlReader.setFeature(NM_PREFIXES_PROPERTY, true);
              }
              XMLReaderAdapter xmlRA = new XMLReaderAdapter(xmlReader);
              xmlRA.setDocumentHandler(new HandlerBase());
!             xmlRA.parse(new InputSource(fis));
          }
+         setPermissions();
      }
  }