diff --git a/src/main/java/com/adobe/epubcheck/util/EPUBVersion.java b/src/main/java/com/adobe/epubcheck/util/EPUBVersion.java index 72ddc6069..99d6bbe56 100644 --- a/src/main/java/com/adobe/epubcheck/util/EPUBVersion.java +++ b/src/main/java/com/adobe/epubcheck/util/EPUBVersion.java @@ -24,7 +24,7 @@ public enum EPUBVersion { - Unknown("unknown"), VERSION_2("2.0.1"), VERSION_3("3.0.1"); + Unknown("unknown"), VERSION_2("2.0.1"), VERSION_3("3.2"); private final String version; diff --git a/src/test/java/com/adobe/epubcheck/ocf/OCFCheckerTest.java b/src/test/java/com/adobe/epubcheck/ocf/OCFCheckerTest.java index db8dd43ba..e7e1e5725 100644 --- a/src/test/java/com/adobe/epubcheck/ocf/OCFCheckerTest.java +++ b/src/test/java/com/adobe/epubcheck/ocf/OCFCheckerTest.java @@ -27,7 +27,6 @@ includes the relinquishment of all rights to enforce (by lawsuit import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; -import java.io.PrintStream; import java.util.ArrayList; import java.util.Collections; import java.util.List; @@ -39,7 +38,6 @@ includes the relinquishment of all rights to enforce (by lawsuit import com.adobe.epubcheck.messages.MessageId; import com.adobe.epubcheck.opf.ValidationContext.ValidationContextBuilder; -import com.adobe.epubcheck.test.NoExitSecurityManager; import com.adobe.epubcheck.util.EPUBVersion; import com.adobe.epubcheck.util.ValidationReport; import com.adobe.epubcheck.util.outWriter; @@ -48,6 +46,7 @@ public class OCFCheckerTest { private Locale defaultLocale; + private static final String VERSION_STRING = "[format version] "+EPUBVersion.VERSION_3; @Before public void before() throws Exception @@ -116,7 +115,7 @@ public void testLoremBasic30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -133,7 +132,7 @@ public void testLoremBasic30Against20() Collections.addAll(warnings, MessageId.PKG_001); assertEquals(warnings, testReport.getWarningIds()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); assertTrue(testReport .hasInfoMessage("[unique identifier] urn:uuid:550e8400-e29b-41d4-a716-446667441231")); } @@ -168,7 +167,7 @@ public void testLoremAudio30() } assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -183,7 +182,7 @@ public void testLoremForeign30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -198,7 +197,7 @@ public void testLoremLink30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -213,7 +212,7 @@ public void testLoremPoster30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -228,7 +227,7 @@ public void testLoremSVG30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -243,7 +242,7 @@ public void testLoremHyperlink30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -258,7 +257,7 @@ public void testLoremWasteland30() assertEquals(0, testReport.getErrorCount()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -324,7 +323,7 @@ public void testInvalidLoremForeign30() assertEquals(errors, testReport.getErrorIds()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -342,7 +341,7 @@ public void testInvalidLoremPoster30() assertEquals(errors, testReport.getErrorIds()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -360,7 +359,7 @@ public void testInvalidLoremRNG30() assertEquals(errors, testReport.getErrorIds()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } @Test @@ -383,6 +382,6 @@ public void testInvalidLoremSCH30() assertEquals(errors, testReport.getErrorIds()); assertEquals(0, testReport.getWarningCount()); - assertTrue(testReport.hasInfoMessage("[format version] 3.0.1")); + assertTrue(testReport.hasInfoMessage(VERSION_STRING)); } } diff --git a/src/test/resources/30/epub/invalid/extension-1.txt b/src/test/resources/30/epub/invalid/extension-1.txt index 4d0c8d4b2..1859bb094 100644 --- a/src/test/resources/30/epub/invalid/extension-1.txt +++ b/src/test/resources/30/epub/invalid/extension-1.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/epub30-spec.txt b/src/test/resources/30/epub/valid/epub30-spec.txt index 2616cdd63..0fb1ac271 100644 --- a/src/test/resources/30/epub/valid/epub30-spec.txt +++ b/src/test/resources/30/epub/valid/epub30-spec.txt @@ -1,6 +1,6 @@ [creation date] 2012-02-14T11:20:00Z [modification date] 2012-02-27T16:38:35Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] EPUB 3.0 Specification [creator] EPUB 3 Working Group diff --git a/src/test/resources/30/epub/valid/font_fallback_chain.txt b/src/test/resources/30/epub/valid/font_fallback_chain.txt index d20c6fbcf..9d783c556 100644 --- a/src/test/resources/30/epub/valid/font_fallback_chain.txt +++ b/src/test/resources/30/epub/valid/font_fallback_chain.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/issue145.txt b/src/test/resources/30/epub/valid/issue145.txt index 46b56b07d..eaa67cf65 100644 --- a/src/test/resources/30/epub/valid/issue145.txt +++ b/src/test/resources/30/epub/valid/issue145.txt @@ -1,5 +1,5 @@ [creation date] 2011-12-13T18:37:18Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Abroad [creator] Thomas Crane diff --git a/src/test/resources/30/epub/valid/issue158.txt b/src/test/resources/30/epub/valid/issue158.txt index 779d73fe3..eec70eb7d 100644 --- a/src/test/resources/30/epub/valid/issue158.txt +++ b/src/test/resources/30/epub/valid/issue158.txt @@ -1,5 +1,5 @@ [creation date] 2012-02-29T06:12:48Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] external resource example epub [creator] KOJIMA Satoshi diff --git a/src/test/resources/30/epub/valid/lorem.txt b/src/test/resources/30/epub/valid/lorem.txt index 4d0c8d4b2..1859bb094 100644 --- a/src/test/resources/30/epub/valid/lorem.txt +++ b/src/test/resources/30/epub/valid/lorem.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/mp3-in-manifest.txt b/src/test/resources/30/epub/valid/mp3-in-manifest.txt index 499960e45..1d71c6736 100644 --- a/src/test/resources/30/epub/valid/mp3-in-manifest.txt +++ b/src/test/resources/30/epub/valid/mp3-in-manifest.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/mp3-with-fallback.txt b/src/test/resources/30/epub/valid/mp3-with-fallback.txt index 499960e45..1d71c6736 100644 --- a/src/test/resources/30/epub/valid/mp3-with-fallback.txt +++ b/src/test/resources/30/epub/valid/mp3-with-fallback.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/test_svg.txt b/src/test/resources/30/epub/valid/test_svg.txt index 4cfc9e428..be0f001d7 100644 --- a/src/test/resources/30/epub/valid/test_svg.txt +++ b/src/test/resources/30/epub/valid/test_svg.txt @@ -1,5 +1,5 @@ [creation date] 2011-09-01T17:16:54Z -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/epub/valid/valid-ncx.txt b/src/test/resources/30/epub/valid/valid-ncx.txt index f9c6a903b..e20da56f8 100644 --- a/src/test/resources/30/epub/valid/valid-ncx.txt +++ b/src/test/resources/30/epub/valid/valid-ncx.txt @@ -1,5 +1,5 @@ [creation date] 1314890214000 -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/fallback-bindings.txt b/src/test/resources/30/expanded/valid/fallback-bindings.txt index 6c8c3353e..0499c0fc7 100644 --- a/src/test/resources/30/expanded/valid/fallback-bindings.txt +++ b/src/test/resources/30/expanded/valid/fallback-bindings.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/fallback-object-native.txt b/src/test/resources/30/expanded/valid/fallback-object-native.txt index 315b275d1..fc5ae4958 100644 --- a/src/test/resources/30/expanded/valid/fallback-object-native.txt +++ b/src/test/resources/30/expanded/valid/fallback-object-native.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/fallbacks.txt b/src/test/resources/30/expanded/valid/fallbacks.txt index 9a817510d..58c67334c 100644 --- a/src/test/resources/30/expanded/valid/fallbacks.txt +++ b/src/test/resources/30/expanded/valid/fallbacks.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/issue267.txt b/src/test/resources/30/expanded/valid/issue267.txt index 1a6d0bfda..64a5e7020 100644 --- a/src/test/resources/30/expanded/valid/issue267.txt +++ b/src/test/resources/30/expanded/valid/issue267.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] My Main Title [title] First Subtitle diff --git a/src/test/resources/30/expanded/valid/lorem-audio.txt b/src/test/resources/30/expanded/valid/lorem-audio.txt index 50bfa72f9..d7a9ef964 100644 --- a/src/test/resources/30/expanded/valid/lorem-audio.txt +++ b/src/test/resources/30/expanded/valid/lorem-audio.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-basic-dual.txt b/src/test/resources/30/expanded/valid/lorem-basic-dual.txt index 1ee8d380d..41109f7aa 100644 --- a/src/test/resources/30/expanded/valid/lorem-basic-dual.txt +++ b/src/test/resources/30/expanded/valid/lorem-basic-dual.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-basic.txt b/src/test/resources/30/expanded/valid/lorem-basic.txt index 7cc97b5e6..4af3151ff 100644 --- a/src/test/resources/30/expanded/valid/lorem-basic.txt +++ b/src/test/resources/30/expanded/valid/lorem-basic.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-css-import.txt b/src/test/resources/30/expanded/valid/lorem-css-import.txt index 7bda422c2..91cceb5a7 100644 --- a/src/test/resources/30/expanded/valid/lorem-css-import.txt +++ b/src/test/resources/30/expanded/valid/lorem-css-import.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-foreign.txt b/src/test/resources/30/expanded/valid/lorem-foreign.txt index a262dfb06..b1d17102d 100644 --- a/src/test/resources/30/expanded/valid/lorem-foreign.txt +++ b/src/test/resources/30/expanded/valid/lorem-foreign.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-link.txt b/src/test/resources/30/expanded/valid/lorem-link.txt index 1720d3a8e..5fca4f31e 100644 --- a/src/test/resources/30/expanded/valid/lorem-link.txt +++ b/src/test/resources/30/expanded/valid/lorem-link.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-poster.txt b/src/test/resources/30/expanded/valid/lorem-poster.txt index edae5933a..851ebf50a 100644 --- a/src/test/resources/30/expanded/valid/lorem-poster.txt +++ b/src/test/resources/30/expanded/valid/lorem-poster.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-remote.txt b/src/test/resources/30/expanded/valid/lorem-remote.txt index aef134ea0..223985bec 100644 --- a/src/test/resources/30/expanded/valid/lorem-remote.txt +++ b/src/test/resources/30/expanded/valid/lorem-remote.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-svg-dual.txt b/src/test/resources/30/expanded/valid/lorem-svg-dual.txt index 7bda422c2..91cceb5a7 100644 --- a/src/test/resources/30/expanded/valid/lorem-svg-dual.txt +++ b/src/test/resources/30/expanded/valid/lorem-svg-dual.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-svg-hyperlink.txt b/src/test/resources/30/expanded/valid/lorem-svg-hyperlink.txt index 361a61fc5..b5e4aeaeb 100644 --- a/src/test/resources/30/expanded/valid/lorem-svg-hyperlink.txt +++ b/src/test/resources/30/expanded/valid/lorem-svg-hyperlink.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/lorem-svg.txt b/src/test/resources/30/expanded/valid/lorem-svg.txt index 361a61fc5..b5e4aeaeb 100644 --- a/src/test/resources/30/expanded/valid/lorem-svg.txt +++ b/src/test/resources/30/expanded/valid/lorem-svg.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/svg-cover.txt b/src/test/resources/30/expanded/valid/svg-cover.txt index 361a61fc5..b5e4aeaeb 100644 --- a/src/test/resources/30/expanded/valid/svg-cover.txt +++ b/src/test/resources/30/expanded/valid/svg-cover.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] Lorem Ipsum [language] la diff --git a/src/test/resources/30/expanded/valid/svg-in-spine.txt b/src/test/resources/30/expanded/valid/svg-in-spine.txt index d054262cf..24ee559cd 100644 --- a/src/test/resources/30/expanded/valid/svg-in-spine.txt +++ b/src/test/resources/30/expanded/valid/svg-in-spine.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] SVG in Spine [creator] EPUB Sample project diff --git a/src/test/resources/30/expanded/valid/wasteland-basic.txt b/src/test/resources/30/expanded/valid/wasteland-basic.txt index 83f66af68..61a6d7363 100644 --- a/src/test/resources/30/expanded/valid/wasteland-basic.txt +++ b/src/test/resources/30/expanded/valid/wasteland-basic.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] The Waste Land [creator] T.S. Eliot diff --git a/src/test/resources/30/expanded/valid/wasteland-otf.txt b/src/test/resources/30/expanded/valid/wasteland-otf.txt index aefd39073..74104dd53 100644 --- a/src/test/resources/30/expanded/valid/wasteland-otf.txt +++ b/src/test/resources/30/expanded/valid/wasteland-otf.txt @@ -1,5 +1,5 @@ # creation date is not stable between different runs -[format version] 3.0.1 +[format version] 3.2 [format name] application/epub+zip [title] The Waste Land [creator] T.S. Eliot diff --git a/src/test/resources/com/adobe/epubcheck/test/command_line/failonwarnings_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/command_line/failonwarnings_expected_results.json index c1c43953a..0b7d6a31a 100644 --- a/src/test/resources/com/adobe/epubcheck/test/command_line/failonwarnings_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/command_line/failonwarnings_expected_results.json @@ -122,7 +122,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/command_line/jsonfile_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/command_line/jsonfile_expected_results.json index 8e9a22dad..65920d4fb 100644 --- a/src/test/resources/com/adobe/epubcheck/test/command_line/jsonfile_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/command_line/jsonfile_expected_results.json @@ -110,7 +110,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/command_line/passonwarnings_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/command_line/passonwarnings_expected_results.json index 77f792f0a..bdeaf780b 100644 --- a/src/test/resources/com/adobe/epubcheck/test/command_line/passonwarnings_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/command_line/passonwarnings_expected_results.json @@ -110,7 +110,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/command_line/severity_overrideBadMessage_expected_results.txt b/src/test/resources/com/adobe/epubcheck/test/command_line/severity_overrideBadMessage_expected_results.txt index bb734a6ba..ff4e9a085 100644 --- a/src/test/resources/com/adobe/epubcheck/test/command_line/severity_overrideBadMessage_expected_results.txt +++ b/src/test/resources/com/adobe/epubcheck/test/command_line/severity_overrideBadMessage_expected_results.txt @@ -1,7 +1,7 @@ Start command_line test('severity_overrideBadMessage') ERROR(CHK-004): ./com/adobe/epubcheck/test/command_line/severity(1,0): The custom message contains too many parameters in message overrides file './com/adobe/epubcheck/test/command_line/severity_overrideBadMessage.txt'. ERROR(CHK-005): ./com/adobe/epubcheck/test/command_line/severity(2,0): The custom suggestion contains too many parameters in message overrides file './com/adobe/epubcheck/test/command_line/severity_overrideBadMessage.txt'. -Validating using EPUB version 3.0.1 rules. +Validating using EPUB version 3.2 rules. ERROR(CSS-001): ./com/adobe/epubcheck/test/command_line/severity.epub/OPS/style_tag_css.xhtml(27,13): The 'unicode-bidi' property must not be included in an EPUB Style Sheet. WARNING(CSS-006): ./com/adobe/epubcheck/test/command_line/severity.epub/OPS/style_tag_css.xhtml(38,13): CSS position:fixed property should not be used in EPUBs. ERROR(CSS-001): ./com/adobe/epubcheck/test/command_line/severity.epub/OPS/inline_css.xhtml(14,1): The 'unicode-bidi' property must not be included in an EPUB Style Sheet. diff --git a/src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xmp b/src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xmp index 349c10446..e2737e1d9 100644 --- a/src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xmp +++ b/src/test/resources/com/adobe/epubcheck/test/command_line/xmlfile_expected_results.xmp @@ -7,7 +7,7 @@ xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" - dc:format="application/epub+zip;version=3.0.1" + dc:format="application/epub+zip;version=3.2" dc:identifier="000000000000000000" dc:language="en" extended-properties:Characters="648" diff --git a/src/test/resources/com/adobe/epubcheck/test/css/alternate_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/alternate_expected_results.json index 0e3d58b7b..be46d00b7 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/alternate_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/alternate_expected_results.json @@ -110,7 +110,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/columns_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/columns_expected_results.json index 99b2c5c4d..71943fbc6 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/columns_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/columns_expected_results.json @@ -127,7 +127,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/discouraged_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/discouraged_expected_results.json index 49feac5d7..7a684d031 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/discouraged_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/discouraged_expected_results.json @@ -526,7 +526,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/excessive_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/excessive_epub3_expected_results.json index cd37c2536..511bcb8c7 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/excessive_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/excessive_epub3_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.json index 83875f741..2176cf435 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.json @@ -381,7 +381,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.xmp b/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.xmp index a677b2b68..6d1f54bb1 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.xmp +++ b/src/test/resources/com/adobe/epubcheck/test/css/font-face_expected_results.xmp @@ -7,7 +7,7 @@ xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" - dc:format="application/epub+zip;version=3.0.1" + dc:format="application/epub+zip;version=3.2" dc:identifier="000000000000000000" dc:language="en" extended-properties:Characters="2205" diff --git a/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.json index 3cf766c74..e9c40f439 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.json @@ -270,7 +270,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.xmp b/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.xmp index 4b36d21d1..b032fd697 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.xmp +++ b/src/test/resources/com/adobe/epubcheck/test/css/font_encryption_idpf_expected_results.xmp @@ -7,7 +7,7 @@ xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#" xmlns:xmp="http://ns.adobe.com/xap/1.0/" xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" - dc:format="application/epub+zip;version=3.0.1" + dc:format="application/epub+zip;version=3.2" dc:identifier="epub3.test" dc:language="en-US" dc:publisher="Epub3 Team" diff --git a/src/test/resources/com/adobe/epubcheck/test/css/keyframe_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/keyframe_expected_results.json index bc63ee03c..ea4fe15aa 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/keyframe_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/keyframe_expected_results.json @@ -115,7 +115,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/multiple_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/multiple_epub3_expected_results.json index 2b5e5e781..e591f8b94 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/multiple_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/multiple_epub3_expected_results.json @@ -85,7 +85,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/transform_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/transform_expected_results.json index ea7aef5ad..af8c6d95f 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/transform_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/transform_expected_results.json @@ -110,7 +110,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/css/transition_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/css/transition_expected_results.json index e55b4a97e..e1428c5d6 100644 --- a/src/test/resources/com/adobe/epubcheck/test/css/transition_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/css/transition_expected_results.json @@ -115,7 +115,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/encryption/epub30_font_obfuscation.epub_expected_results.xmp b/src/test/resources/com/adobe/epubcheck/test/encryption/epub30_font_obfuscation.epub_expected_results.xmp index 076cd139a..1390e96a9 100644 --- a/src/test/resources/com/adobe/epubcheck/test/encryption/epub30_font_obfuscation.epub_expected_results.xmp +++ b/src/test/resources/com/adobe/epubcheck/test/encryption/epub30_font_obfuscation.epub_expected_results.xmp @@ -7,7 +7,7 @@ xmlns:xmpTPg="http://ns.adobe.com/xap/1.0/t/pg/" xmlns:stFnt="http://ns.adobe.com/xap/1.0/sType/Font#" xmlns:premis="http://www.loc.gov/premis/rdf/v1#" - dc:format="application/epub+zip;version=3.0.1" + dc:format="application/epub+zip;version=3.2" dc:identifier="code.google.com.epub-samples.wasteland-otf-obfuscated" dc:language="en-US" extended-properties:Characters="31677" diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Epub2_marked_v3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Epub2_marked_v3_expected_results.json index cc31fef11..b59f08800 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Epub2_marked_v3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Epub2_marked_v3_expected_results.json @@ -75,7 +75,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_expected_results.json index 6be388a26..af68f3784 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_expected_results.json index 478d1af1c..b07ee34e6 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_expected_results.json @@ -188,7 +188,7 @@ "renditionLayout" : "pre-paginated", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : true, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_properties_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_properties_expected_results.json index 553bdcc6b..3d315d18b 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_properties_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Excessive_Spine_Items_epub3_fixed_format_properties_expected_results.json @@ -188,7 +188,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : true, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Fallbacks_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Fallbacks_epub3_expected_results.json index a8f944ac2..9919a67d8 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Fallbacks_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Fallbacks_epub3_expected_results.json @@ -63,7 +63,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Media-type_handler_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Media-type_handler_expected_results.json index 1ec88f560..4d7d21426 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Media-type_handler_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Media-type_handler_expected_results.json @@ -152,7 +152,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Mismatched_mimetypes_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Mismatched_mimetypes_epub3_expected_results.json index 61995b06f..049539072 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Mismatched_mimetypes_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Mismatched_mimetypes_epub3_expected_results.json @@ -150,7 +150,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NAV_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NAV_epub3_expected_results.json index 511756ce3..a6ee7bd64 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NAV_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NAV_epub3_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NCX_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NCX_epub3_expected_results.json index c276661e8..87cabcb44 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NCX_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_NCX_epub3_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_Spine_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_Spine_epub3_expected_results.json index c8daed5c7..b6ff5328e 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_Spine_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_Spine_epub3_expected_results.json @@ -87,7 +87,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_metadata_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_metadata_epub3_expected_results.json index 3429f206c..e3e28e492 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_metadata_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_metadata_epub3_expected_results.json @@ -87,7 +87,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_unique_id_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_unique_id_expected_results.json index 950c2c7d2..bc4398abd 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Missing_unique_id_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Missing_unique_id_expected_results.json @@ -87,7 +87,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Properties_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Properties_expected_results.json index 451042a83..b2cde1922 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Properties_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Properties_expected_results.json @@ -140,7 +140,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/Publication_Metadata_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/Publication_Metadata_epub3_expected_results.json index 749037478..76d21ca78 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/Publication_Metadata_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/Publication_Metadata_epub3_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/rendition_valid_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/rendition_valid_expected_results.json index 30b89d6d5..6a406fdbf 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/rendition_valid_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/rendition_valid_expected_results.json @@ -68,7 +68,7 @@ "renditionLayout" : "pre-paginated", "renditionOrientation" : "landscape", "renditionSpread" : "landscape", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : true, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/viewport2_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/viewport2_expected_results.json index 1989e4d8f..453ebe90e 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/viewport2_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/viewport2_expected_results.json @@ -75,7 +75,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : true, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/opf/viewport_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/opf/viewport_expected_results.json index 83418a897..0ee15ff39 100644 --- a/src/test/resources/com/adobe/epubcheck/test/opf/viewport_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/opf/viewport_expected_results.json @@ -139,7 +139,7 @@ "renditionLayout" : "pre-paginated", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : true, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/image_types_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/image_types_expected_results.json index 7c8a70fae..64ebd6c81 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/image_types_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/image_types_expected_results.json @@ -63,7 +63,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/interesting_paths_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/interesting_paths_epub3_expected_results.json index 43e88ca91..60cf2ee61 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/interesting_paths_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/interesting_paths_epub3_expected_results.json @@ -153,7 +153,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/missing_mimetype_file_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/missing_mimetype_file_epub3_expected_results.json index d748b2be3..62168d9de 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/missing_mimetype_file_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/missing_mimetype_file_epub3_expected_results.json @@ -63,7 +63,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/missing_toc_file_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/missing_toc_file_expected_results.json index d50a427ab..1b42adaba 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/missing_toc_file_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/missing_toc_file_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/path_resolution_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/path_resolution_expected_results.json index b96e6ed9f..2ae8a1b67 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/path_resolution_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/path_resolution_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_v3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_v3_expected_results.json index 970de4288..bbf7bcc9a 100644 --- a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_v3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_v3_expected_results.json @@ -26,7 +26,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/scripts/XMLHttpRequest_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/scripts/XMLHttpRequest_expected_results.json index 063bbbb3f..43290e4a0 100644 --- a/src/test/resources/com/adobe/epubcheck/test/scripts/XMLHttpRequest_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/scripts/XMLHttpRequest_expected_results.json @@ -172,7 +172,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/scripts/eval_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/scripts/eval_expected_results.json index 31e042012..22693a853 100644 --- a/src/test/resources/com/adobe/epubcheck/test/scripts/eval_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/scripts/eval_expected_results.json @@ -183,7 +183,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/scripts/properties_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/scripts/properties_expected_results.json index e74bca1f1..df7daa034 100644 --- a/src/test/resources/com/adobe/epubcheck/test/scripts/properties_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/scripts/properties_expected_results.json @@ -244,7 +244,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/scripts/storage_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/scripts/storage_expected_results.json index aa85848bb..1de1f9b2d 100644 --- a/src/test/resources/com/adobe/epubcheck/test/scripts/storage_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/scripts/storage_expected_results.json @@ -208,7 +208,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/scripts/unused_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/scripts/unused_expected_results.json index 2a4c320da..101ef3cde 100644 --- a/src/test/resources/com/adobe/epubcheck/test/scripts/unused_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/scripts/unused_expected_results.json @@ -134,7 +134,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : true, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/toc/fragments_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/toc/fragments_expected_results.json index 56e2e741b..8d4f211d4 100644 --- a/src/test/resources/com/adobe/epubcheck/test/toc/fragments_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/toc/fragments_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/toc/invalid_ncx_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/toc/invalid_ncx_expected_results.json index 0bdfccdde..7e26f5e41 100644 --- a/src/test/resources/com/adobe/epubcheck/test/toc/invalid_ncx_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/toc/invalid_ncx_expected_results.json @@ -104,7 +104,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/toc/missing_epub_type_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/toc/missing_epub_type_expected_results.json index 9d19f2eb0..30979e09d 100644 --- a/src/test/resources/com/adobe/epubcheck/test/toc/missing_epub_type_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/toc/missing_epub_type_expected_results.json @@ -87,7 +87,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/External_media_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/External_media_expected_results.json index 4bbbc735e..ee621afad 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/External_media_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/External_media_expected_results.json @@ -51,7 +51,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/accessibility_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/accessibility_expected_results.json index e461690e8..081de2a87 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/accessibility_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/accessibility_expected_results.json @@ -146,7 +146,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/dtd_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/dtd_expected_results.json index b1ed3d33f..cb64d8394 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/dtd_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/dtd_expected_results.json @@ -140,7 +140,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/epubcfi_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/epubcfi_expected_results.json index eef59c191..4f27036e0 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/epubcfi_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/epubcfi_expected_results.json @@ -90,7 +90,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_deprecated_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_deprecated_epub3_expected_results.json index 5674826d6..6c35510a1 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_deprecated_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_deprecated_epub3_expected_results.json @@ -99,7 +99,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_epub3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_epub3_expected_results.json index 4db0dbc8f..16a3894b0 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_epub3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/html5_epub3_expected_results.json @@ -99,7 +99,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/hyperlinks_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/hyperlinks_expected_results.json index 9af2e0443..ddf3393e0 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/hyperlinks_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/hyperlinks_expected_results.json @@ -342,7 +342,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/lang_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/lang_expected_results.json index 8f94a01f7..9d3fa0156 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/lang_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/lang_expected_results.json @@ -123,7 +123,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps1_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps1_expected_results.json index d8ebc3d9b..a2aa79d5e 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps1_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps1_expected_results.json @@ -133,7 +133,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps2_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps2_expected_results.json index 4e9a1d52d..a660cb87f 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps2_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps2_expected_results.json @@ -26,7 +26,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps3_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps3_expected_results.json index 4b4fcfe1a..817f9b4ee 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps3_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/lorem_pagemaps3_expected_results.json @@ -157,7 +157,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/media_overlays_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/media_overlays_expected_results.json index 3ed87ef62..693c5c56d 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/media_overlays_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/media_overlays_expected_results.json @@ -367,7 +367,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/namespaces_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/namespaces_expected_results.json index 0fbfdf8af..d5c096a99 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/namespaces_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/namespaces_expected_results.json @@ -111,7 +111,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : false, diff --git a/src/test/resources/com/adobe/epubcheck/test/xhtml/nesting_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/xhtml/nesting_expected_results.json index b08fe866b..a47bd5f42 100644 --- a/src/test/resources/com/adobe/epubcheck/test/xhtml/nesting_expected_results.json +++ b/src/test/resources/com/adobe/epubcheck/test/xhtml/nesting_expected_results.json @@ -100,7 +100,7 @@ "renditionLayout" : "reflowable", "renditionOrientation" : "auto", "renditionSpread" : "auto", - "ePubVersion" : "3.0.1", + "ePubVersion" : "3.2", "isScripted" : false, "hasFixedFormat" : false, "isBackwardCompatible" : true,