From: Nick Burch <nick@apache.org>
Date: Tue, 15 Mar 2016 12:37:01 +0000 (+0000)
Subject: One final invalid file type check
X-Git-Tag: REL_3_15_BETA2~439
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e5e066fb791c604182464c3f3721d94a093656bf;p=poi.git

One final invalid file type check

git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1735071 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
index 9cde41486d..0834ad223a 100644
--- a/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
+++ b/src/ooxml/testcases/org/apache/poi/openxml4j/opc/TestPackage.java
@@ -41,6 +41,8 @@ import java.util.List;
 import java.util.TreeMap;
 import java.util.regex.Pattern;
 import java.util.zip.ZipEntry;
+import java.util.zip.ZipError;
+import java.util.zip.ZipException;
 import java.util.zip.ZipFile;
 import java.util.zip.ZipOutputStream;
 
@@ -731,7 +733,20 @@ public final class TestPackage {
         }
         
         // Plain Text - Stream
+        try {
+            OPCPackage.open(files.openResourceAsStream("SampleSS.txt"));
+            fail("Shouldn't be able to open Plain Text");
+        } catch (NotOfficeXmlFileException e) {
+            assertTrue(e.getMessage().indexOf("No valid entries or contents found") > -1);
+            assertTrue(e.getMessage().indexOf("not a valid OOXML") > -1);
+        }
         // Plain Text - File
+        try {
+            OPCPackage.open(files.getFile("SampleSS.txt"));
+            fail("Shouldn't be able to open Plain Text");
+        } catch (InvalidOperationException e) {
+            // Unhelpful low-level error, sorry
+        }
     }
 
     @Test(expected=IOException.class)