From d417de70fcf39e0a7a15ba780b597914d16ca0f7 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Wed, 12 Mar 2014 18:12:23 +0100
Subject: Update to MediaWiki 1.22.4

---
 tests/phpunit/includes/media/PNGTest.php | 123 -------------------------------
 1 file changed, 123 deletions(-)
 delete mode 100644 tests/phpunit/includes/media/PNGTest.php

(limited to 'tests/phpunit/includes/media/PNGTest.php')

diff --git a/tests/phpunit/includes/media/PNGTest.php b/tests/phpunit/includes/media/PNGTest.php
deleted file mode 100644
index ad4c2493..00000000
--- a/tests/phpunit/includes/media/PNGTest.php
+++ /dev/null
@@ -1,123 +0,0 @@
-<?php
-class PNGHandlerTest extends MediaWikiTestCase {
-
-	/** @var PNGHandler */
-	protected $handler;
-	/** @var FSRepo */
-	protected $repo;
-	/** @var FSFileBackend */
-	protected $backend;
-	/** @var string */
-	protected $filePath;
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->filePath = __DIR__ . '/../../data/media';
-		$this->backend = new FSFileBackend( array(
-			'name' => 'localtesting',
-			'lockManager' => 'nullLockManager',
-			'containerPaths' => array( 'data' => $this->filePath )
-		) );
-		$this->repo = new FSRepo( array(
-			'name' => 'temp',
-			'url' => 'http://localhost/thumbtest',
-			'backend' => $this->backend
-		) );
-		$this->handler = new PNGHandler();
-	}
-
-	/**
-	 * @covers PNGHandler::getMetadata
-	 */
-	public function testInvalidFile() {
-		$res = $this->handler->getMetadata( null, $this->filePath . '/README' );
-		$this->assertEquals( PNGHandler::BROKEN_FILE, $res );
-	}
-
-	/**
-	 * @param $filename String basename of the file to check
-	 * @param $expected boolean Expected result.
-	 * @dataProvider provideIsAnimated
-	 * @covers PNGHandler::isAnimatedImage
-	 */
-	public function testIsAnimanted( $filename, $expected ) {
-		$file = $this->dataFile( $filename, 'image/png' );
-		$actual = $this->handler->isAnimatedImage( $file );
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public static function provideIsAnimated() {
-		return array(
-			array( 'Animated_PNG_example_bouncing_beach_ball.png', true ),
-			array( '1bit-png.png', false ),
-		);
-	}
-
-	/**
-	 * @param $filename String
-	 * @param $expected Integer Total image area
-	 * @dataProvider provideGetImageArea
-	 * @covers PNGHandler::getImageArea
-	 */
-	public function testGetImageArea( $filename, $expected ) {
-		$file = $this->dataFile( $filename, 'image/png' );
-		$actual = $this->handler->getImageArea( $file, $file->getWidth(), $file->getHeight() );
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public static function provideGetImageArea() {
-		return array(
-			array( '1bit-png.png', 2500 ),
-			array( 'greyscale-png.png', 2500 ),
-			array( 'Png-native-test.png', 126000 ),
-			array( 'Animated_PNG_example_bouncing_beach_ball.png', 10000 ),
-		);
-	}
-
-	/**
-	 * @param $metadata String Serialized metadata
-	 * @param $expected Integer One of the class constants of PNGHandler
-	 * @dataProvider provideIsMetadataValid
-	 * @covers PNGHandler::isMetadataValid
-	 */
-	public function testIsMetadataValid( $metadata, $expected ) {
-		$actual = $this->handler->isMetadataValid( null, $metadata );
-		$this->assertEquals( $expected, $actual );
-	}
-
-	public static function provideIsMetadataValid() {
-		return array(
-			array( PNGHandler::BROKEN_FILE, PNGHandler::METADATA_GOOD ),
-			array( '', PNGHandler::METADATA_BAD ),
-			array( null, PNGHandler::METADATA_BAD ),
-			array( 'Something invalid!', PNGHandler::METADATA_BAD ),
-			array( 'a:6:{s:10:"frameCount";i:0;s:9:"loopCount";i:1;s:8:"duration";d:0;s:8:"bitDepth";i:8;s:9:"colorType";s:10:"truecolour";s:8:"metadata";a:1:{s:15:"_MW_PNG_VERSION";i:1;}}', PNGHandler::METADATA_GOOD ),
-		);
-	}
-
-	/**
-	 * @param $filename String
-	 * @param $expected String Serialized array
-	 * @dataProvider provideGetMetadata
-	 * @covers PNGHandler::getMetadata
-	 */
-	public function testGetMetadata( $filename, $expected ) {
-		$file = $this->dataFile( $filename, 'image/png' );
-		$actual = $this->handler->getMetadata( $file, "$this->filePath/$filename" );
-//		$this->assertEquals( unserialize( $expected ), unserialize( $actual ) );
-		$this->assertEquals( ( $expected ), ( $actual ) );
-	}
-
-	public static function provideGetMetadata() {
-		return array(
-			array( 'rgb-na-png.png', 'a:6:{s:10:"frameCount";i:0;s:9:"loopCount";i:1;s:8:"duration";d:0;s:8:"bitDepth";i:8;s:9:"colorType";s:10:"truecolour";s:8:"metadata";a:1:{s:15:"_MW_PNG_VERSION";i:1;}}' ),
-			array( 'xmp.png', 'a:6:{s:10:"frameCount";i:0;s:9:"loopCount";i:1;s:8:"duration";d:0;s:8:"bitDepth";i:1;s:9:"colorType";s:14:"index-coloured";s:8:"metadata";a:2:{s:12:"SerialNumber";s:9:"123456789";s:15:"_MW_PNG_VERSION";i:1;}}' ),
-		);
-	}
-
-	private function dataFile( $name, $type ) {
-		return new UnregisteredLocalFile( false, $this->repo,
-			"mwstore://localtesting/data/$name", $type );
-	}
-}
-- 
cgit v1.2.3-54-g00ecf