fix: consider all video/* as video media types

Previously, only `video/h264`, `video/mp4`, and `video/webm` were
treated as video types.

This change also adds a method `isCommonVideoType(String type)` to
`OPFChecker30.java`, so that usage check OPF_036 can still be made.

See also #469

src/main/java/com/adobe/epubcheck/ctc/xml/HTMLTagsAnalyseHandler.java

@@ -1,7 +1,7 @@
 package com.adobe.epubcheck.ctc.xml;
 
 import static com.adobe.epubcheck.opf.OPFChecker30.isBlessedAudioType;
-import static com.adobe.epubcheck.opf.OPFChecker30.isBlessedVideoType;
+import static com.adobe.epubcheck.opf.OPFChecker30.isCommonVideoType;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -203,7 +203,7 @@ public void startElement(String uri, String localName, String qName, Attributes
  {
  String mimeType = attributes.getValue("type");
 
- if (mimeType == null || !isBlessedVideoType(mimeType))
+ if (mimeType == null || !isCommonVideoType(mimeType))
  {
  if (mimeType == null)
  {

src/main/java/com/adobe/epubcheck/opf/OPFChecker30.java

@@ -470,8 +470,13 @@ public static boolean isBlessedAudioType(String type)
 
  public static boolean isBlessedVideoType(String type)
  {
- return type.startsWith("video/h264") || type.startsWith("video/webm")
- || type.startsWith("video/mp4");
+ return type.startsWith("video/");
+ }
+
+ public static boolean isCommonVideoType(String type)
+ {
+ return "video/h264".equals(type) || "video/webm".equals(type)
+ || "video/mp4".equals(type);
  }
 
  public static boolean isBlessedFontType(String type)

src/test/java/com/adobe/epubcheck/api/Epub30CheckExpandedTest.java

@@ -143,10 +143,10 @@ public void testValidateEPUBPLoremBindings()
  }
 
  @Test
- public void testValidateEPUBPLoremInvalidBindings()
+ public void testValidateEPUBPLoremBindingsWithNativeFallback()
  {
- Collections.addAll(expectedErrors, MessageId.MED_002);
- testValidateDocument("invalid/lorem-bindings");
+ // tests that an object element with both bindings and native fallback is allowed
+ testValidateDocument("valid/lorem-bindings-withnativefallback");
  }
 
  @Test

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

@@ -372,25 +372,6 @@ public void testInvalidLoremBasic30()
  assertTrue(testReport.hasInfoMessage("[format version] 3.0.1"));
  }
 
- @Test
- public void testInvalidLoremBindings30()
- {
- ValidationReport testReport = testOcfPackage("/30/expanded/invalid/lorem-bindings/",
- EPUBVersion.VERSION_3);
- if (1 != testReport.getErrorCount() || 0 != testReport.getWarningCount())
- {
- outWriter.println(testReport);
- }
- assertTrue(
- testReport.errorList.get(0).message.contains("Object element doesn't provide fallback"));
- List<MessageId> errors = new ArrayList<MessageId>();
- Collections.addAll(errors, MessageId.MED_002);
- assertEquals(errors, testReport.getErrorIds());
- assertEquals(0, testReport.getWarningCount());
-
- assertTrue(testReport.hasInfoMessage("[format version] 3.0.1"));
- }
-
  @Test
  public void testInvalidLoremForeign30()
  {

src/test/resources/30/expanded/invalid/lorem-bindings/EPUB/lorem.opf → src/test/resources/30/expanded/valid/lorem-bindings-withnativefallback/EPUB/lorem.opf

@@ -2,22 +2,22 @@
 <package xmlns="http://www.idpf.org/2007/opf" version="3.0" unique-identifier="uid">
  <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
  <dc:identifier id="uid">urn:uuid:550e8400-e29b-41d4-a716-446667441231</dc:identifier>
- <dc:title>Lorem Ipsum</dc:title> 
+ <dc:title>Lorem Ipsum</dc:title>
  <dc:language>la</dc:language>
  <dc:date>2011-09-01</dc:date>
  <meta property="dcterms:modified">2011-09-01T17:18:00Z</meta>
- </metadata> 
+ </metadata>
  <manifest>
- <item id="t1" href="lorem.xhtml" properties="nav scripted" media-type="application/xhtml+xml" /> 
- <item id="css" href="lorem.css" media-type="text/css" />
- <item id="slideshow" href="slideshow.xml" media-type="application/x-demo-slideshow2" />
- <item id="video" href="video.avi" media-type="video/avi" />
+ <item id="t1" href="lorem.xhtml" properties="nav scripted"
+ media-type="application/xhtml+xml"/>
+ <item id="css" href="lorem.css" media-type="text/css"/>
+ <item id="slideshow" href="slideshow.xml" media-type="application/x-demo-slideshow2"/>
+ <item id="video" href="video.mp4" media-type="video/mp4"/>
  </manifest>
  <spine>
- <itemref idref="t1" /> 
- </spine> 
- <bindings>
- <mediaType handler="t1"
- media-type="application/x-demo-slideshow"/>
+ <itemref idref="t1"/>
+ </spine>
+ <bindings>
+ <mediaType handler="t1" media-type="application/x-demo-slideshow"/>
  </bindings>
-</package>
+</package>

src/test/resources/30/expanded/invalid/lorem-bindings/EPUB/lorem.xhtml → src/test/resources/30/expanded/valid/lorem-bindings-withnativefallback/EPUB/lorem.xhtml

@@ -13,7 +13,7 @@
 
  <object type="application/x-demo-slideshow3">
  <object data="slideshow.xml" type="application/x-demo-slideshow2">
- <video src="video.avi" >
+ <video src="video.mp4" >
 
  </video>
  </object>