Merge "MimeAnalyzer: Add testcases for mp3 detection"

diff --combined tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
index cf891e2,bf2a3f6..64f4960
--- 1/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
--- 2/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
+++ b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php
@@@ -1,4 -1,8 +1,8 @@@
  <?php
+ /*
+  * @group Media
+  * @covers MimeAnalyzer
+  */
  class MimeMagicTest extends PHPUnit_Framework_TestCase {
        /** @var MimeAnalyzer */
        private $mimeAnalyzer;
@@@ -20,6 -24,13 +24,13 @@@
                parent::setUp();
        }
  
+       function doGuessMimeType( array $parameters = [] ) {
+               $class = new ReflectionClass( get_class( $this->mimeAnalyzer ) );
+               $method = $class->getMethod( 'doGuessMimeType' );
+               $method->setAccessible( true );
+               return $method->invokeArgs( $this->mimeAnalyzer, $parameters );
+       }
+ 
        /**
         * @dataProvider providerImproveTypeFromExtension
         * @param string $ext File extension (no leading dot)
@@@ -57,7 -68,7 +68,7 @@@
        function testOggRecognize() {
                $oggFile = __DIR__ . '/../../../data/media/say-test.ogg';
                $actualType = $this->mimeAnalyzer->getMediaType( $oggFile, 'application/ogg' );
 -              $this->assertEquals( $actualType, MEDIATYPE_AUDIO );
 +              $this->assertEquals( MEDIATYPE_AUDIO, $actualType );
        }
  
        /**
@@@ -67,6 -78,51 +78,51 @@@
        function testOpusRecognize() {
                $oggFile = __DIR__ . '/../../../data/media/say-test.opus';
                $actualType = $this->mimeAnalyzer->getMediaType( $oggFile, 'application/ogg' );
 -              $this->assertEquals( $actualType, MEDIATYPE_AUDIO );
 +              $this->assertEquals( MEDIATYPE_AUDIO, $actualType );
        }
+ 
+       /**
+        * Test to make sure that mp3 files are detected as audio type
+        */
+       function testMP3AsAudio() {
+               $file = __DIR__ . '/../../../data/media/say-test-with-id3.mp3';
+               $actualType = $this->mimeAnalyzer->getMediaType( $file );
+               $this->assertEquals( MEDIATYPE_AUDIO, $actualType );
+       }
+ 
+       /**
+        * Test to make sure that MP3 with id3 tag is recognized
+        */
+       function testMP3WithID3Recognize() {
+               $file = __DIR__ . '/../../../data/media/say-test-with-id3.mp3';
+               $actualType = $this->doGuessMimeType( [ $file, 'mp3' ] );
+               $this->assertEquals( 'audio/mpeg', $actualType );
+       }
+ 
+       /**
+        * Test to make sure that MP3 without id3 tag is recognized (MPEG-1 sample rates)
+        */
+       function testMP3NoID3RecognizeMPEG1() {
+               $file = __DIR__ . '/../../../data/media/say-test-mpeg1.mp3';
+               $actualType = $this->doGuessMimeType( [ $file, 'mp3' ] );
+               $this->assertEquals( 'audio/mpeg', $actualType );
+       }
+ 
+       /**
+        * Test to make sure that MP3 without id3 tag is recognized (MPEG-2 sample rates)
+        */
+       function testMP3NoID3RecognizeMPEG2() {
+               $file = __DIR__ . '/../../../data/media/say-test-mpeg2.mp3';
+               $actualType = $this->doGuessMimeType( [ $file, 'mp3' ] );
+               $this->assertEquals( 'audio/mpeg', $actualType );
+       }
+ 
+       /**
+        * Test to make sure that MP3 without id3 tag is recognized (MPEG-2.5 sample rates)
+        */
+       function testMP3NoID3RecognizeMPEG2_5() {
+               $file = __DIR__ . '/../../../data/media/say-test-mpeg2.5.mp3';
+               $actualType = $this->doGuessMimeType( [ $file, 'mp3' ] );
+               $this->assertEquals( 'audio/mpeg', $actualType );
+       }
  }