validator: fix ODFRootPackageValidator::validateMimetype()

Mike Kaganski reported that presentation templates were causing
odfvalidator.org to report "The document is NOT conformant ODF1.3!".

It turns out there were several problems:
* presentation template was missing/not checked
* wrong media types cause logInfo, but an error will be reported
  to the caller, which is confusing, as it's not obvious
  to the user what caused the error
* database (new in ODF 1.2) and text master template media types
  were also missing

Author: Michael Stahl

validator/src/main/java/org/odftoolkit/odfvalidator/ODFMediaTypes.java

@@ -51,5 +51,8 @@ public abstract class ODFMediaTypes {
       "application/vnd.oasis.opendocument.formula-template";
   public static final String TEXT_MASTER_MEDIA_TYPE =
       "application/vnd.oasis.opendocument.text-master";
+  public static final String TEXT_MASTER_TEMPLATE_MEDIA_TYPE =
+      "application/vnd.oasis.opendocument.text-master";
   public static final String TEXT_WEB_MEDIA_TYPE = "application/vnd.oasis.opendocument.text-web";
+  public static final String DATABASE_MEDIA_TYPE = "application/vnd.oasis.opendocument.base";
 }

validator/src/main/java/org/odftoolkit/odfvalidator/ODFRootPackageValidator.java

@@ -165,6 +165,7 @@ private boolean validateMimetype(Logger aLogger, OdfVersion aVersion) {
         || aMimetype.equals(ODFMediaTypes.GRAPHICS_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.GRAPHICS_TEMPLATE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.PRESENTATION_MEDIA_TYPE)
+        || aMimetype.equals(ODFMediaTypes.PRESENTATION_TEMPLATE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.SPREADSHEET_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.SPREADSHEET_TEMPLATE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.CHART_MEDIA_TYPE)
@@ -173,9 +174,11 @@ private boolean validateMimetype(Logger aLogger, OdfVersion aVersion) {
         || aMimetype.equals(ODFMediaTypes.IMAGE_TEMPLATE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.FORMULA_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.FORMULA_TEMPLATE_MEDIA_TYPE)
+        || aMimetype.equals(ODFMediaTypes.DATABASE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.TEXT_MASTER_MEDIA_TYPE)
+        || aMimetype.equals(ODFMediaTypes.TEXT_MASTER_TEMPLATE_MEDIA_TYPE)
         || aMimetype.equals(ODFMediaTypes.TEXT_WEB_MEDIA_TYPE))) {
-      aLogger.logInfo("mimetype is not an ODFMediaTypes mimetype.", false);
+      aLogger.logError("mimetype is not an ODFMediaTypes mimetype.");
       bHasErrors = true;
     }
 

validator/src/test/java/org/odftoolkit/odfvalidator/InvalidPackageTest.java

@@ -42,6 +42,9 @@ public void validatePackage1() {
       t.printStackTrace();
       Assert.fail(t.toString());
     }
+    Assert.assertTrue(
+        output.contains(
+            "testInvalidPkg1.odt/mimetype:  Error: mimetype is not an ODFMediaTypes mimetype"));
     Assert.assertTrue(
         output.contains(
             "testInvalidPkg1.odt/mimetype:  Error: The file 'mimetype' is not the first file in the ODF package"));
@@ -54,7 +57,7 @@ public void validatePackage1() {
     Assert.assertTrue(
         output.contains(
             "testInvalidPkg1.odt/META-INF/manifest.xml:  Error: The file 'Configurations2/accelerator/current.xml' shall not be listed in the 'META-INF/manifest.xml' file as it does not exist in the ODF package"));
-    Assert.assertTrue(output.contains("testInvalidPkg1.odt:  Info: 7 errors, 10 warnings"));
+    Assert.assertTrue(output.contains("testInvalidPkg1.odt:  Info: 8 errors, 10 warnings"));
   }
 
   @Test
@@ -67,6 +70,9 @@ public void validatePackage1_V1_1() {
       t.printStackTrace();
       Assert.fail(t.toString());
     }
+    Assert.assertTrue(
+        output.contains(
+            "testInvalidPkg1.odt/mimetype:  Error: mimetype is not an ODFMediaTypes mimetype"));
     Assert.assertTrue(
         output.contains(
             "testInvalidPkg1.odt/mimetype:  Warning: The file 'mimetype' is not the first file in the ODF package"));
@@ -79,7 +85,7 @@ public void validatePackage1_V1_1() {
     Assert.assertTrue(
         output.contains(
             "testInvalidPkg1.odt/META-INF/manifest.xml:  Error: The file 'Configurations2/accelerator/current.xml' shall not be listed in the 'META-INF/manifest.xml' file as it does not exist in the ODF package"));
-    Assert.assertTrue(output.contains("testInvalidPkg1.odt:  Info: 10 errors, 11 warnings"));
+    Assert.assertTrue(output.contains("testInvalidPkg1.odt:  Info: 11 errors, 11 warnings"));
   }
 
   @Test