fix(JF-1083): fix PNG matching

Author: welschsn

src/main/resources/magic.xml

@@ -387,20 +387,10 @@
   <type>
     <mime-type>image/png</mime-type>
     <extension>png</extension>
-    <description>PNG image data,</description>
-    <match-string offset="0">\211NG</match-string>
-
-    <type>
-      <mime-type>image/png</mime-type>
-      <extension>png</extension>
-      <description>CORRUPTED,</description>
-      <match-long order="be" offset="4">0xd0a1a0a</match-long>
-    </type>
-    <type>
-      <mime-type>image/png</mime-type>
-      <extension>png</extension>
-      <description></description>
-      <match-long order="be" offset="4">0xd0a1a0a</match-long>
+    <description>PNG image data</description>
+    <description lang="de">PNG Bilddatei</description>
+    <match-string offset="0">\211PNG</match-string>
+    <match-string offset="12">IHDR</match-string>
 
       <type>
         <mime-type>image/png</mime-type>
@@ -462,10 +452,8 @@
         <description>interlaced</description>
         <match-byte order="be" offset="28">0x1</match-byte>
       </type>
-
-    </type>
-
   </type>
+
   <type>
     <mime-type>image/png</mime-type>
     <extension>png</extension>

src/test/java/TestVariousTypes.java

@@ -64,7 +64,33 @@ void testEmptyStream() throws Exception {
     assertEquals("Binary data, ASCII Text Document", results.get(DescriptionAction.KEY));
   }
 
-  public static Stream<Arguments> dataProvider() {
+  public static Stream<Arguments> dataProviderVarious() {
+    return Stream.of(
+        arguments("/various_types/test.png", "image/png", "Binary data, PNG image data, colormap,", "png"),
+        arguments("/various_types/File-PNG_8pbc_GRAY.png", "image/png", "Binary data, PNG image data, grayscale,", "png"),
+        arguments("/various_types/File-PNG_8bpc_RGBA.png", "image/png", "Binary data, PNG image data, \\b/color RGBA,", "png"),
+        arguments("/various_types/File-PNG_16bpc_RGBA.png", "image/png", "Binary data, PNG image data, \\b/color RGBA,", "png")
+    );
+  }
+
+  @ParameterizedTest
+  @MethodSource("dataProviderVarious")
+  void testVariousTypesExplicitly(String resource, String expectedMimeType, String expectedDescription, String expectedExtension) throws Exception {
+    final URL url = getClass().getResource(resource);
+    assertNotNull(url);
+    final File file = new File(url.toURI());
+    final Map<String, Object> results = analyzer.analyze(file);
+    printResult(results);
+    assertNotNull(results, file + " could not be analyzed");
+    assertNotNull(results.get(MimeTypeAction.KEY), "mimeType missing");
+    assertEquals(expectedMimeType, results.get(MimeTypeAction.KEY), "wrong mimeType");
+    assertNotNull(results.get(DescriptionAction.KEY), "description missing");
+    assertEquals(expectedDescription, results.get(DescriptionAction.KEY), "wrong description");
+    assertNotNull(results.get(ExtensionAction.KEY), "could not be analyzed");
+    assertEquals(expectedExtension, results.get(ExtensionAction.KEY), "wrong extension");
+  }
+
+  public static Stream<Arguments> dataProviderXRechnung() {
     return Stream.of(
         arguments("/various_types/BASIC_Einfach.pdf", "application/pdf"),
         arguments("/various_types/EN16931_Einfach.pdf", "application/pdf"),
@@ -75,7 +101,7 @@ public static Stream<Arguments> dataProvider() {
   }
 
   @ParameterizedTest
-  @MethodSource("dataProvider")
+  @MethodSource("dataProviderXRechnung")
   void testXRechnung(String resource, String expectedMimeType) throws Exception {
     final URL url = getClass().getResource(resource);
     assertNotNull(url);