Zend_Validate_File unit tests: fixed some inconsistencies in magic file processing.

git-svn-id: http://framework.zend.com/svn/framework/standard/trunk@22678 44c647ce-9c0f-0410-b52a-842ac1e357ba

tests/Zend/Validate/File/IsCompressedTest.php

@@ -195,10 +195,10 @@ class Zend_Validate_File_IsCompressedTest extends PHPUnit_Framework_TestCase
         $validator = new Zend_Validate_File_IsCompressed(array(
             'image/gif',
             'image/jpg',
-            'magicfile' => __FILE__,
+            'magicfile' => __DIR__ . '/_files/magic.mime',
             'headerCheck' => true));
 
-        $this->assertEquals(__FILE__, $validator->getMagicFile());
+        $this->assertEquals(__DIR__ . '/_files/magic.mime', $validator->getMagicFile());
         $this->assertTrue($validator->getHeaderCheck());
         $this->assertEquals('image/gif,image/jpg', $validator->getMimeType());
     }

tests/Zend/Validate/File/IsImageTest.php

@@ -186,10 +186,10 @@ class Zend_Validate_File_IsImageTest extends PHPUnit_Framework_TestCase
         $validator = new Zend_Validate_File_IsImage(array(
             'image/gif',
             'image/jpg',
-            'magicfile' => __FILE__,
+            'magicfile' => __DIR__ . '/_files/magic.mime',
             'headerCheck' => true));
 
-        $this->assertEquals(__FILE__, $validator->getMagicFile());
+        $this->assertEquals(__DIR__ . '/_files/magic.mime', $validator->getMagicFile());
         $this->assertTrue($validator->getHeaderCheck());
         $this->assertEquals('image/gif,image/jpg', $validator->getMimeType());
     }

tests/Zend/Validate/File/MimeTypeTest.php

@@ -184,6 +184,7 @@ class Zend_Validate_File_MimeTypeTest extends PHPUnit_Framework_TestCase
         require_once 'Zend/Validate/Exception.php';
         try {
             $validator = new Zend_Validate_File_MimeType(array('image/gif', 'magicfile' => __FILE__));
+            $this->fail('Zend_Validate_File_MimeType should not accept invalid magic file.');
         } catch (Zend_Validate_Exception $e) {
             // @ZF-9320: False Magic File is not allowed to be set
         }

tests/Zend/Validate/File/_files/magic.mime

@@ -0,0 +1,12 @@
+# Magic file
+
+#JPEG
+4       string/B        jP              JPEG 2000 image
+
+## GIF
+0       string          GIF8            GIF image data
+
+# TIFF
+0       string          MM\x00\x2a      TIFF image data, big-endian
+0       string          II\x2a\x00      TIFF image data, little-endian
+