svn commit: r1431440 - in /tika/trunk: tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java tika-parsers/src/test/resources/test-documents/test.hdf

[ni...@apache.org]

Author: nick
Date: Thu Jan 10 15:42:48 2013
New Revision: 1431440

URL: http://svn.apache.org/viewvc?rev=1431440&view=rev
Log:
Add a unit test for HDF4 files, which shows that TIKA-958 was already fixed

Added:
    tika/trunk/tika-parsers/src/test/resources/test-documents/test.hdf   (with props)
Modified:
    tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
    tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java

Modified: tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: http://svn.apache.org/viewvc/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=1431440&r1=1431439&r2=1431440&view=diff
==============================================================================
--- tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml (original)
+++ tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml Thu Jan 10 15:42:48 2013
@@ -2711,7 +2711,9 @@
   <mime-type type="application/x-hdf">
     <_comment>Hierarchical Data Format File</_comment>
     <magic priority="50">
+      <!-- HDF4 -->
       <match value="0x0e031301" type="big32" offset="0"/>
+      <!-- HDF5 -->
       <match value="\211HDF\r\n\032" type="string" offset="0"/>
     </magic>
     <glob pattern="*.hdf"/>

Modified: tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java?rev=1431440&r1=1431439&r2=1431440&view=diff
==============================================================================
--- tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java (original)
+++ tika/trunk/tika-parsers/src/test/java/org/apache/tika/parser/hdf/HDFParserTest.java Thu Jan 10 15:42:48 2013
@@ -64,4 +64,29 @@ public class HDFParserTest extends TestC
         assertEquals("5", metadata.get("GranuleMonth"));
     }
 
+    public void testHDF4() throws Exception {
+       if(System.getProperty("java.version").startsWith("1.5")) {
+          return;
+      }
+      Parser parser = new HDFParser();
+      ContentHandler handler = new BodyContentHandler();
+      Metadata metadata = new Metadata();
+
+      /*
+       * this is a publicly available HDF4 file from the HD4 examples:
+       * 
+       * http://www.hdfgroup.org/training/hdf4_chunking/Chunkit/bin/input54kmdata.hdf
+       */
+      InputStream stream = HDFParser.class
+              .getResourceAsStream("/test-documents/test.hdf");
+      try {
+          parser.parse(stream, handler, metadata, new ParseContext());
+      } finally {
+          stream.close();
+      }
+
+      assertNotNull(metadata);
+      assertEquals("Direct read of HDF4 file through CDM library", metadata.get("_History"));
+      assertEquals("Ascending", metadata.get("Pass"));
+    }
 }

Added: tika/trunk/tika-parsers/src/test/resources/test-documents/test.hdf
URL: http://svn.apache.org/viewvc/tika/trunk/tika-parsers/src/test/resources/test-documents/test.hdf?rev=1431440&view=auto
==============================================================================
Binary file - no diff available.

Propchange: tika/trunk/tika-parsers/src/test/resources/test-documents/test.hdf
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream