From 99cfddab3d62e70d9080aeab9b3f610526567674 Mon Sep 17 00:00:00 2001 From: Brian Wolff Date: Wed, 17 Aug 2011 21:53:45 +0000 Subject: [PATCH] follow-up r91885 - address CR comments * rename testTiffFile to something more descriptive * unserialize the serialized results before comparing Also follow-up r92635 - rm an extra wfDl that was outside any functions, and I'm assuming accidentally there (?) --- tests/phpunit/includes/media/JpegTest.php | 7 +++---- tests/phpunit/includes/media/TiffTest.php | 7 ++++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php index da02fe5cfe..f0e37253ba 100644 --- a/tests/phpunit/includes/media/JpegTest.php +++ b/tests/phpunit/includes/media/JpegTest.php @@ -1,6 +1,4 @@ getMetadata( null, dirname( __FILE__ ) . '/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;}'; - // Hopefully php always serializes things in the same order. - $this->assertEquals( $expected, $res ); + + // Unserialize in case serialization format ever changes. + $this->assertEquals( unserialize( $expected ), unserialize( $res ) ); } } diff --git a/tests/phpunit/includes/media/TiffTest.php b/tests/phpunit/includes/media/TiffTest.php index fc191ec407..cb62ebbe93 100644 --- a/tests/phpunit/includes/media/TiffTest.php +++ b/tests/phpunit/includes/media/TiffTest.php @@ -21,14 +21,15 @@ class TiffTest extends MediaWikiTestCase { $this->assertEquals( ExifBitmapHandler::BROKEN_FILE, $res ); } - public function testTiffFile() { + public function testTiffMetadataExtraction() { if ( !wfDl( 'exif' ) ) { $this->markTestIncomplete( "This test needs the exif extension." ); } $tiff = new TiffHandler; $res = $tiff->getMetadata( null, dirname( __FILE__ ) . '/test.tiff' ); $expected = '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;}'; - // Hopefully php always serializes things in the same order. - $this->assertEquals( $expected, $res ); + // Re-unserialize in case there are subtle differences between how versions + // of php serialize stuff. + $this->assertEquals( unserialize( $expected ), unserialize( $res ) ); } } -- 2.20.1