Update to MediaWiki 1.18.0

* also update ArchLinux skin to chagnes in MonoBook
* Use only css to hide our menu bar when printing

1 files changed, 122 insertions, 0 deletions

diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php b/tests/phpunit/includes/media/ExifBitmapTest.php
new file mode 100644
index 00000000..4282d3c8
--- /dev/null
+++ b/tests/phpunit/includes/media/ExifBitmapTest.php
@@ -0,0 +1,122 @@
+<?php
+class ExifBitmapTest extends MediaWikiTestCase {
+
+	public function setUp() {
+		global $wgShowEXIF;
+		$this->showExif = $wgShowEXIF;
+		$wgShowEXIF = true;
+		$this->handler = new ExifBitmapHandler;
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
+		}
+	}
+
+	public function tearDown() {
+		global $wgShowEXIF;
+		$wgShowEXIF = $this->showExif;
+	}
+
+	public function testIsOldBroken() {
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$res = $this->handler->isMetadataValid( null, ExifBitmapHandler::OLD_BROKEN_FILE );
+		$this->assertEquals( ExifBitmapHandler::METADATA_COMPATIBLE, $res );
+	}
+	public function testIsBrokenFile() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$res = $this->handler->isMetadataValid( null, ExifBitmapHandler::BROKEN_FILE );
+		$this->assertEquals( ExifBitmapHandler::METADATA_GOOD, $res );
+	}
+	public function testIsInvalid() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$res = $this->handler->isMetadataValid( null, 'Something Invalid Here.' );
+		$this->assertEquals( ExifBitmapHandler::METADATA_BAD, $res );
+	}
+	public function testGoodMetadata() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$meta = 'a:16:{s:10:"ImageWidth";i:20;s:11:"ImageLength";i:20;s:13:"BitsPerSample";a:3:{i:0;i:8;i:1;i:8;i:2;i:8;}s:11:"Compression";i:5;s:25:"PhotometricInterpretation";i:2;s:16:"ImageDescription";s:17:"Created with GIMP";s:12:"StripOffsets";i:8;s:11:"Orientation";i:1;s:15:"SamplesPerPixel";i:3;s:12:"RowsPerStrip";i:64;s:15:"StripByteCounts";i:238;s:11:"XResolution";s:19:"1207959552/16777216";s:11:"YResolution";s:19:"1207959552/16777216";s:19:"PlanarConfiguration";i:1;s:14:"ResolutionUnit";i:2;s:22:"MEDIAWIKI_EXIF_VERSION";i:2;}';
+		$res = $this->handler->isMetadataValid( null, $meta );
+		$this->assertEquals( ExifBitmapHandler::METADATA_GOOD, $res );
+	}
+	public function testIsOldGood() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$meta = 'a:16:{s:10:"ImageWidth";i:20;s:11:"ImageLength";i:20;s:13:"BitsPerSample";a:3:{i:0;i:8;i:1;i:8;i:2;i:8;}s:11:"Compression";i:5;s:25:"PhotometricInterpretation";i:2;s:16:"ImageDescription";s:17:"Created with GIMP";s:12:"StripOffsets";i:8;s:11:"Orientation";i:1;s:15:"SamplesPerPixel";i:3;s:12:"RowsPerStrip";i:64;s:15:"StripByteCounts";i:238;s:11:"XResolution";s:19:"1207959552/16777216";s:11:"YResolution";s:19:"1207959552/16777216";s:19:"PlanarConfiguration";i:1;s:14:"ResolutionUnit";i:2;s:22:"MEDIAWIKI_EXIF_VERSION";i:1;}';
+		$res = $this->handler->isMetadataValid( null, $meta );
+		$this->assertEquals( ExifBitmapHandler::METADATA_COMPATIBLE, $res );
+	}
+	// Handle metadata from paged tiff handler (gotten via instant commons)
+	// gracefully.
+	public function testPagedTiffHandledGracefully() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$meta = 'a:6:{s:9:"page_data";a:1:{i:1;a:5:{s:5:"width";i:643;s:6:"height";i:448;s:5:"alpha";s:4:"true";s:4:"page";i:1;s:6:"pixels";i:288064;}}s:10:"page_count";i:1;s:10:"first_page";i:1;s:9:"last_page";i:1;s:4:"exif";a:9:{s:10:"ImageWidth";i:643;s:11:"ImageLength";i:448;s:11:"Compression";i:5;s:25:"PhotometricInterpretation";i:2;s:11:"Orientation";i:1;s:15:"SamplesPerPixel";i:4;s:12:"RowsPerStrip";i:50;s:19:"PlanarConfiguration";i:1;s:22:"MEDIAWIKI_EXIF_VERSION";i:1;}s:21:"TIFF_METADATA_VERSION";s:3:"1.4";}';
+		$res = $this->handler->isMetadataValid( null, $meta );
+		$this->assertEquals( ExifBitmapHandler::METADATA_BAD, $res );
+	}
+
+	function testConvertMetadataLatest() {
+		$metadata = array(
+				'foo' => array( 'First', 'Second', '_type' => 'ol' ),
+				'MEDIAWIKI_EXIF_VERSION' => 2
+			 );
+		$res = $this->handler->convertMetadataVersion( $metadata, 2 );
+		$this->assertEquals( $metadata, $res );
+	}
+	function testConvertMetadataToOld() {
+		$metadata = array(
+			'foo' => array( 'First', 'Second', '_type' => 'ol' ),
+			'bar' => array( 'First', 'Second', '_type' => 'ul' ),
+			'baz' => array( 'First', 'Second' ),
+			'fred' => 'Single',
+			'MEDIAWIKI_EXIF_VERSION' => 2,
+		);
+		$expected = array(
+			'foo' => "\n#First\n#Second",
+			'bar' => "\n*First\n*Second",
+			'baz' => "\n*First\n*Second",
+			'fred' => 'Single',
+			'MEDIAWIKI_EXIF_VERSION' => 1,
+		);
+		$res = $this->handler->convertMetadataVersion( $metadata, 1 );
+		$this->assertEquals( $expected, $res );
+	}
+	function testConvertMetadataSoftware() {
+		$metadata = array(
+			'Software' => array( array('GIMP', '1.1' ) ),
+			'MEDIAWIKI_EXIF_VERSION' => 2,
+		);
+		$expected = array(
+			'Software' => 'GIMP (Version 1.1)',
+			'MEDIAWIKI_EXIF_VERSION' => 1,
+		);
+		$res = $this->handler->convertMetadataVersion( $metadata, 1 );
+		$this->assertEquals( $expected, $res );
+	}
+	function testConvertMetadataSoftwareNormal() {
+		$metadata = array(
+			'Software' => array( "GIMP 1.2", "vim" ),
+			'MEDIAWIKI_EXIF_VERSION' => 2,
+		);
+		$expected = array(
+			'Software' => "\n*GIMP 1.2\n*vim",
+			'MEDIAWIKI_EXIF_VERSION' => 1,
+		);
+		$res = $this->handler->convertMetadataVersion( $metadata, 1 );
+		$this->assertEquals( $expected, $res );
+	}
+}