more detection tests

diff --git a/data/programming.magic b/data/programming.magic
index ab492c5fee4b47bc22de38412a583f7ea52e152c..647a3eb6c65967a8c116be57881abd9bc342a84b 100644 (file)
--- a/data/programming.magic
+++ b/data/programming.magic
@@ -1,10 +1,25 @@
+0       string             =<?xml         XML text
+5       search/2048/c      =<svg          SVG text
+!:mime  image/svg+xml
 0       search/2048/c      =font-size:    Cascading Style Sheet text
 !:mime  text/css
 0       search/2048/c      =color:        Cascading Style Sheet text
 !:mime  text/css
 0       search/2048/c      =width:        Cascading Style Sheet text
 !:mime  text/css
-0       string             =---           Difference file text
+0       string             =---\          Difference file text
 !:mime  text/diff
 0       string             =diff          Difference file text
 !:mime  text/diff
+0       regex/c            =^[a-z]+=[a-z0-9]+  Windows INI configuration text
+!:mime  text/ini
+0       regex/c            =\s*\\$\\(     Javascript with jQuery text
+!:mime  application/javascript
+0       search/2048        =-------       reStructuredText text
+!:mime  text/x-rst
+0       search/2048        ========       reStructuredText text
+!:mime  text/x-rst
+0       search/2048/c      CREATE\ TABLE  SQL text
+!:mime  text/x-sql
+0       search/2048/c      DROP\ DATABSE  SQL text
+!:mime  text/x-sql

diff --git a/tests/DetectionTest.php b/tests/DetectionTest.php
index 1109cf5dce22ecd302071c1bb96096b22e2fe709..b7a9b0543f8b31484f5f316edabe9b4c3316de45 100644 (file)
--- a/tests/DetectionTest.php
+++ b/tests/DetectionTest.php
@@ -39,7 +39,9 @@ class DetectionTest extends PHPUnit_Framework_TestCase
         $mt = new MIME_Type();
         $mt->magicFile = __DIR__ . '/../data/programming.magic';
         $mt->useMimeContentType = false;
-        $mt->useFileCmd = false;
+        //fixme: finfo doesn't give the correct results
+        $mt->useFileCmd = true;
+        $mt->useFinfo = false;
         $mt->useExtension = false;
         $type = $mt->autoDetect($file);
 

diff --git a/tests/files/sh/mime-type b/tests/files/sh/mime-type
index 4b02bf69dabf4dd61d394442dfe80886ebfee130..7e73fdb8c2656db9bf3e7070ebb930b3a6d3c344 100644 (file)
--- a/tests/files/sh/mime-type
+++ b/tests/files/sh/mime-type
@@ -1 +1 @@
-image/x-shellscript
+text/x-shellscript