Update to MediaWiki 1.19.0

16 files changed, 302 insertions, 107 deletions

diff --git a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
index a0d5cd86..f4f52dd8 100644
--- a/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
+++ b/tests/phpunit/includes/media/BitmapMetadataHandlerTest.php
@@ -14,10 +14,15 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 	 * translation (to en) where XMP should win.
 	 */
 	public function testMultilingualCascade() {
-		global $wgShowEXIF;
-		if ( !$wgShowEXIF ) {
-			$this->markTestIncomplete( "This test needs the exif extension." );
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
+		}
+		if ( !wfDl( 'xml' ) ) {
+			$this->markTestSkipped( "This test needs the xml extension." );
 		}
+		global $wgShowEXIF;
+		$oldExif = $wgShowEXIF;
+		$wgShowEXIF = true;
 
 		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
 			'/Xmp-exif-multilingual_test.jpg' );
@@ -32,6 +37,8 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 			'Did not extract any ImageDescription info?!' );
 
 		$this->assertEquals( $expected, $meta['ImageDescription'] );
+
+		$wgShowEXIF = $oldExif;
 	}
 
 	/**
@@ -49,6 +56,16 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 			$meta['JPEGFileComment'][0] );
 	}
 
+	/**
+	 * Make sure a bad iptc block doesn't stop the other metadata
+	 * from being extracted.
+	 */
+	public function testBadIPTC() {
+		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
+			'iptc-invalid-psir.jpg' );
+		$this->assertEquals( 'Created with GIMP', $meta['JPEGFileComment'][0] );
+	}
+
 	public function testIPTCDates() {
 		$meta = BitmapMetadataHandler::Jpeg( $this->filePath .
 			'iptc-timetest.jpg' );
@@ -95,6 +112,9 @@ class BitmapMetadataHandlerTest extends MediaWikiTestCase {
 	}
 
 	public function testPNGXMP() {
+		if ( !wfDl( 'xml' ) ) {
+			$this->markTestSkipped( "This test needs the xml extension." );
+		}
 		$handler = new BitmapMetadataHandler();
 		$result = $handler->png( $this->filePath . 'xmp.png' );
 		$expected = array (
diff --git a/tests/phpunit/includes/media/BitmapScalingTest.php b/tests/phpunit/includes/media/BitmapScalingTest.php
index 5bcd3232..11d9dc47 100644
--- a/tests/phpunit/includes/media/BitmapScalingTest.php
+++ b/tests/phpunit/includes/media/BitmapScalingTest.php
@@ -3,13 +3,16 @@
 class BitmapScalingTest extends MediaWikiTestCase {
 
 	function setUp() {
-		global $wgMaxImageArea;
+		global $wgMaxImageArea, $wgCustomConvertCommand;
 		$this->oldMaxImageArea = $wgMaxImageArea;
+		$this->oldCustomConvertCommand = $wgCustomConvertCommand;
 		$wgMaxImageArea = 1.25e7; // 3500x3500 
+		$wgCustomConvertCommand = 'dummy'; // Set so that we don't get client side rendering
 	}
 	function tearDown() {
-		global $wgMaxImageArea;
+		global $wgMaxImageArea, $wgCustomConvertCommand;
 		$wgMaxImageArea = $this->oldMaxImageArea;
+		$wgCustomConvertCommand = $this->oldCustomConvertCommand;
 	}
 	/**
 	 * @dataProvider provideNormaliseParams
@@ -105,14 +108,22 @@ class BitmapScalingTest extends MediaWikiTestCase {
 		$file = new FakeDimensionFile( array( 4000, 4000 ) );
 		$handler = new BitmapHandler;
 		$params = array( 'width' => '3700' ); // Still bigger than max size.
-		$this->assertFalse( $handler->normaliseParams( $file, $params ) );
+		$this->assertEquals( 'TransformParameterError', 
+			get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
 	}
 	function testTooBigMustRenderImage() {
 		$file = new FakeDimensionFile( array( 4000, 4000 ) );
 		$file->mustRender = true;
 		$handler = new BitmapHandler;
 		$params = array( 'width' => '5000' ); // Still bigger than max size.
-		$this->assertFalse( $handler->normaliseParams( $file, $params ) );
+		$this->assertEquals( 'TransformParameterError', 
+			get_class( $handler->doTransform( $file, 'dummy path', '', $params ) ) );
+	}
+	
+	function testImageArea() {
+		$file = new FakeDimensionFile( array( 7, 9 ) );
+		$handler = new BitmapHandler;
+		$this->assertEquals( 63, $handler->getImageArea( $file ) );
 	}
 }
 
@@ -120,7 +131,8 @@ class FakeDimensionFile extends File {
 	public $mustRender = false;
 
 	public function __construct( $dimensions ) {
-		parent::__construct( Title::makeTitle( NS_FILE, 'Test' ), null );
+		parent::__construct( Title::makeTitle( NS_FILE, 'Test' ), 
+			new NullRepo( null ) );
 		
 		$this->dimensions = $dimensions;
 	}
@@ -133,4 +145,7 @@ class FakeDimensionFile extends File {
 	public function mustRender() {
 		return $this->mustRender;
 	}
+	public function getPath() {
+		return '';
+	}
 }
diff --git a/tests/phpunit/includes/media/ExifBitmapTest.php b/tests/phpunit/includes/media/ExifBitmapTest.php
index 4282d3c8..b2f6b7ba 100644
--- a/tests/phpunit/includes/media/ExifBitmapTest.php
+++ b/tests/phpunit/includes/media/ExifBitmapTest.php
@@ -1,4 +1,5 @@
 <?php
+
 class ExifBitmapTest extends MediaWikiTestCase {
 
 	public function setUp() {
@@ -17,42 +18,23 @@ class ExifBitmapTest extends MediaWikiTestCase {
 	}
 
 	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 );
@@ -60,10 +42,6 @@ class ExifBitmapTest extends MediaWikiTestCase {
 	// 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 );
diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php
index 639091d0..25149a05 100644
--- a/tests/phpunit/includes/media/ExifRotationTest.php
+++ b/tests/phpunit/includes/media/ExifRotationTest.php
@@ -5,15 +5,26 @@
  */
 class ExifRotationTest extends MediaWikiTestCase {
 
+	/** track directories creations. Content will be deleted. */
+	private $createdDirs = array();
+
 	function setUp() {
 		parent::setUp();
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
 		$this->handler = new BitmapHandler();
-		$this->repo = new FSRepo(array(
-			'name' => 'temp',
-			'directory' => wfTempDir() . '/exif-test-' . time() . '-' . mt_rand(),
-			'url' => 'http://localhost/thumbtest'
-		));
+		$filePath = dirname( __FILE__ ) . '/../../data/media';
+
+		$tmpDir = wfTempDir() . '/exif-test-' . time() . '-' . mt_rand();
+		$this->createdDirs[] = $tmpDir;
+
+		$this->repo = new FSRepo( array(
+			'name'            => 'temp',
+			'url'             => 'http://localhost/thumbtest',
+			'backend'         => new FSFileBackend( array(
+				'name'           => 'localtesting',
+				'lockManager'    => 'nullLockManager',
+				'containerPaths' => array( 'temp-thumb' => $tmpDir, 'data' => $filePath )
+			) )
+		) );
 		if ( !wfDl( 'exif' ) ) {
 			$this->markTestSkipped( "This test needs the exif extension." );
 		}
@@ -25,10 +36,23 @@ class ExifRotationTest extends MediaWikiTestCase {
 		$this->oldAuto = $wgEnableAutoRotation;
 		$wgEnableAutoRotation = true;
 	}
+
 	public function tearDown() {
 		global $wgShowEXIF, $wgEnableAutoRotation;
 		$wgShowEXIF = $this->show;
 		$wgEnableAutoRotation = $this->oldAuto;
+
+		$this->tearDownFiles();
+	}
+
+	private function tearDownFiles() {
+		foreach( $this->createdDirs as $dir ) {
+			wfRecursiveRemoveDir( $dir );
+		}
+	}
+
+	function __destruct() {
+		$this->tearDownFiles();
 	}
 
 	/**
@@ -39,7 +63,7 @@ class ExifRotationTest extends MediaWikiTestCase {
 		if ( !BitmapHandler::canRotate() ) {
 			$this->markTestSkipped( "This test needs a rasterizer that can auto-rotate." );
 		}
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $name, $type );
+		$file = $this->dataFile( $name, $type );
 		$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
 		$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
 	}
@@ -66,13 +90,13 @@ class ExifRotationTest extends MediaWikiTestCase {
 				throw new MWException('bogus test data format ' . $size);
 			}
 
-			$file = $this->localFile( $name, $type );
-			$thumb = $file->transform( $params, File::RENDER_NOW );
+			$file = $this->dataFile( $name, $type );
+			$thumb = $file->transform( $params, File::RENDER_NOW | File::RENDER_FORCE );
 
 			$this->assertEquals( $out[0], $thumb->getWidth(), "$name: thumb reported width check for $size" );
 			$this->assertEquals( $out[1], $thumb->getHeight(), "$name: thumb reported height check for $size" );
 
-			$gis = getimagesize( $thumb->getPath() );
+			$gis = getimagesize( $thumb->getLocalCopyPath() );
 			if ($out[0] > $info['width']) {
 				// Physical image won't be scaled bigger than the original.
 				$this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size");
@@ -84,8 +108,9 @@ class ExifRotationTest extends MediaWikiTestCase {
 		}
 	}
 
-	private function localFile( $name, $type ) {
-		return new UnregisteredLocalFile( false, $this->repo, $this->filePath . $name, $type );
+	private function dataFile( $name, $type ) {
+		return new UnregisteredLocalFile( false, $this->repo,
+			"mwstore://localtesting/data/$name", $type );
 	}
 
 	function providerFiles() {
@@ -129,7 +154,7 @@ class ExifRotationTest extends MediaWikiTestCase {
 		global $wgEnableAutoRotation;
 		$wgEnableAutoRotation = false;
 
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $name, $type );
+		$file = $this->dataFile( $name, $type );
 		$this->assertEquals( $info['width'], $file->getWidth(), "$name: width check" );
 		$this->assertEquals( $info['height'], $file->getHeight(), "$name: height check" );
 
@@ -158,13 +183,13 @@ class ExifRotationTest extends MediaWikiTestCase {
 				throw new MWException('bogus test data format ' . $size);
 			}
 
-			$file = $this->localFile( $name, $type );
-			$thumb = $file->transform( $params, File::RENDER_NOW );
+			$file = $this->dataFile( $name, $type );
+			$thumb = $file->transform( $params, File::RENDER_NOW | File::RENDER_FORCE );
 
 			$this->assertEquals( $out[0], $thumb->getWidth(), "$name: thumb reported width check for $size" );
 			$this->assertEquals( $out[1], $thumb->getHeight(), "$name: thumb reported height check for $size" );
 
-			$gis = getimagesize( $thumb->getPath() );
+			$gis = getimagesize( $thumb->getLocalCopyPath() );
 			if ($out[0] > $info['width']) {
 				// Physical image won't be scaled bigger than the original.
 				$this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size");
@@ -242,7 +267,7 @@ class ExifRotationTest extends MediaWikiTestCase {
 			array(
 				270,
 				array( self::TEST_HEIGHT, self::TEST_WIDTH ) 
-			),			
+			),
 		);
 	}
 }
diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php
index 9b490e92..b39c15e4 100644
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -4,6 +4,9 @@ class ExifTest extends MediaWikiTestCase {
 	public function setUp() {
 		$this->mediaPath = dirname( __FILE__ ) . '/../../data/media/';
 
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
+		}
                 global $wgShowEXIF;
                 $this->showExif = $wgShowEXIF;
                 $wgShowEXIF = true;
@@ -14,9 +17,6 @@ class ExifTest extends MediaWikiTestCase {
         }
 
 	public function testGPSExtraction() {
-		if ( !wfDl( 'exif' ) ) {
-			$this->markTestIncomplete( "This test needs the exif extension." );
-		}
 
 		$filename = $this->mediaPath . 'exif-gps.jpg';
 		$seg = JpegMetadataExtractor::segmentSplitter( $filename ); 
@@ -32,9 +32,6 @@ class ExifTest extends MediaWikiTestCase {
 		$this->assertEquals( $expected, $data, '', 0.0000000001 );
 	}
 	public function testUnicodeUserComment() {
-		if ( !wfDl( 'exif' ) ) {
-			$this->markTestIncomplete( "This test needs the exif extension." );
-		}
 
 		$filename = $this->mediaPath . 'exif-user-comment.jpg';
 		$seg = JpegMetadataExtractor::segmentSplitter( $filename ); 
diff --git a/tests/phpunit/includes/media/FormatMetadataTest.php b/tests/phpunit/includes/media/FormatMetadataTest.php
index db36dea3..8a632f52 100644
--- a/tests/phpunit/includes/media/FormatMetadataTest.php
+++ b/tests/phpunit/includes/media/FormatMetadataTest.php
@@ -1,13 +1,31 @@
 <?php
 class FormatMetadataTest extends MediaWikiTestCase {
-	public function testInvalidDate() {
-		global $wgShowEXIF;
-		if ( !$wgShowEXIF ) {
-			$this->markTestIncomplete( "This test needs the exif extension." );
+	public function setUp() {
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
 		}
-		
-		$file = UnregisteredLocalFile::newFromPath( dirname( __FILE__ ) . 
-			'/../../data/media/broken_exif_date.jpg', 'image/jpeg' );
+		$filePath = dirname( __FILE__ ) .  '/../../data/media';
+		$this->backend = new FSFileBackend( array(
+			'name'           => 'localtesting',
+			'lockManager'    => 'nullLockManager',
+			'containerPaths' => array( 'data' => $filePath )
+		) );
+		$this->repo = new FSRepo( array(
+			'name'    => 'temp',
+			'url'     => 'http://localhost/thumbtest',
+			'backend' => $this->backend
+		) );
+		global $wgShowEXIF;
+		$this->show = $wgShowEXIF;
+		$wgShowEXIF = true;
+	}
+	public function tearDown() {
+		global $wgShowEXIF;
+		$wgShowEXIF = $this->show;
+	}
+
+	public function testInvalidDate() {
+		$file = $this->dataFile( 'broken_exif_date.jpg', 'image/jpeg' );
 		
 		// Throws an error if bug hit
 		$meta = $file->formatMetadata();
@@ -26,4 +44,9 @@ class FormatMetadataTest extends MediaWikiTestCase {
 			$meta['visible'][$dateIndex]['value'],
 			'File with invalid date metadata (bug 29471)' );
 	}
-}
\ No newline at end of file
+
+	private function dataFile( $name, $type ) {
+		return new UnregisteredLocalFile( false, $this->repo,
+			"mwstore://localtesting/data/$name", $type );
+	}
+}
diff --git a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
index 59b30441..47fc368b 100644
--- a/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/GIFMetadataExtractorTest.php
@@ -63,6 +63,7 @@ class GIFMetadataExtractorTest extends MediaWikiTestCase {
                                                                                                     
 <?xpacket end='w'?>
 EOF;
+		$xmpNugget = str_replace( "\r", '', $xmpNugget ); // Windows compat
 
 		return array(
 			array( 'nonanimated.gif', array(
diff --git a/tests/phpunit/includes/media/GIFTest.php b/tests/phpunit/includes/media/GIFTest.php
index 42c25ca5..36658358 100644
--- a/tests/phpunit/includes/media/GIFTest.php
+++ b/tests/phpunit/includes/media/GIFTest.php
@@ -2,12 +2,22 @@
 class GIFHandlerTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = dirname( __FILE__ ) .  '/../../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 GIFHandler();
 	}
 
 	public function testInvalidFile() {
-		$res = $this->handler->getMetadata( null, $this->filePath . 'README' );
+		$res = $this->handler->getMetadata( null, $this->filePath . '/README' );
 		$this->assertEquals( GIFHandler::BROKEN_FILE, $res );
 	}
 	/**
@@ -16,8 +26,7 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataIsAnimated
 	 */
 	public function testIsAnimanted( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/gif' );
+		$file = $this->dataFile( $filename, 'image/gif' );
 		$actual = $this->handler->isAnimatedImage( $file );
 		$this->assertEquals( $expected, $actual );
 	}
@@ -34,8 +43,7 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataGetImageArea
 	 */
 	public function testGetImageArea( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/gif' );
+		$file = $this->dataFile( $filename, 'image/gif' );
 		$actual = $this->handler->getImageArea( $file, $file->getWidth(), $file->getHeight() );
 		$this->assertEquals( $expected, $actual );
 	}
@@ -71,15 +79,20 @@ class GIFHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataGetMetadata
 	 */
 	public function testGetMetadata( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/gif' );
-		$actual = $this->handler->getMetadata( $file, $this->filePath . $filename );
+		$file = $this->dataFile( $filename, 'image/gif' );
+		$actual = $this->handler->getMetadata( $file, "$this->filePath/$filename" );
 		$this->assertEquals( unserialize( $expected ), unserialize( $actual ) );
 	}
+
 	public function dataGetMetadata() {
 		return array(
 			array( 'nonanimated.gif', 'a:4:{s:10:"frameCount";i:1;s:6:"looped";b:0;s:8:"duration";d:0.1000000000000000055511151231257827021181583404541015625;s:8:"metadata";a:2:{s:14:"GIFFileComment";a:1:{i:0;s:35:"GIF test file ⁕ Created with GIMP";}s:15:"_MW_GIF_VERSION";i:1;}}' ),
 			array( 'animated-xmp.gif', 'a:4:{s:10:"frameCount";i:4;s:6:"looped";b:1;s:8:"duration";d:2.399999999999999911182158029987476766109466552734375;s:8:"metadata";a:5:{s:6:"Artist";s:7:"Bawolff";s:16:"ImageDescription";a:2:{s:9:"x-default";s:18:"A file to test GIF";s:5:"_type";s:4:"lang";}s:15:"SublocationDest";s:13:"The interwebs";s:14:"GIFFileComment";a:1:{i:0;s:16:"GIƒ·test·file";}s:15:"_MW_GIF_VERSION";i:1;}}' ),
 		);
 	}
+
+	private function dataFile( $name, $type ) {
+		return new UnregisteredLocalFile( false, $this->repo,
+			"mwstore://localtesting/data/$name", $type );
+	}
 }
diff --git a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
index 61fc9c81..f48382a4 100644
--- a/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/JpegMetadataExtractorTest.php
@@ -1,5 +1,5 @@
 <?php
-/*
+/**
  * @todo Could use a test of extended XMP segments. Hard to find programs that
  * create example files, and creating my own in vim propbably wouldn't
  * serve as a very good "test". (Adobe photoshop probably creates such files
@@ -59,7 +59,7 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 	public function testPSIRExtraction() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-psir.jpg' );
 		$expected = '50686f746f73686f7020332e30003842494d04040000000000181c02190004746573741c02190003666f6f1c020000020004';
-		$this->assertEquals( $expected, bin2hex( $res['PSIR'] ) );
+		$this->assertEquals( $expected, bin2hex( $res['PSIR'][0] ) );
 	}
 	public function testXMPExtractionAltAppId() {
 		$res = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-alt.jpg' );
@@ -70,19 +70,19 @@ class JpegMetadataExtractorTest extends MediaWikiTestCase {
 
 	public function testIPTCHashComparisionNoHash() {
 		$segments = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-xmp-psir.jpg' );
-		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'] );
+		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'][0] );
 
 		$this->assertEquals( 'iptc-no-hash', $res );
 	}
 	public function testIPTCHashComparisionBadHash() {
 		$segments = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-iptc-bad-hash.jpg' );
-		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'] );
+		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'][0] );
 
 		$this->assertEquals( 'iptc-bad-hash', $res );
 	}
 	public function testIPTCHashComparisionGoodHash() {
 		$segments = JpegMetadataExtractor::segmentSplitter( $this->filePath . 'jpeg-iptc-good-hash.jpg' );
-		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'] );
+		$res = JpegMetadataExtractor::doPSIR( $segments['PSIR'][0] );
 
 		$this->assertEquals( 'iptc-good-hash', $res );
 	}
diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php
index 713a3410..ddabf5b8 100644
--- a/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -3,22 +3,24 @@ class JpegTest extends MediaWikiTestCase {
 
 	public function setUp() {
 		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		if ( !wfDl( 'exif' ) ) {
+			$this->markTestSkipped( "This test needs the exif extension." );
+		}
+		global $wgShowEXIF;
+		$this->show = $wgShowEXIF;
+		$wgShowEXIF = true;
+	}
+	public function tearDown() {
+		global $wgShowEXIF;
+		$wgShowEXIF = $this->show;
 	}
 
 	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;}';
diff --git a/tests/phpunit/includes/media/MediaHandlerTest.php b/tests/phpunit/includes/media/MediaHandlerTest.php
new file mode 100644
index 00000000..99df4f80
--- /dev/null
+++ b/tests/phpunit/includes/media/MediaHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+class MediaHandlerTest extends MediaWikiTestCase {
+	function testFitBoxWidth() {
+		$vals = array(
+			array(
+				'width' => 50,
+				'height' => 50,
+				'tests' => array(
+					50 => 50,
+					17 => 17,
+					18 => 18 ) ),
+			array(
+				'width' => 366,
+				'height' => 300,
+				'tests' => array(
+					50 => 61,
+					17 => 21,
+					18 => 22 ) ),
+			array(
+				'width' => 300,
+				'height' => 366,
+				'tests' => array(
+					50 => 41,
+					17 => 14,
+					18 => 15 ) ),
+			array(
+				'width' => 100,
+				'height' => 400,
+				'tests' => array(
+					50 => 12,
+					17 => 4,
+					18 => 4 ) ) );
+		foreach ( $vals as $row ) {
+			$tests = $row['tests'];
+			$height = $row['height'];
+			$width = $row['width'];
+			foreach ( $tests as $max => $expected ) {
+				$y = round( $expected * $height / $width );
+				$result = MediaHandler::fitBoxWidth( $width, $height, $max );
+				$y2 = round( $result * $height / $width );
+				$this->assertEquals( $expected,
+					$result,
+					"($width, $height, $max) wanted: {$expected}x$y, got: {$result}x$y2" );
+			}
+		}
+	}
+}
+
+
diff --git a/tests/phpunit/includes/media/PNGTest.php b/tests/phpunit/includes/media/PNGTest.php
index b782918c..b6f911fd 100644
--- a/tests/phpunit/includes/media/PNGTest.php
+++ b/tests/phpunit/includes/media/PNGTest.php
@@ -2,12 +2,22 @@
 class PNGHandlerTest extends MediaWikiTestCase {
 
 	public function setUp() {
-		$this->filePath = dirname( __FILE__ ) . '/../../data/media/';
+		$this->filePath = dirname( __FILE__ ) .  '/../../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();
 	}
 
 	public function testInvalidFile() {
-		$res = $this->handler->getMetadata( null, $this->filePath . 'README' );
+		$res = $this->handler->getMetadata( null, $this->filePath . '/README' );
 		$this->assertEquals( PNGHandler::BROKEN_FILE, $res );
 	}
 	/**
@@ -16,8 +26,7 @@ class PNGHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataIsAnimated
 	 */
 	public function testIsAnimanted( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/png' );
+		$file = $this->dataFile( $filename, 'image/png' );
 		$actual = $this->handler->isAnimatedImage( $file );
 		$this->assertEquals( $expected, $actual );
 	}
@@ -34,8 +43,7 @@ class PNGHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataGetImageArea
 	 */
 	public function testGetImageArea( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/png' );
+		$file = $this->dataFile($filename, 'image/png' );
 		$actual = $this->handler->getImageArea( $file, $file->getWidth(), $file->getHeight() );
 		$this->assertEquals( $expected, $actual );
 	}
@@ -73,9 +81,8 @@ class PNGHandlerTest extends MediaWikiTestCase {
 	 * @dataProvider dataGetMetadata
 	 */
 	public function testGetMetadata( $filename, $expected ) {
-		$file = UnregisteredLocalFile::newFromPath( $this->filePath . $filename,
-			'image/png' );
-		$actual = $this->handler->getMetadata( $file, $this->filePath . $filename );
+		$file = $this->dataFile( $filename, 'image/png' );
+		$actual = $this->handler->getMetadata( $file, "$this->filePath/$filename" );
 //		$this->assertEquals( unserialize( $expected ), unserialize( $actual ) );
 		$this->assertEquals( ( $expected ), ( $actual ) );
 	}
@@ -85,4 +92,9 @@ class PNGHandlerTest extends MediaWikiTestCase {
 			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 );
+	}
 }
diff --git a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
index c2c81b98..526beae8 100644
--- a/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
+++ b/tests/phpunit/includes/media/SVGMetadataExtractorTest.php
@@ -62,23 +62,33 @@ class SVGMetadataExtractorTest extends MediaWikiTestCase {
 					'height' => 60
 				)
 			),
+			array(
+				"$base/Toll_Texas_1.svg",
+				// This file triggered bug 31719, needs entity expansion in the xmlns checks
+				array(
+					'width' => 385,
+					'height' => 385
+				)
+			)
 		);
 	}
 
 	function providerSvgFilesWithXMLMetadata() {
 		$base = dirname( __FILE__ ) . '/../../data/media';
-		return array(
-			array(
-				"$base/US_states_by_total_state_tax_revenue.svg",
-				array(
-					'height' => 593,
-					'metadata' =>
+		$metadata = 
     '<rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#">
       <ns4:Work xmlns:ns4="http://creativecommons.org/ns#" rdf:about="">
         <ns5:format xmlns:ns5="http://purl.org/dc/elements/1.1/">image/svg+xml</ns5:format>
         <ns5:type xmlns:ns5="http://purl.org/dc/elements/1.1/" rdf:resource="http://purl.org/dc/dcmitype/StillImage"/>
       </ns4:Work>
-    </rdf:RDF>',
+    </rdf:RDF>';
+		$metadata = str_replace( "\r", '', $metadata ); // Windows compat
+		return array(
+			array(
+				"$base/US_states_by_total_state_tax_revenue.svg",
+				array(
+					'height' => 593,
+					'metadata' => $metadata,
 					'width' => 959
 				)
 			),
diff --git a/tests/phpunit/includes/media/TiffTest.php b/tests/phpunit/includes/media/TiffTest.php
index 0a7e8e8c..d4cf503b 100644
--- a/tests/phpunit/includes/media/TiffTest.php
+++ b/tests/phpunit/includes/media/TiffTest.php
@@ -15,16 +15,15 @@ class TiffTest extends MediaWikiTestCase {
 	}
 
 	public function testInvalidFile() {
-		global $wgShowEXIF;
-		if ( !$wgShowEXIF ) {
+		if ( !wfDl( 'exif' ) ) {
 			$this->markTestIncomplete( "This test needs the exif extension." );
 		}
 		$res = $this->handler->getMetadata( null, $this->filePath . 'README' );
 		$this->assertEquals( ExifBitmapHandler::BROKEN_FILE, $res );
 	}
+
 	public function testTiffMetadataExtraction() {
-		global $wgShowEXIF;
-		if ( !$wgShowEXIF ) {
+		if ( !wfDl( 'exif' ) ) {
 			$this->markTestIncomplete( "This test needs the exif extension." );
 		}
 		$res = $this->handler->getMetadata( null, $this->filePath . 'test.tiff' );
diff --git a/tests/phpunit/includes/media/XMPTest.php b/tests/phpunit/includes/media/XMPTest.php
index d1ec4767..c952b23c 100644
--- a/tests/phpunit/includes/media/XMPTest.php
+++ b/tests/phpunit/includes/media/XMPTest.php
@@ -1,6 +1,12 @@
 <?php
 class XMPTest extends MediaWikiTestCase {
 
+	function setUp() {
+		if ( !wfDl( 'xml' ) ) {
+			$this->markTestSkipped( 'Requires libxml to do XMP parsing' );
+		}
+	}
+
 	/**
 	 * Put XMP in, compare what comes out...
 	 *
@@ -11,9 +17,6 @@ class XMPTest extends MediaWikiTestCase {
 	 * @dataProvider dataXMPParse
 	 */
 	public function testXMPParse( $xmp, $expected, $info ) {
-		if ( !function_exists( 'xml_parser_create_ns' ) ) {
-			$this->markIncomplete( 'Requires libxml to do XMP parsing' );
-		}
 		if ( !is_string( $xmp ) || !is_array( $expected ) ) {
 			throw new Exception( "Invalid data provided to " . __METHOD__ );
 		}
diff --git a/tests/phpunit/includes/media/XMPValidateTest.php b/tests/phpunit/includes/media/XMPValidateTest.php
new file mode 100644
index 00000000..e2bb8d8d
--- /dev/null
+++ b/tests/phpunit/includes/media/XMPValidateTest.php
@@ -0,0 +1,47 @@
+<?php
+class XMPValidateTest extends MediaWikiTestCase {
+
+	/**
+	 * @dataProvider providerDate
+	 */
+	function testValidateDate( $value, $expected ) {
+		// The method should modify $value.
+		XMPValidate::validateDate( array(), $value, true );
+		$this->assertEquals( $expected, $value );
+	}
+
+	function providerDate() {
+		/* For reference valid date formats are:
+		 * YYYY
+		 * YYYY-MM
+		 * YYYY-MM-DD
+		 * YYYY-MM-DDThh:mmTZD
+		 * YYYY-MM-DDThh:mm:ssTZD
+		 * YYYY-MM-DDThh:mm:ss.sTZD
+		 * (Time zone is optional)
+		 */
+		return array(
+			array( '1992', '1992' ),
+			array( '1992-04', '1992:04' ),
+			array( '1992-02-01', '1992:02:01' ),
+			array( '2011-09-29', '2011:09:29' ),
+			array( '1982-12-15T20:12', '1982:12:15 20:12' ),
+			array( '1982-12-15T20:12Z', '1982:12:15 20:12' ),
+			array( '1982-12-15T20:12+02:30', '1982:12:15 22:42' ),
+			array( '1982-12-15T01:12-02:30', '1982:12:14 22:42' ),
+			array( '1982-12-15T20:12:11', '1982:12:15 20:12:11' ),
+			array( '1982-12-15T20:12:11Z', '1982:12:15 20:12:11' ),
+			array( '1982-12-15T20:12:11+01:10', '1982:12:15 21:22:11' ),
+			array( '2045-12-15T20:12:11', '2045:12:15 20:12:11' ),
+			array( '1867-06-01T15:00:00', '1867:06:01 15:00:00' ),
+			/* some invalid ones */
+			array( '2001--12', null ),
+			array( '2001-5-12', null ),
+			array( '2001-5-12TZ', null ),
+			array( '2001-05-12T15', null ),
+			array( '2001-12T15:13', null ),
+		);
+
+	}
+
+}