Merge "Detect user rights conflicts"

[lhc/web/wiklou.git] / tests / phpunit / includes / media / JpegTest.php

diff --git a/tests/phpunit/includes/media/JpegTest.php b/tests/phpunit/includes/media/JpegTest.php
index 3a2900b..05d3661 100644 (file)
--- a/tests/phpunit/includes/media/JpegTest.php
+++ b/tests/phpunit/includes/media/JpegTest.php
@@ -1,22 +1,24 @@
 <?php
 class JpegTest extends MediaWikiTestCase {
 
-       public function setUp() {
-               $this->filePath = dirname( __FILE__ ) . '/../../data/media/';
-       }
+       protected function setUp() {
+               parent::setUp();
 
-       public function testInvalidFile() {
+               $this->filePath = __DIR__ . '/../../data/media/';
                if ( !wfDl( 'exif' ) ) {
-                       $this->markTestIncomplete( "This test needs the exif extension." );
+                       $this->markTestSkipped( "This test needs the exif extension." );
                }
+
+               $this->setMwGlobals( 'wgShowEXIF', true );
+       }
+
+       public function testInvalidFile() {
                $jpeg = new JpegHandler;
                $res = $jpeg->getMetadata( null, $this->filePath . 'README' );
                $this->assertEquals( ExifBitmapHandler::BROKEN_FILE, $res );
        }
+
        public function testJpegMetadataExtraction() {
-               if ( !wfDl( 'exif' ) ) {
-                       $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;}';