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, 29 insertions, 0 deletions

diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php
new file mode 100644
index 00000000..713a3410
--- /dev/null
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -0,0 +1,29 @@
+<?php
+class JpegTest extends MediaWikiTestCase {
+
+	public function setUp() {
+		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+	}
+
+	public function testInvalidFile() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$jpeg = new JpegHandler;
+		$res = $jpeg->getMetadata( null, $this->filePath . 'README' );
+		$this->assertEquals( ExifBitmapHandler::BROKEN_FILE, $res );
+	}
+	public function testJpegMetadataExtraction() {
+		global $wgShowEXIF;
+		if ( !$wgShowEXIF ) {
+			$this->markTestIncomplete( "This test needs the exif extension." );
+		}
+		$h = new JpegHandler;
+		$res = $h->getMetadata( null, $this->filePath . 'test.jpg' );
+		$expected = 'a:7:{s:16:"ImageDescription";s:9:"Test file";s:11:"XResolution";s:4:"72/1";s:11:"YResolution";s:4:"72/1";s:14:"ResolutionUnit";i:2;s:16:"YCbCrPositioning";i:1;s:15:"JPEGFileComment";a:1:{i:0;s:17:"Created with GIMP";}s:22:"MEDIAWIKI_EXIF_VERSION";i:2;}';
+
+		// Unserialize in case serialization format ever changes.
+		$this->assertEquals( unserialize( $expected ), unserialize( $res ) );
+	}
+}