From 035effaf9be340528b0c53f56c99748d3bba2eca Mon Sep 17 00:00:00 2001 From: Romain Deltour Date: Thu, 17 Nov 2022 21:20:40 +0100 Subject: [PATCH] fix: declaring prefixes for default vocabs is an error This commit reverts `OPF-007b` to being an error. Fixes #1306 --- .../java/com/adobe/epubcheck/messages/DefaultSeverities.java | 2 +- src/test/java/com/adobe/epubcheck/vocab/VocabTest.java | 2 +- .../epub3/D-vocabularies/vocabulary-association.feature | 4 +--- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java b/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java index 5b11ad34e..0383b3e67 100644 --- a/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java +++ b/src/main/java/com/adobe/epubcheck/messages/DefaultSeverities.java @@ -199,7 +199,7 @@ private void initialize() severities.put(MessageId.OPF_006, Severity.ERROR); severities.put(MessageId.OPF_007, Severity.WARNING); severities.put(MessageId.OPF_007a, Severity.ERROR); - severities.put(MessageId.OPF_007b, Severity.WARNING); + severities.put(MessageId.OPF_007b, Severity.ERROR); severities.put(MessageId.OPF_008, Severity.ERROR); severities.put(MessageId.OPF_009, Severity.ERROR); severities.put(MessageId.OPF_010, Severity.ERROR); diff --git a/src/test/java/com/adobe/epubcheck/vocab/VocabTest.java b/src/test/java/com/adobe/epubcheck/vocab/VocabTest.java index a8d1ef191..e6821a186 100644 --- a/src/test/java/com/adobe/epubcheck/vocab/VocabTest.java +++ b/src/test/java/com/adobe/epubcheck/vocab/VocabTest.java @@ -375,7 +375,7 @@ public void testUnderscorePrefix() @Test public void testDefaultDeclaredPrefix() { - expectedWarnings.add(MessageId.OPF_007b); + expectedErrors.add(MessageId.OPF_007b); Map actual = testVocabs( "default: http://example.org/default# hello: http://example.org/hello#"); assertThat(actual.entrySet().size(), is(PREDEF_VOCABS.keySet().size() + 1)); diff --git a/src/test/resources/epub3/D-vocabularies/vocabulary-association.feature b/src/test/resources/epub3/D-vocabularies/vocabulary-association.feature index 0cab8d701..20deee10f 100644 --- a/src/test/resources/epub3/D-vocabularies/vocabulary-association.feature +++ b/src/test/resources/epub3/D-vocabularies/vocabulary-association.feature @@ -27,10 +27,8 @@ Feature: EPUB 3 — Vocabularies — Vocabulary association @spec @xref:sec-prefix-attr Scenario: default vocabularies must not be assigned a prefix - Note: This should be an error, but is currently reported as a warning - See issue 522: https://github.com/w3c/epubcheck/issues/522 When checking file 'property-prefix-declaration-default-vocabs-error.opf' - Then warning OPF-007b is reported 4 times (once for each default vocabulary) + Then error OPF-007b is reported 4 times (once for each default vocabulary) And no other errors or warnings are reported @spec @xref:sec-prefix-attr