From b0f5c2ca7bab6ff2ae06606361b39af5d4b3be2c Mon Sep 17 00:00:00 2001
From: Dominik Stadler <centic@apache.org>
Date: Fri, 26 Oct 2018 10:58:37 +0000
Subject: [PATCH] IDE warnings, slightly more tests and fix test to not leave a
 modified file behind

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1844894 13f79535-47bb-0310-9956-ffa450edef68
---
 .../TestOPCComplianceCoreProperties.java      |  8 +---
 .../apache/poi/ss/TestWorkbookFactory.java    | 46 +++++++++++++------
 2 files changed, 35 insertions(+), 19 deletions(-)

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
index d663bb4cd3..542f1c0131 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/compliance/TestOPCComplianceCoreProperties.java
@@ -83,9 +83,7 @@ public final class TestOPCComplianceCoreProperties {
         try {
             InputStream is = OpenXML4JTestDataSamples.openComplianceSampleStream("OPCCompliance_CoreProperties_OnlyOneCorePropertiesPart.docx");
             pkg = OPCPackage.open(is);
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
+        } catch (InvalidFormatException | IOException e) {
             throw new RuntimeException(e);
         }
         pkg.revert();
@@ -151,9 +149,7 @@ public final class TestOPCComplianceCoreProperties {
         OPCPackage pkg;
         try {
             pkg = OPCPackage.open(is);
-        } catch (InvalidFormatException e) {
-            throw new RuntimeException(e);
-        } catch (IOException e) {
+        } catch (InvalidFormatException | IOException e) {
             throw new RuntimeException(e);
         }
         URI partUri = createURI("/docProps/core2.xml");
diff --git a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
index 878b536ec2..c4c68b9717 100644
--- a/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
+++ b/src/ooxml/testcases/org/apache/poi/ss/TestWorkbookFactory.java
@@ -31,6 +31,7 @@ import java.io.InputStream;
 
 import org.apache.poi.EmptyFileException;
 import org.apache.poi.EncryptedDocumentException;
+import org.apache.poi.POIDataSamples;
 import org.apache.poi.hssf.HSSFTestDataSamples;
 import org.apache.poi.hssf.usermodel.HSSFWorkbook;
 import org.apache.poi.openxml4j.opc.OPCPackage;
@@ -109,6 +110,13 @@ public final class TestWorkbookFactory {
         assertTrue(wb instanceof HSSFWorkbook);
         assertCloseDoesNotModifyFile(xls, wb);
 
+        wb = WorkbookFactory.create(
+                new POIFSFileSystem(HSSFTestDataSamples.openSampleFileStream(xls)).getRoot()
+        );
+        assertNotNull(wb);
+        assertTrue(wb instanceof HSSFWorkbook);
+        assertCloseDoesNotModifyFile(xls, wb);
+
         // Package -> xssf
         wb = XSSFWorkbookFactory.create(
                 OPCPackage.open(
@@ -403,15 +411,15 @@ public final class TestWorkbookFactory {
         assertTrue(altXLS.exists());
         assertTrue(altXLSX.exists());
 
-        try (Workbook wb = WorkbookFactory.create(altXLS)) {
-            assertNotNull(wb);
-            assertTrue(wb instanceof HSSFWorkbook);
-        }
+        Workbook wb = WorkbookFactory.create(altXLS);
+        assertNotNull(wb);
+        assertTrue(wb instanceof HSSFWorkbook);
+        closeOrRevert(wb);
 
-        try (Workbook wb = WorkbookFactory.create(altXLSX)) {
-            assertNotNull(wb);
-            assertTrue(wb instanceof XSSFWorkbook);
-        }
+        wb = WorkbookFactory.create(altXLSX);
+        assertNotNull(wb);
+        assertTrue(wb instanceof XSSFWorkbook);
+        closeOrRevert(wb);
     }
     
     private static class TestFile extends File {
@@ -425,12 +433,24 @@ public final class TestWorkbookFactory {
      */
     @Test
     public void testCreateEmpty() throws Exception {
-        try (Workbook wb = WorkbookFactory.create(false)) {
-            assertTrue(wb instanceof HSSFWorkbook);
-        }
+        Workbook wb = WorkbookFactory.create(false);
+        assertTrue(wb instanceof HSSFWorkbook);
+        closeOrRevert(wb);
+
+        wb = WorkbookFactory.create(true);
+        assertTrue(wb instanceof XSSFWorkbook);
+        closeOrRevert(wb);
+    }
 
-        try (Workbook wb = WorkbookFactory.create(true)) {
-            assertTrue(wb instanceof XSSFWorkbook);
+    @Test
+    public void testInvalidFormatException() {
+        String filename = "OPCCompliance_DerivedPartNameFAIL.docx";
+        try {
+            WorkbookFactory.create(POIDataSamples.getOpenXML4JInstance().openResourceAsStream(filename));
+            fail("Expecting an Exception for this document");
+        } catch (IOException e) {
+            // expected here
         }
     }
+
 }
-- 
2.39.5