From: Brian Wolff <bawolff+wn@gmail.com>
Date: Sun, 29 Jun 2014 23:46:40 +0000 (-0300)
Subject: Add unit tests for ffmpeg2theora ogg recognition bug
X-Git-Tag: 1.31.0-rc.0~15094^2
X-Git-Url: http://git.cyclocoop.org/%24href?a=commitdiff_plain;h=09ae6e28850d87e30bd71ac79c40cd22d5c1ea51;p=lhc%2Fweb%2Fwiklou.git

Add unit tests for ffmpeg2theora ogg recognition bug

Change-Id: I2e6944ccff3882b9f9ee1ac5ab6f5fea1de9d353
Follow-up: 629169ce9bd7
---

diff --git a/tests/phpunit/data/media/README b/tests/phpunit/data/media/README
index ca132a441d..9913f685ff 100644
--- a/tests/phpunit/data/media/README
+++ b/tests/phpunit/data/media/README
@@ -55,3 +55,7 @@ Bishzilla_blink.gif
 https://commons.wikimedia.org/wiki/File:Bishzilla_blink.gif
 Public domain
 Bishonen
+
+say-test.ogg
+Public domain
+Brian Wolff
diff --git a/tests/phpunit/data/media/say-test.ogg b/tests/phpunit/data/media/say-test.ogg
new file mode 100644
index 0000000000..5d814fb262
Binary files /dev/null and b/tests/phpunit/data/media/say-test.ogg differ
diff --git a/tests/phpunit/includes/MimeMagicTest.php b/tests/phpunit/includes/MimeMagicTest.php
index 9582fe7f38..a164ff92ef 100644
--- a/tests/phpunit/includes/MimeMagicTest.php
+++ b/tests/phpunit/includes/MimeMagicTest.php
@@ -36,4 +36,13 @@ class MimeMagicTest extends MediaWikiTestCase {
 		);
 	}
 
+	/**
+	 * Test to make sure that encoder=ffmpeg2theora doesn't trigger
+	 * MEDIATYPE_VIDEO (bug 63584)
+	 */
+	function testOggRecognize() {
+		$oggFile = __DIR__ . '/../data/media/say-test.ogg';
+		$actualType = $this->mimeMagic->getMediaType( $oggFile, 'application/ogg' );
+		$this->assertEquals( $actualType, MEDIATYPE_AUDIO );
+	}
 }