test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java

*** 24,45 ****
  
  import java.io.BufferedWriter;
  import java.io.FileInputStream;
  import java.io.FileWriter;
  import java.io.IOException;
- import java.nio.file.Files;
- import java.nio.file.Path;
- import java.nio.file.Paths;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParserFactory;
  import static jaxp.library.JAXPTestUtilities.compareWithGold;
- import static jaxp.library.JAXPTestUtilities.failCleanup;
- import static jaxp.library.JAXPTestUtilities.failUnexpected;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.Attributes;
- import org.xml.sax.ContentHandler;
  import org.xml.sax.InputSource;
  import org.xml.sax.Locator;
  import org.xml.sax.SAXException;
  import org.xml.sax.XMLReader;
  import org.xml.sax.helpers.XMLFilterImpl;
--- 24,40 ----
  
  import java.io.BufferedWriter;
  import java.io.FileInputStream;
  import java.io.FileWriter;
  import java.io.IOException;
  import javax.xml.parsers.ParserConfigurationException;
  import javax.xml.parsers.SAXParserFactory;
+ import jaxp.library.JAXPFileBaseTest;
  import static jaxp.library.JAXPTestUtilities.compareWithGold;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import org.xml.sax.Attributes;
  import org.xml.sax.InputSource;
  import org.xml.sax.Locator;
  import org.xml.sax.SAXException;
  import org.xml.sax.XMLReader;
  import org.xml.sax.helpers.XMLFilterImpl;
*** 50,96 ****
  /**
   * Class registers a content event handler to XMLReader. Content event handler
   * transverses XML and print all visited node  when XMLreader parses XML. Test
   * verifies output is same as the golden file.
   */
! public class ContentHandlerTest {
      /**
       * Content event handler visit all nodes to print to output file.
       */
      @Test
!     public void testcase01() {
          String outputFile = CLASS_DIR + "Content.out";
          String goldFile = GOLDEN_DIR + "ContentGF.out";
          String xmlFile = XML_DIR + "namespace1.xml";
  
!         try(FileInputStream instream = new FileInputStream(xmlFile)) {
              SAXParserFactory spf = SAXParserFactory.newInstance();
              spf.setNamespaceAware(true);
              XMLReader xmlReader = spf.newSAXParser().getXMLReader();
-             ContentHandler cHandler = new MyContentHandler(outputFile);
              xmlReader.setContentHandler(cHandler);
!             InputSource is = new InputSource(instream);
!             xmlReader.parse(is);
!             assertTrue(compareWithGold(goldFile, outputFile));
!         } catch( IOException | SAXException | ParserConfigurationException ex) {
!             failUnexpected(ex);
!         } finally {
!             try {
!                 Path outputPath = Paths.get(outputFile);
!                 if(Files.exists(outputPath))
!                     Files.delete(outputPath);
!             } catch (IOException ex) {
!                 failCleanup(ex, outputFile);
!             }
          }
      }
  }
  
  /**
   * A content write out handler.
   */
! class MyContentHandler extends XMLFilterImpl {
      /**
       * Prefix to every exception.
       */
      private final static String WRITE_ERROR = "bWriter error";
  
--- 45,87 ----
  /**
   * Class registers a content event handler to XMLReader. Content event handler
   * transverses XML and print all visited node  when XMLreader parses XML. Test
   * verifies output is same as the golden file.
   */
! public class ContentHandlerTest extends JAXPFileBaseTest {
      /**
       * Content event handler visit all nodes to print to output file.
+      * 
+      * @throws SAXException If any parse errors occur.
+      * @throws IOException if the file exists but is a directory rather than
+      *         a regular file, does not exist but cannot be created, or cannot 
+      *         be opened for any other reason.
+      * @throws ParserConfigurationException if a DocumentBuilder cannot be 
+      *         created which satisfies the configuration requested.
       */
      @Test
!     public void testcase01() throws IOException, SAXException, ParserConfigurationException {
          String outputFile = CLASS_DIR + "Content.out";
          String goldFile = GOLDEN_DIR + "ContentGF.out";
          String xmlFile = XML_DIR + "namespace1.xml";
  
!         try(FileInputStream instream = new FileInputStream(xmlFile);
!                 MyContentHandler cHandler = new MyContentHandler(outputFile)) {
              SAXParserFactory spf = SAXParserFactory.newInstance();
              spf.setNamespaceAware(true);
              XMLReader xmlReader = spf.newSAXParser().getXMLReader();
              xmlReader.setContentHandler(cHandler);
!             xmlReader.parse(new InputSource(instream));
          }
+         assertTrue(compareWithGold(goldFile, outputFile));
      }
  }
  
  /**
   * A content write out handler.
   */
! class MyContentHandler extends XMLFilterImpl implements AutoCloseable {
      /**
       * Prefix to every exception.
       */
      private final static String WRITE_ERROR = "bWriter error";
  
*** 256,261 ****
--- 247,262 ----
              bWriter.newLine();
          } catch (IOException ex) {
              throw new SAXException(WRITE_ERROR, ex);
          }
      }
+ 
+     /**
+      * Close the writer if it's initiated.
+      * @throws IOException if any IO error when close buffered writer.
+      */
+     @Override
+     public void close() throws IOException {
+         if (bWriter != null)
+             bWriter.close();
+     }
  }