test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.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,44 ****
   * questions.
   */
  package org.xml.sax.ptests;
  
  import java.io.File;
- 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.SAXParser;
  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.SAXException;
- import static org.xml.sax.ptests.SAXTestConst.CLASS_DIR;
  import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
  import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
  
  /**
   * This tests the Attributes interface. Here the startElement() callback of
--- 21,37 ----
   * questions.
   */
  package org.xml.sax.ptests;
  
  import java.io.File;
  import javax.xml.parsers.SAXParser;
  import javax.xml.parsers.SAXParserFactory;
+ import jaxp.library.JAXPFileBaseTest;
+ import static jaxp.library.JAXPTestUtilities.USER_DIR;
  import static jaxp.library.JAXPTestUtilities.compareWithGold;
  import static org.testng.Assert.assertTrue;
  import org.testng.annotations.Test;
  import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR;
  import static org.xml.sax.ptests.SAXTestConst.XML_DIR;
  
  /**
   * This tests the Attributes interface. Here the startElement() callback of
*** 46,84 ****
   * pertaining to an element are taken into this argument and various methods
   * of Attributes interfaces are tested.
   * This program uses Namespace processing without any namepsaces in xml file.
   * This program uses Validation
   */
! public class AttributesTest {
      /**
       * Unit test for Attributes interface. Prints all attributes into output
       * file. Check it with golden file.
       */
      @Test
!     public void testcase01() {
!         String outputFile = CLASS_DIR + "Attributes.out";
          String goldFile = GOLDEN_DIR + "AttributesGF.out";
          String xmlFile = XML_DIR + "family.xml";
!         try {
              SAXParserFactory spf = SAXParserFactory.newInstance();
              spf.setNamespaceAware(true);
              spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
                                          true);
              spf.setValidating(true);
              SAXParser saxParser = spf.newSAXParser();
              MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
              saxParser.parse(new File(xmlFile), myAttrCHandler);
              myAttrCHandler.flushAndClose();
              assertTrue(compareWithGold(goldFile, outputFile));
-         } catch (IOException | ParserConfigurationException | SAXException ex) {
-             failUnexpected(ex);
-         } finally {
-             try {
-                 Path outputPath = Paths.get(outputFile);
-                 if(Files.exists(outputPath))
-                     Files.delete(outputPath);
-             } catch (IOException ex) {
-                 failCleanup(ex, outputFile);
-             }
-         }
      }
  }
--- 39,68 ----
   * pertaining to an element are taken into this argument and various methods
   * of Attributes interfaces are tested.
   * This program uses Namespace processing without any namepsaces in xml file.
   * This program uses Validation
   */
! public class AttributesTest extends JAXPFileBaseTest {
      /**
       * Unit test for Attributes interface. Prints all attributes into output
       * file. Check it with golden file.
+      * 
+      * @throws Exception If any errors occur.
       */
      @Test
!     public void testcase01() throws Exception {
!         String outputFile = USER_DIR + "Attributes.out";
          String goldFile = GOLDEN_DIR + "AttributesGF.out";
          String xmlFile = XML_DIR + "family.xml";
! 
          SAXParserFactory spf = SAXParserFactory.newInstance();
          spf.setNamespaceAware(true);
          spf.setFeature("http://xml.org/sax/features/namespace-prefixes",
                                      true);
          spf.setValidating(true);
          SAXParser saxParser = spf.newSAXParser();
          MyAttrCHandler myAttrCHandler = new MyAttrCHandler(outputFile);
          saxParser.parse(new File(xmlFile), myAttrCHandler);
          myAttrCHandler.flushAndClose();
          assertTrue(compareWithGold(goldFile, outputFile));
      }
  }