From 2e44b49a2db3026050b136de9b00f749dd3ff939 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Fri, 25 Apr 2014 06:26:49 +0200
Subject: Update to MediaWiki 1.22.6

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

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

diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
deleted file mode 100644
index a0e63a8a..00000000
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ /dev/null
@@ -1,167 +0,0 @@
-<?php
-class BitmapMetadataHandlerTest extends MediaWikiTestCase {
-
-	protected function setUp() {
-		parent::setUp();
-
-		$this->setMwGlobals( 'wgShowEXIF', false );
-
-		$this->filePath = __DIR__ . '/../../data/media/';
-	}
-
-	/**
-	 * Test if having conflicting metadata values from different
-	 * types of metadata, that the right one takes precedence.
-	 *
-	 * Basically the file has IPTC and XMP metadata, the
-	 * IPTC should override the XMP, except for the multilingual
-	 * translation (to en) where XMP should win.
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testMultilingualCascade() {
-		if ( !extension_loaded( 'exif' ) ) {
-			$this->markTestSkipped( "This test needs the exif extension." );
-		}
-		if ( !extension_loaded( 'xml' ) ) {
-			$this->markTestSkipped( "This test needs the xml extension." );
-		}
-
-		$this->setMwGlobals( 'wgShowEXIF', true );
-
-		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'/Xmp-exif-multilingual_test.jpg' );
-
-		$expected = array(
-			'x-default' => 'right(iptc)',
-			'en' => 'right translation',
-			'_type' => 'lang'
-		);
-
-		$this->assertArrayHasKey( 'ImageDescription', $meta,
-			'Did not extract any ImageDescription info?!' );
-
-		$this->assertEquals( $expected, $meta['ImageDescription'] );
-	}
-
-	/**
-	 * Test for jpeg comments are being handled by
-	 * BitmapMetadataHandler correctly.
-	 *
-	 * There's more extensive tests of comment extraction in
-	 * JpegMetadataExtractorTests.php
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testJpegComment() {
-		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'jpeg-comment-utf.jpg' );
-
-		$this->assertEquals( 'UTF-8 JPEG Comment — ¼',
-			$meta['JPEGFileComment'][0] );
-	}
-
-	/**
-	 * Make sure a bad iptc block doesn't stop the other metadata
-	 * from being extracted.
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testBadIPTC() {
-		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'iptc-invalid-psir.jpg' );
-		$this->assertEquals( 'Created with GIMP', $meta['JPEGFileComment'][0] );
-	}
-
-	/**
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testIPTCDates() {
-		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'iptc-timetest.jpg' );
-
-		$this->assertEquals( '2020:07:14 01:36:05', $meta['DateTimeDigitized'] );
-		$this->assertEquals( '1997:03:02 00:01:02', $meta['DateTimeOriginal'] );
-	}
-
-	/**
-	 * File has an invalid time (+ one valid but really weird time)
-	 * that shouldn't be included
-	 * @covers BitmapMetadataHandler::Jpeg
-	 */
-	public function testIPTCDatesInvalid() {
-		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
-			'iptc-timetest-invalid.jpg' );
-
-		$this->assertEquals( '1845:03:02 00:01:02', $meta['DateTimeOriginal'] );
-		$this->assertFalse( isset( $meta['DateTimeDigitized'] ) );
-	}
-
-	/**
-	 * XMP data should take priority over iptc data
-	 * when hash has been updated, but not when
-	 * the hash is wrong.
-	 * @covers BitmapMetadataHandler::addMetadata
-	 * @covers BitmapMetadataHandler::getMetadataArray
-	 */
-	public function testMerging() {
-		$merger = new BitmapMetadataHandler();
-		$merger->addMetadata( array( 'foo' => 'xmp' ), 'xmp-general' );
-		$merger->addMetadata( array( 'bar' => 'xmp' ), 'xmp-general' );
-		$merger->addMetadata( array( 'baz' => 'xmp' ), 'xmp-general' );
-		$merger->addMetadata( array( 'fred' => 'xmp' ), 'xmp-general' );
-		$merger->addMetadata( array( 'foo' => 'iptc (hash)' ), 'iptc-good-hash' );
-		$merger->addMetadata( array( 'bar' => 'iptc (bad hash)' ), 'iptc-bad-hash' );
-		$merger->addMetadata( array( 'baz' => 'iptc (bad hash)' ), 'iptc-bad-hash' );
-		$merger->addMetadata( array( 'fred' => 'iptc (no hash)' ), 'iptc-no-hash' );
-		$merger->addMetadata( array( 'baz' => 'exif' ), 'exif' );
-
-		$actual = $merger->getMetadataArray();
-		$expected = array(
-			'foo' => 'xmp',
-			'bar' => 'iptc (bad hash)',
-			'baz' => 'exif',
-			'fred' => 'xmp',
-		);
-		$this->assertEquals( $expected, $actual );
-	}
-
-	/**
-	 * @covers BitmapMetadataHandler::png
-	 */
-	public function testPNGXMP() {
-		if ( !extension_loaded( 'xml' ) ) {
-			$this->markTestSkipped( "This test needs the xml extension." );
-		}
-		$handler = new BitmapMetadataHandler();
-		$result = $handler->png( $this->filePath . 'xmp.png' );
-		$expected = array(
-			'frameCount' => 0,
-			'loopCount' => 1,
-			'duration' => 0,
-			'bitDepth' => 1,
-			'colorType' => 'index-coloured',
-			'metadata' => array(
-				'SerialNumber' => '123456789',
-				'_MW_PNG_VERSION' => 1,
-			),
-		);
-		$this->assertEquals( $expected, $result );
-	}
-
-	/**
-	 * @covers BitmapMetadataHandler::png
-	 */
-	public function testPNGNative() {
-		$handler = new BitmapMetadataHandler();
-		$result = $handler->png( $this->filePath . 'Png-native-test.png' );
-		$expected = 'http://example.com/url';
-		$this->assertEquals( $expected, $result['metadata']['Identifier']['x-default'] );
-	}
-
-	/**
-	 * @covers BitmapMetadataHandler::getTiffByteOrder
-	 */
-	public function testTiffByteOrder() {
-		$handler = new BitmapMetadataHandler();
-		$res = $handler->getTiffByteOrder( $this->filePath . 'test.tiff' );
-		$this->assertEquals( 'LE', $res );
-	}
-}
-- 
cgit v1.2.3-54-g00ecf