Merge "Set initial language and variant user preferences to user's preferred variant...

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

diff --git a/tests/phpunit/includes/media/ExifTest.php b/tests/phpunit/includes/media/ExifTest.php
index 045777d..e7e95f7 100644 (file)
--- a/tests/phpunit/includes/media/ExifTest.php
+++ b/tests/phpunit/includes/media/ExifTest.php
@@ -1,25 +1,21 @@
 <?php
 class ExifTest extends MediaWikiTestCase {
 
-       public function setUp() {
+       protected function setUp() {
+               parent::setUp();
+
                $this->mediaPath = __DIR__ . '/../../data/media/';
 
                if ( !wfDl( 'exif' ) ) {
                        $this->markTestSkipped( "This test needs the exif extension." );
                }
-               global $wgShowEXIF;
-               $this->showExif = $wgShowEXIF;
-               $wgShowEXIF = true;
-       }
 
-       public function tearDown() {
-               global $wgShowEXIF;
-               $wgShowEXIF = $this->showExif;
+               $this->setMwGlobals( 'wgShowEXIF', true );
        }
 
        public function testGPSExtraction() {
                $filename = $this->mediaPath . 'exif-gps.jpg';
-               $seg = JpegMetadataExtractor::segmentSplitter( $filename ); 
+               $seg = JpegMetadataExtractor::segmentSplitter( $filename );
                $exif = new Exif( $filename, $seg['byteOrder'] );
                $data = $exif->getFilteredData();
                $expected = array(
@@ -34,7 +30,7 @@ class ExifTest extends MediaWikiTestCase {
 
        public function testUnicodeUserComment() {
                $filename = $this->mediaPath . 'exif-user-comment.jpg';
-               $seg = JpegMetadataExtractor::segmentSplitter( $filename ); 
+               $seg = JpegMetadataExtractor::segmentSplitter( $filename );
                $exif = new Exif( $filename, $seg['byteOrder'] );
                $data = $exif->getFilteredData();