Opps, left-overs from merge ...

[quix0rs-gnu-social.git] / tests / MediaFileTest.php

diff --git a/tests/MediaFileTest.php b/tests/MediaFileTest.php
index a76a4f45e62968b4d2a1a5609cbb84edc8309724..d28b22e30e9db73d659eb3d101cf31b72af4bccc 100644 (file)
--- a/tests/MediaFileTest.php
+++ b/tests/MediaFileTest.php
@@ -6,8 +6,8 @@ if (isset($_SERVER) && array_key_exists('REQUEST_METHOD', $_SERVER)) {
 }
 
 define('INSTALLDIR', realpath(dirname(__FILE__) . '/..'));
-define('STATUSNET', true);
-define('LACONICA', true);
+define('GNUSOCIAL', true);
+define('STATUSNET', true);  // compatibility
 
 require_once INSTALLDIR . '/lib/common.php';
 
@@ -29,13 +29,13 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
      * @dataProvider fileTypeCases
      *
      */
-    public function testFileType($filename, $expectedType)
+    public function testMimeType($filename, $expectedType)
     {
         if (!file_exists($filename)) {
             throw new Exception("WTF? $filename test file missing");
         }
 
-        $type = MediaFile::getUploadedFileType($filename, basename($filename));
+        $type = MediaFile::getUploadedMimeType($filename, basename($filename));
         $this->assertEquals($expectedType, $type);
     }
 
@@ -43,7 +43,7 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
      * @dataProvider fileTypeCases
      *
      */
-    public function testUploadedFileType($filename, $expectedType)
+    public function testUploadedMimeType($filename, $expectedType)
     {
         if (!file_exists($filename)) {
             throw new Exception("WTF? $filename test file missing");
@@ -51,7 +51,8 @@ class MediaFileTest extends PHPUnit_Framework_TestCase
         $tmp = tmpfile();
         fwrite($tmp, file_get_contents($filename));
 
-        $type = MediaFile::getUploadedFileType($tmp, basename($filename));
+        $tmp_metadata = stream_get_meta_data($tmp);
+        $type = MediaFile::getUploadedMimeType($tmp_metadata['uri'], basename($filename));
         $this->assertEquals($expectedType, $type);
     }