From bf2c7b02b89971b0adff73442194e93c79073e9b Mon Sep 17 00:00:00 2001 From: Brion Vibber Date: Tue, 17 Jan 2017 13:23:02 -0800 Subject: [PATCH] Add test case for Opus file check Test case for Opus file check so we don't regress! Confirms the fix for T151352 that Opus files return type 'audio' and not 'multimedia'. Bug: T151352 Change-Id: Ib868793d90b60609ccec25726e6fbaa28bffebaf --- tests/phpunit/data/media/say-test.opus | Bin 0 -> 9798 bytes .../includes/libs/mime/MimeAnalyzerTest.php | 10 ++++++++++ 2 files changed, 10 insertions(+) create mode 100644 tests/phpunit/data/media/say-test.opus diff --git a/tests/phpunit/data/media/say-test.opus b/tests/phpunit/data/media/say-test.opus new file mode 100644 index 0000000000000000000000000000000000000000..168d2188a802482ef956514c7729caab3b604324 GIT binary patch literal 9798 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 literal 0 HcmV?d00001 diff --git a/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php index 85927a393d..53a36c53b1 100644 --- a/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php +++ b/tests/phpunit/includes/libs/mime/MimeAnalyzerTest.php @@ -59,4 +59,14 @@ class MimeMagicTest extends PHPUnit_Framework_TestCase { $actualType = $this->mimeAnalyzer->getMediaType( $oggFile, 'application/ogg' ); $this->assertEquals( $actualType, MEDIATYPE_AUDIO ); } + + /** + * Test to make sure that Opus audio files don't trigger + * MEDIATYPE_MULTIMEDIA (bug T151352) + */ + function testOpusRecognize() { + $oggFile = __DIR__ . '/../../../data/media/say-test.opus'; + $actualType = $this->mimeAnalyzer->getMediaType( $oggFile, 'application/ogg' ); + $this->assertEquals( $actualType, MEDIATYPE_AUDIO ); + } } -- 2.20.1