report non-matching identifiers in OPF and NCX as an error again

resolves #669 refs #329
w3c · Oct 25, 2017 · 515682d · 515682d
1 parent b9f3024
commit 515682d
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 7 deletions.
diff --git a/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java b/src/main/java/com/adobe/epubcheck/messages/MessageDictionary.java
@@ -185,7 +185,7 @@ static Map<MessageId, Severity> getDefaultSeverities()
       map.put(MessageId.NAV_009, Severity.ERROR);
 
       // NCX
-      map.put(MessageId.NCX_001, Severity.USAGE);
+      map.put(MessageId.NCX_001, Severity.ERROR);
       map.put(MessageId.NCX_002, Severity.ERROR);
       map.put(MessageId.NCX_003, Severity.USAGE);
       map.put(MessageId.NCX_004, Severity.USAGE);

diff --git a/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java b/src/test/java/com/adobe/epubcheck/api/Epub20CheckExpandedTest.java
@@ -163,7 +163,7 @@ public void testIssue329_IDSpaces()
   @Test
   public void testIssue329_NonMatchingId()
   {
-    // expectedWarnings.add(MessageId.NCX_001); // Now USAGE
+    expectedErrors.add(MessageId.NCX_001);
     testValidateDocument("invalid/ncx-uid-nomatch");
   }
 

diff --git a/src/test/resources/20/epub/ContainerNotOPF20.epub b/src/test/resources/20/epub/ContainerNotOPF20.epub
diff --git a/src/test/resources/20/epub/EmptyDir20.epub b/src/test/resources/20/epub/EmptyDir20.epub
diff --git a/src/test/resources/20/epub/MetaInfNotOPF20.epub b/src/test/resources/20/epub/MetaInfNotOPF20.epub
diff --git a/src/test/resources/20/epub/Non8601Date20.epub b/src/test/resources/20/epub/Non8601Date20.epub
diff --git a/src/test/resources/20/epub/NullDate20.epub b/src/test/resources/20/epub/NullDate20.epub
diff --git a/src/test/resources/20/epub/OPFIllegalElement20.epub b/src/test/resources/20/epub/OPFIllegalElement20.epub
diff --git a/src/test/resources/20/epub/PageMap20.epub b/src/test/resources/20/epub/PageMap20.epub
diff --git a/src/test/resources/20/epub/Test20.epub b/src/test/resources/20/epub/Test20.epub
diff --git a/src/test/resources/20/epub/Unmanifested20.epub b/src/test/resources/20/epub/Unmanifested20.epub
diff --git a/src/test/resources/20/epub/UnmanifestedGuideItems20.epub b/src/test/resources/20/epub/UnmanifestedGuideItems20.epub
diff --git a/src/test/resources/20/epub/invalid/issue170.epub b/src/test/resources/20/epub/invalid/issue170.epub
diff --git a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.ncx
@@ -4,7 +4,7 @@
     version="2005-1"
     xml:lang="en">
     <head>
-        <meta name="dtb:uid" content="urn:uuid:4ADD6D78-8F7E-4BCB-BB03-EB07560F46E7"/>
+        <meta name="dtb:uid" content="urn:uuid:6179D963-C94E-459B-A7A4-4139D120998E"/>
         <meta name="dtb:depth" content="1"/>
         <meta name="dtb:totalPageCount" content="0"/>
         <meta name="dtb:maxPageNumber" content="0"/>

diff --git a/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf b/src/test/resources/20/expanded/valid/lorem-xrenditions-2ops/EPUB_2/lorem.opf
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <package xmlns="http://www.idpf.org/2007/opf" version="2.0" unique-identifier="uid">
     <metadata xmlns:dc="http://purl.org/dc/elements/1.1/">
-        <dc:identifier id="uid">urn:uuid:4ADD6D78-8F7E-4BCB-BB03-EB07560F46E7</dc:identifier>
+        <dc:identifier id="uid">urn:uuid:6179D963-C94E-459B-A7A4-4139D120998E</dc:identifier>
         <dc:title>Lorem Ipsum - alt</dc:title>        
         <dc:language>la</dc:language>
         <dc:date>2012-10-17</dc:date>        

diff --git a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension.zip b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension.zip
diff --git a/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json b/src/test/resources/com/adobe/epubcheck/test/package/wrong_extension_expected_results.json
@@ -109,10 +109,10 @@
     "id" : "ncx",
     "fileName" : "OPS/toc.ncx",
     "media_type" : "application/x-dtbncx+xml",
-    "compressedSize" : 326,
-    "uncompressedSize" : 624,
+    "compressedSize" : 329,
+    "uncompressedSize" : 642,
     "compressionMethod" : "Deflated",
-    "checkSum" : "913b6f1c2783e126ab6b175bd8547e236d2736d9228503c1470e1213957d85e",
+    "checkSum" : "9e69dbe536e1f03e2447556f7159dec1b7eca4785f45436aa753313d5729b0a9",
     "isSpineItem" : false,
     "spineIndex" : null,
     "isLinear" : false,