Check MimeType uncompressed (PR #784, fixes #303)

* check mimetype file should not be compressed (PKG_007)

* test removed because test against 'lorem-mimetype' is already in Epub30CheckExpandedTest
see testValidateEPUBPLoremMimetype() in src/test/java/com/adobe/epubcheck/api/Epub30CheckExpandedTest.java

Author: takahashim

src/main/java/com/adobe/epubcheck/api/EpubCheck.java

@@ -308,6 +308,10 @@ else if (!CheckUtil.checkString(header, 30, "mimetype"))
       {
         report.message(MessageId.PKG_006, EPUBLocation.create(epubFile.getName()));
       }
+      else if (!CheckUtil.checkString(header, 38, "application/epub+zip"))
+      {
+        report.message(MessageId.PKG_007, EPUBLocation.create("mimetype"));
+      }
     }
   }
 

src/main/java/com/adobe/epubcheck/util/CheckUtil.java

@@ -69,13 +69,16 @@ public static boolean checkTrailingSpaces(InputStream input,
     {
       if ((c = input.read()) == -1)
       {
-        return false;
+        return true; // ignored; should be checked by checkEpubHeader() in com.adobe.epubcheck.api.EpubCheck
       }
       else
       {
         baos.write(c);
       }
     }
+    if (! baos.toString().equals("application/epub+zip")) {
+        return true; // ignored; should be checked by checkEpubHeader() in com.adobe.epubcheck.api.EpubCheck
+    }
 
     int ch = input.read();
     if (version == EPUBVersion.VERSION_2 && ch != -1)

src/test/java/com/adobe/epubcheck/ocf/OCFCheckerTest.java

@@ -393,24 +393,6 @@ public void testInvalidLoremForeign30()
     assertTrue(testReport.hasInfoMessage("[format version] 3.0.1"));
   }
 
-  @Test
-  public void testInvalidLoremMimetype30()
-  {
-    ValidationReport testReport = testOcfPackage("/30/expanded/invalid/lorem-mimetype/",
-        EPUBVersion.VERSION_3);
-    if (1 != testReport.getErrorCount() || 0 != testReport.getWarningCount())
-    {
-      outWriter.println(testReport);
-    }
-
-    List<MessageId> errors = new ArrayList<MessageId>();
-    Collections.addAll(errors, MessageId.PKG_007);
-    assertEquals(errors, testReport.getErrorIds());
-    assertEquals(0, testReport.getWarningCount());
-
-    assertTrue(testReport.hasInfoMessage("[format version] 3.0.1"));
-  }
-
   @Test
   public void testInvalidLoremPoster30()
   {