Author: jukka
Date: Sun Sep 27 15:13:46 2009
New Revision: 819324

URL: http://svn.apache.org/viewvc?rev=819324&view=rev
Log:
TIKA-285: Update media type registry to the latest httpd mime type database

More merging of the mime.types information. Work in progress...

Modified:
    
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
    
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java

Modified: 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml?rev=819324&r1=819323&r2=819324&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
 (original)
+++ 
lucene/tika/trunk/tika-core/src/main/resources/org/apache/tika/mime/tika-mimetypes.xml
 Sun Sep 27 15:13:46 2009
@@ -1161,218 +1161,6 @@
     <glob pattern="*.ra" />
   </mime-type>
 
-  <mime-type type="image/gif">
-    <acronym>GIF</acronym>
-    <comment>Graphics Interchange Format</comment>
-    <magic priority="50">
-      <match value="GIF87a" type="string" offset="0" />
-      <match value="GIF89a" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.gif" />
-  </mime-type>
-
-  <mime-type type="image/tiff">
-    <acronym>TIFF</acronym>
-    <comment>Tagged Image File Format</comment>
-    <magic priority="50">
-      <!-- MM.* = Big endian (M=Motorola) and 0x002a in big endian    -->
-      <match value="MM\x00\x2a" type="string" offset="0" />
-      <!-- II*. = Little endian (I=Intel) and 0x002a in little endian -->
-      <match value="II\x2a\x00" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.tiff" />
-    <glob pattern="*.tif" />
-  </mime-type>
-
-  <mime-type type="image/x-portable-anymap">
-    <acronym>PNM</acronym>
-    <comment>Portable Any Map</comment>
-    <glob pattern="*.pnm" />
-  </mime-type>
-
-  <mime-type type="image/x-portable-bitmap">
-    <sub-class-of type="image/x-portable-anymap" />
-    <acronym>PBM</acronym>
-    <comment>Portable Bit Map</comment>
-    <magic priority="50">
-      <match value="P1" type="string" offset="0" />
-      <match value="P4" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.pbm" />
-  </mime-type>
-
-  <mime-type type="image/x-portable-graymap">
-    <sub-class-of type="image/x-portable-anymap" />
-    <acronym>PGM</acronym>
-    <comment>Portable Gray Map</comment>
-    <magic priority="50">
-      <match value="P2" type="string" offset="0" />
-      <match value="P5" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.pgm" />
-  </mime-type>
-
-  <mime-type type="image/x-portable-pixmap">
-    <sub-class-of type="image/x-portable-anymap" />
-    <acronym>PXM</acronym>
-    <comment>Portable Pixel Map</comment>
-    <magic priority="50">
-      <match value="P3" type="string" offset="0" />
-      <match value="P6" type="string" offset="0" />
-      <match value="P7" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.ppm" />
-  </mime-type>
-
-  <mime-type type="image/cgm">
-    <acronym>CGM</acronym>
-    <comment>Computer Graphics Metafile</comment>
-    <magic priority="50">
-      <match value="BEGMF" type="string" offset="0" />
-      <match value="0x0020" mask="0xffe0" type="string" offset="0" />
-    </magic>
-    <glob pattern="*.cgm" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-dng">
-    <acronym>DNG</acronym>
-    <comment>Adobe Digital Negative</comment>
-    <glob pattern="*.dng" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-hasselblad">
-    <comment>Hasselblad raw image</comment>
-    <glob pattern="*.3fr" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-fuji">
-    <comment>Fuji raw image</comment>
-    <glob pattern="*.raf" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-canon">
-    <comment>Canon raw image</comment>
-    <glob pattern="*.crw" />
-    <glob pattern="*.cr2" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-kodak">
-    <comment>Kodak raw image</comment>
-    <glob pattern="*.k25" />
-    <glob pattern="*.kdc" />
-    <glob pattern="*.dcs" />
-    <glob pattern="*.drf" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-minolta">
-    <comment>Minolta raw image</comment>
-    <glob pattern="*.mrw" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-nikon">
-    <comment>Nikon raw image</comment>
-    <glob pattern="*.nef" />
-    <glob pattern="*.nrw" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-olympus">
-    <comment>Olympus raw image</comment>
-    <glob pattern="*.orf" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-pentax">
-    <comment>Pentax raw image</comment>
-    <glob pattern="*.ptx" />
-    <glob pattern="*.pef" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-sony">
-    <comment>Sony raw image</comment>
-    <glob pattern="*.arw" />
-    <glob pattern="*.srf" />
-    <glob pattern="*.sr2" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-sigma">
-    <comment>Sigma raw image</comment>
-    <glob pattern="*.x3f" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-epson">
-    <comment>Epson raw image</comment>
-    <glob pattern="*.erf" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-mamiya">
-    <comment>Mamiya raw image</comment>
-    <glob pattern="*.mef" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-leaf">
-    <comment>Leaf raw image</comment>
-    <glob pattern="*.mos" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-panasonic">
-    <comment>Panasonic raw image</comment>
-    <glob pattern="*.raw" />
-    <glob pattern="*.rw2" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-phaseone">
-    <comment>Phase One raw image</comment>
-    <glob pattern="*.cap" />
-    <glob pattern="*.iiq" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-red">
-    <comment>Red raw image</comment>
-    <glob pattern="*.r3d" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-imacon">
-    <comment>Imacon raw image</comment>
-    <glob pattern="*.fff" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-logitech">
-    <comment>Logitech raw image</comment>
-    <glob pattern="*.pxn" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-casio">
-    <comment>Casio raw image</comment>
-    <glob pattern="*.bay" />
-  </mime-type>
-
-  <mime-type type="image/x-tika-rawzor">
-    <comment>Rawzor raw image</comment>
-    <glob pattern="*.rwz" />
-  </mime-type>
-
-  <mime-type type="message/news">
-    <magic priority="50">
-      <match value="Path:" type="string" offset="0" />
-      <match value="Xref:" type="string" offset="0" />
-      <match value="Article" type="string" offset="0" />
-    </magic>
-  </mime-type>
-  <mime-type type="message/rfc822">
-    <magic priority="50">
-      <match value="Relay-Version:" type="string" offset="0" />
-      <match value="#!\ rnews" type="string" offset="0" />
-      <match value="N#!\ rnews" type="string" offset="0" />
-      <match value="Forward\ to" type="string" offset="0" />
-      <match value="Pipe\ to" type="string" offset="0" />
-      <match value="Return-Path:" type="string" offset="0" />
-      <match value="From:" type="string" offset="0" />
-      <match value="Received:" type="string" offset="0" />
-    </magic>
-  </mime-type>
-  <mime-type type="model/vrml">
-    <glob pattern="*.vrml" />
-  </mime-type>
-
   <mime-type type="application/activemessage"/>
   <mime-type type="application/andrew-inset">
     <glob pattern="*.ez"/>
@@ -3573,6 +3361,7 @@
   <mime-type type="chemical/x-xyz">
     <glob pattern="*.xyz"/>
   </mime-type>
+
   <mime-type type="image/bmp">
     <alias type="image/x-ms-bmp"/>
     <acronym>BMP</acronym>
@@ -3583,17 +3372,33 @@
     <glob pattern="*.bmp"/>
     <glob pattern="*.dib"/>
   </mime-type>
+
   <mime-type type="image/cgm">
+    <acronym>CGM</acronym>
+    <comment>Computer Graphics Metafile</comment>
+    <magic priority="50">
+      <match value="BEGMF" type="string" offset="0"/>
+      <match value="0x0020" mask="0xffe0" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.cgm"/>
   </mime-type>
+
   <mime-type type="image/example"/>
   <mime-type type="image/fits"/>
   <mime-type type="image/g3fax">
     <glob pattern="*.g3"/>
   </mime-type>
+
   <mime-type type="image/gif">
+    <acronym>GIF</acronym>
+    <comment>Graphics Interchange Format</comment>
+    <magic priority="50">
+      <match value="GIF87a" type="string" offset="0"/>
+      <match value="GIF89a" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.gif"/>
   </mime-type>
+
   <mime-type type="image/ief">
     <glob pattern="*.ief"/>
   </mime-type>
@@ -3618,10 +3423,20 @@
     <!-- <glob pattern="*.svgz"/> (see application/x-gzip) -->
   </mime-type>
   <mime-type type="image/t38"/>
+
   <mime-type type="image/tiff">
+    <acronym>TIFF</acronym>
+    <comment>Tagged Image File Format</comment>
+    <magic priority="50">
+      <!-- MM.* = Big endian (M=Motorola) and 0x002a in big endian    -->
+      <match value="MM\x00\x2a" type="string" offset="0"/>
+      <!-- II*. = Little endian (I=Intel) and 0x002a in little endian -->
+      <match value="II\x2a\x00" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.tiff"/>
     <glob pattern="*.tif"/>
   </mime-type>
+
   <mime-type type="image/tiff-fx"/>
   <mime-type type="image/vnd.adobe.photoshop">
     <glob pattern="*.psd"/>
@@ -3695,18 +3510,163 @@
     <glob pattern="*.pic"/>
     <glob pattern="*.pct"/>
   </mime-type>
+
   <mime-type type="image/x-portable-anymap">
-    <glob pattern="*.pnm"/>
+    <acronym>PNM</acronym>
+    <comment>Portable Any Map</comment>
+    <glob pattern="*.pnm" />
   </mime-type>
+
   <mime-type type="image/x-portable-bitmap">
+    <sub-class-of type="image/x-portable-anymap"/>
+    <acronym>PBM</acronym>
+    <comment>Portable Bit Map</comment>
+    <magic priority="50">
+      <match value="P1" type="string" offset="0"/>
+      <match value="P4" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.pbm"/>
   </mime-type>
+
   <mime-type type="image/x-portable-graymap">
+    <sub-class-of type="image/x-portable-anymap"/>
+    <acronym>PGM</acronym>
+    <comment>Portable Gray Map</comment>
+    <magic priority="50">
+      <match value="P2" type="string" offset="0"/>
+      <match value="P5" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.pgm"/>
   </mime-type>
+
   <mime-type type="image/x-portable-pixmap">
+    <sub-class-of type="image/x-portable-anymap"/>
+    <acronym>PXM</acronym>
+    <comment>Portable Pixel Map</comment>
+    <magic priority="50">
+      <match value="P3" type="string" offset="0"/>
+      <match value="P6" type="string" offset="0"/>
+      <match value="P7" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.ppm"/>
   </mime-type>
+
+  <mime-type type="image/x-raw-adobe">
+    <acronym>DNG</acronym>
+    <comment>Adobe Digital Negative</comment>
+    <glob pattern="*.dng"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-hasselblad">
+    <comment>Hasselblad raw image</comment>
+    <glob pattern="*.3fr"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-fuji">
+    <comment>Fuji raw image</comment>
+    <glob pattern="*.raf"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-canon">
+    <comment>Canon raw image</comment>
+    <glob pattern="*.crw"/>
+    <glob pattern="*.cr2"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-kodak">
+    <comment>Kodak raw image</comment>
+    <glob pattern="*.k25"/>
+    <glob pattern="*.kdc"/>
+    <glob pattern="*.dcs"/>
+    <glob pattern="*.drf"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-minolta">
+    <comment>Minolta raw image</comment>
+    <glob pattern="*.mrw"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-nikon">
+    <comment>Nikon raw image</comment>
+    <glob pattern="*.nef"/>
+    <glob pattern="*.nrw"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-olympus">
+    <comment>Olympus raw image</comment>
+    <glob pattern="*.orf"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-pentax">
+    <comment>Pentax raw image</comment>
+    <glob pattern="*.ptx"/>
+    <glob pattern="*.pef"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-sony">
+    <comment>Sony raw image</comment>
+    <glob pattern="*.arw"/>
+    <glob pattern="*.srf"/>
+    <glob pattern="*.sr2"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-sigma">
+    <comment>Sigma raw image</comment>
+    <glob pattern="*.x3f"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-epson">
+    <comment>Epson raw image</comment>
+    <glob pattern="*.erf"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-mamiya">
+    <comment>Mamiya raw image</comment>
+    <glob pattern="*.mef"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-leaf">
+    <comment>Leaf raw image</comment>
+    <glob pattern="*.mos"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-panasonic">
+    <comment>Panasonic raw image</comment>
+    <glob pattern="*.raw"/>
+    <glob pattern="*.rw2"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-phaseone">
+    <comment>Phase One raw image</comment>
+    <glob pattern="*.cap"/>
+    <glob pattern="*.iiq"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-red">
+    <comment>Red raw image</comment>
+    <glob pattern="*.r3d"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-imacon">
+    <comment>Imacon raw image</comment>
+    <glob pattern="*.fff"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-logitech">
+    <comment>Logitech raw image</comment>
+    <glob pattern="*.pxn"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-casio">
+    <comment>Casio raw image</comment>
+    <glob pattern="*.bay"/>
+  </mime-type>
+
+  <mime-type type="image/x-raw-rawzor">
+    <comment>Rawzor raw image</comment>
+    <glob pattern="*.rwz"/>
+  </mime-type>
+
   <mime-type type="image/x-rgb">
     <glob pattern="*.rgb"/>
   </mime-type>
@@ -3719,6 +3679,7 @@
   <mime-type type="image/x-xwindowdump">
     <glob pattern="*.xwd"/>
   </mime-type>
+
   <mime-type type="message/cpim"/>
   <mime-type type="message/delivery-status"/>
   <mime-type type="message/disposition-notification"/>
@@ -3730,17 +3691,38 @@
   <mime-type type="message/global-headers"/>
   <mime-type type="message/http"/>
   <mime-type type="message/imdn+xml"/>
-  <mime-type type="message/news"/>
+
+  <mime-type type="message/news">
+    <magic priority="50">
+      <match value="Path:" type="string" offset="0" />
+      <match value="Xref:" type="string" offset="0" />
+      <match value="Article" type="string" offset="0" />
+    </magic>
+  </mime-type>
+
   <mime-type type="message/partial"/>
+
   <mime-type type="message/rfc822">
+    <magic priority="50">
+      <match value="Relay-Version:" type="string" offset="0"/>
+      <match value="#!\ rnews" type="string" offset="0"/>
+      <match value="N#!\ rnews" type="string" offset="0"/>
+      <match value="Forward\ to" type="string" offset="0"/>
+      <match value="Pipe\ to" type="string" offset="0"/>
+      <match value="Return-Path:" type="string" offset="0"/>
+      <match value="From:" type="string" offset="0"/>
+      <match value="Received:" type="string" offset="0"/>
+    </magic>
     <glob pattern="*.eml"/>
     <glob pattern="*.mime"/>
   </mime-type>
+
   <mime-type type="message/s-http"/>
   <mime-type type="message/sip"/>
   <mime-type type="message/sipfrag"/>
   <mime-type type="message/tracking-status"/>
   <mime-type type="message/vnd.si.simp"/>
+
   <mime-type type="model/example"/>
   <mime-type type="model/iges">
     <glob pattern="*.igs"/>

Modified: 
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
URL: 
http://svn.apache.org/viewvc/lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java?rev=819324&r1=819323&r2=819324&view=diff
==============================================================================
--- 
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
 (original)
+++ 
lucene/tika/trunk/tika-parsers/src/test/java/org/apache/tika/mime/TestMimeTypes.java
 Sun Sep 27 15:13:46 2009
@@ -86,7 +86,7 @@
         assertTypeByName("application/xml", "x.xml");
         assertTypeByName("application/zip", "x.zip");
         assertTypeByName("application/vnd.oasis.opendocument.text", "x.odt");
-        assertTypeByName("application/octet-stream", "x.xyz");
+        assertTypeByName("application/octet-stream", "x.unknown");
 
         // Test for the MS Office media types and file extensions listed in
         // 
http://blogs.msdn.com/vsofficedeveloper/pages/Office-2007-Open-XML-MIME-Types.aspx
@@ -160,12 +160,12 @@
     }
 
     public void testBmpDetection() throws Exception {
-        assertType("image/x-ms-bmp", "testBMP.bmp");
-        assertTypeByData("image/x-ms-bmp", "testBMP.bmp");
-        assertTypeByName("image/x-ms-bmp", "x.bmp");
-        assertTypeByName("image/x-ms-bmp", "x.BMP");
-        assertTypeByName("image/x-ms-bmp", "x.dib");
-        assertTypeByName("image/x-ms-bmp", "x.DIB");
+        assertType("image/bmp", "testBMP.bmp");
+        assertTypeByData("image/bmp", "testBMP.bmp");
+        assertTypeByName("image/bmp", "x.bmp");
+        assertTypeByName("image/bmp", "x.BMP");
+        assertTypeByName("image/bmp", "x.dib");
+        assertTypeByName("image/bmp", "x.DIB");
     }
 
     public void testPnmDetection() throws Exception {
@@ -218,14 +218,14 @@
 
     public void testWmfDetection() throws Exception {
         // TODO: Need a test wmf file
-        assertTypeByName("image/x-tika-wmf", "x.wmf");
-        assertTypeByName("image/x-tika-wmf", "x.WMF");
+        assertTypeByName("application/x-msmetafile", "x.wmf");
+        assertTypeByName("application/x-msmetafile", "x.WMF");
         // TODO: Need a test emf file
-        assertTypeByName("image/x-tika-wmf", "x.emf");
-        assertTypeByName("image/x-tika-wmf", "x.EMF");
+        assertTypeByName("application/x-msmetafile", "x.emf");
+        assertTypeByName("application/x-msmetafile", "x.EMF");
         // TODO: Need a test wmz file
-        assertTypeByName("application/x-gzip", "x.wmz");
-        assertTypeByName("application/x-gzip", "x.WMZ");
+        assertTypeByName("application/x-ms-wmz", "x.wmz");
+        assertTypeByName("application/x-ms-wmz", "x.WMZ");
         // TODO: Need a test emf file
         assertTypeByName("application/x-gzip", "x.emz");
         assertTypeByName("application/x-gzip", "x.EMZ");
@@ -262,39 +262,39 @@
     }
     
     public void testRawDetection() throws Exception {
-        assertTypeByName("image/x-tika-dng", "x.dng");
-        assertTypeByName("image/x-tika-dng", "x.DNG");
-        assertTypeByName("image/x-tika-hasselblad", "x.3fr");
-        assertTypeByName("image/x-tika-fuji", "x.raf");
-        assertTypeByName("image/x-tika-canon", "x.crw");
-        assertTypeByName("image/x-tika-canon", "x.cr2");
-        assertTypeByName("image/x-tika-kodak", "x.k25");
-        assertTypeByName("image/x-tika-kodak", "x.kdc");
-        assertTypeByName("image/x-tika-kodak", "x.dcs");
-        assertTypeByName("image/x-tika-kodak", "x.drf");
-        assertTypeByName("image/x-tika-minolta", "x.mrw");
-        assertTypeByName("image/x-tika-nikon", "x.nef");
-        assertTypeByName("image/x-tika-nikon", "x.nrw");
-        assertTypeByName("image/x-tika-olympus", "x.orf");
-        assertTypeByName("image/x-tika-pentax", "x.ptx");
-        assertTypeByName("image/x-tika-pentax", "x.pef");
-        assertTypeByName("image/x-tika-sony", "x.arw");
-        assertTypeByName("image/x-tika-sony", "x.srf");
-        assertTypeByName("image/x-tika-sony", "x.sr2");
-        assertTypeByName("image/x-tika-sigma", "x.x3f");
-        assertTypeByName("image/x-tika-epson", "x.erf");
-        assertTypeByName("image/x-tika-mamiya", "x.mef");
-        assertTypeByName("image/x-tika-leaf", "x.mos");
-        assertTypeByName("image/x-tika-panasonic", "x.raw");
-        assertTypeByName("image/x-tika-panasonic", "x.rw2");
-        assertTypeByName("image/x-tika-phaseone", "x.cap");
-        assertTypeByName("image/x-tika-phaseone", "x.iiq");
-        assertTypeByName("image/x-tika-phaseone", "x.cap");
-        assertTypeByName("image/x-tika-red", "x.r3d");
-        assertTypeByName("image/x-tika-imacon", "x.fff");
-        assertTypeByName("image/x-tika-logitech", "x.pxn");
-        assertTypeByName("image/x-tika-casio", "x.bay");
-        assertTypeByName("image/x-tika-rawzor", "x.rwz");
+        assertTypeByName("image/x-raw-adobe", "x.dng");
+        assertTypeByName("image/x-raw-adobe", "x.DNG");
+        assertTypeByName("image/x-raw-hasselblad", "x.3fr");
+        assertTypeByName("image/x-raw-fuji", "x.raf");
+        assertTypeByName("image/x-raw-canon", "x.crw");
+        assertTypeByName("image/x-raw-canon", "x.cr2");
+        assertTypeByName("image/x-raw-kodak", "x.k25");
+        assertTypeByName("image/x-raw-kodak", "x.kdc");
+        assertTypeByName("image/x-raw-kodak", "x.dcs");
+        assertTypeByName("image/x-raw-kodak", "x.drf");
+        assertTypeByName("image/x-raw-minolta", "x.mrw");
+        assertTypeByName("image/x-raw-nikon", "x.nef");
+        assertTypeByName("image/x-raw-nikon", "x.nrw");
+        assertTypeByName("image/x-raw-olympus", "x.orf");
+        assertTypeByName("image/x-raw-pentax", "x.ptx");
+        assertTypeByName("image/x-raw-pentax", "x.pef");
+        assertTypeByName("image/x-raw-sony", "x.arw");
+        assertTypeByName("image/x-raw-sony", "x.srf");
+        assertTypeByName("image/x-raw-sony", "x.sr2");
+        assertTypeByName("image/x-raw-sigma", "x.x3f");
+        assertTypeByName("image/x-raw-epson", "x.erf");
+        assertTypeByName("image/x-raw-mamiya", "x.mef");
+        assertTypeByName("image/x-raw-leaf", "x.mos");
+        assertTypeByName("image/x-raw-panasonic", "x.raw");
+        assertTypeByName("image/x-raw-panasonic", "x.rw2");
+        assertTypeByName("image/x-raw-phaseone", "x.cap");
+        assertTypeByName("image/x-raw-phaseone", "x.iiq");
+        assertTypeByName("image/x-raw-phaseone", "x.cap");
+        assertTypeByName("image/x-raw-red", "x.r3d");
+        assertTypeByName("image/x-raw-imacon", "x.fff");
+        assertTypeByName("image/x-raw-logitech", "x.pxn");
+        assertTypeByName("image/x-raw-casio", "x.bay");
+        assertTypeByName("image/x-raw-rawzor", "x.rwz");
     }
 
     /**


Reply via email to