From: Derk-Jan Hartman <hartman.wiki@gmail.com>
Date: Thu, 7 Jan 2016 08:41:23 +0000 (-0800)
Subject: ParserTests: Add a video file to parser test suite
X-Git-Tag: 1.31.0-rc.0~8390^2
X-Git-Url: http://git.cyclocoop.org/%24image?a=commitdiff_plain;h=175e95a9093412f8ae36abdddf13ce191ce1d5b3;p=lhc%2Fweb%2Fwiklou.git

ParserTests: Add a video file to parser test suite

Introduce an ogv video file to the parser file testsuite, so that we
can use it later in TimedMediaHandler parsertests.

Change-Id: I6a3b307ad9c82e9df0aeec025934d736eec8375f
---

diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc
index 6a6d447d01..cf65a0dbd3 100644
--- a/tests/parser/parserTest.inc
+++ b/tests/parser/parserTest.inc
@@ -1099,6 +1099,19 @@ class ParserTest {
 			'fileExists' => true
 		), $this->db->timestamp( '20010115123500' ), $user );
 
+		$image = wfLocalFile( Title::makeTitle( NS_FILE, 'Video.ogv' ) );
+		$image->recordUpload2( '', 'A pretty movie', 'Will it play', array(
+			'size' => 12345,
+			'width' => 320,
+			'height' => 240,
+			'bits' => 0,
+			'media_type' => MEDIATYPE_VIDEO,
+			'mime' => 'application/ogg',
+			'metadata' => serialize( array() ),
+			'sha1' => Wikimedia\base_convert( '', 16, 36, 31 ),
+			'fileExists' => true
+		), $this->db->timestamp( '20010115123500' ), $user );
+
 		# A DjVu file
 		$image = wfLocalFile( Title::makeTitle( NS_FILE, 'LoremIpsum.djvu' ) );
 		$image->recordUpload2( '', 'Upload a DjVu', 'A DjVu', array(
@@ -1212,6 +1225,8 @@ class ParserTest {
 			' version="1.1" width="240" height="180"/>' );
 		wfMkdirParents( $dir . '/5/5f', null, __METHOD__ );
 		copy( "$IP/tests/phpunit/data/parser/LoremIpsum.djvu", "$dir/5/5f/LoremIpsum.djvu" );
+		wfMkdirParents( $dir . '/0/00', null, __METHOD__ );
+		copy( "$IP/tests/phpunit/data/parser/320x240.ogv", "$dir/0/00/Video.ogv" );
 
 		return;
 	}
@@ -1253,6 +1268,14 @@ class ParserTest {
 				"$dir/f/ff/Foobar.svg",
 				"$dir/thumb/f/ff/Foobar.svg/*-Foobar.svg.png",
 				"$dir/math/f/a/5/fa50b8b616463173474302ca3e63586b.png",
+				"$dir/0/00/Video.ogv",
+				"$dir/thumb/0/00/Video.ogv/120px--Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/180px--Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/240px--Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/320px--Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/270px--Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/320px-seek=2-Video.ogv.jpg",
+				"$dir/thumb/0/00/Video.ogv/320px-seek=3.3666666666667-Video.ogv.jpg",
 			)
 		);
 
@@ -1270,10 +1293,14 @@ class ParserTest {
 				"$dir/thumb/f/ff/Foobar.svg",
 				"$dir/thumb/f/ff/",
 				"$dir/thumb/f/",
+				"$dir/0/00/",
 				"$dir/0/09/",
 				"$dir/0/",
 				"$dir/5/5f",
 				"$dir/5",
+				"$dir/thumb/0/00/Video.ogv",
+				"$dir/thumb/0/00",
+				"$dir/thumb/0",
 				"$dir/thumb/5/5f/LoremIpsum.djvu",
 				"$dir/thumb/5/5f",
 				"$dir/thumb/5",
diff --git a/tests/parser/parserTests.txt b/tests/parser/parserTests.txt
index d0a3d08b62..cd2b769a53 100644
--- a/tests/parser/parserTests.txt
+++ b/tests/parser/parserTests.txt
@@ -9669,7 +9669,7 @@ Magic Word: {{NUMBEROFFILES}}
 !! wikitext
 {{NUMBEROFFILES}}
 !! html
-<p>5
+<p>6
 </p>
 !! end
 
diff --git a/tests/phpunit/data/parser/320x240.ogv b/tests/phpunit/data/parser/320x240.ogv
new file mode 100644
index 0000000000..79038206ae
Binary files /dev/null and b/tests/phpunit/data/parser/320x240.ogv differ
diff --git a/tests/phpunit/includes/parser/NewParserTest.php b/tests/phpunit/includes/parser/NewParserTest.php
index 5c6c17d7b9..256ad69183 100644
--- a/tests/phpunit/includes/parser/NewParserTest.php
+++ b/tests/phpunit/includes/parser/NewParserTest.php
@@ -304,6 +304,22 @@ class NewParserTest extends MediaWikiTestCase {
 			), $this->db->timestamp( '20010115123500' ), $user );
 		}
 
+		$image = wfLocalFile( Title::makeTitle( NS_FILE, 'Video.ogv' ) );
+		if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) {
+			$image->recordUpload2( '', 'A pretty movie', 'Will it play', array(
+					'size'        => 12345,
+					'width'       => 240,
+					'height'      => 180,
+					'bits'        => 0,
+					'media_type'  => MEDIATYPE_VIDEO,
+					'mime'        => 'application/ogg',
+					'metadata'    => serialize( array() ),
+					'sha1'        => Wikimedia\base_convert( '', 16, 36, 31 ),
+					'fileExists'  => true
+			), $this->db->timestamp( '20010115123500' ), $user );
+		}
+
+		# A DjVu file
 		# A DjVu file
 		$image = wfLocalFile( Title::makeTitle( NS_FILE, 'LoremIpsum.djvu' ) );
 		if ( !$this->db->selectField( 'image', '1', array( 'img_name' => $image->getName() ) ) ) {