| Index: trunk/phase3/tests/phpunit/includes/media/ExifTest.php |
| — | — | @@ -7,17 +7,17 @@ |
| 8 | 8 | if ( !wfDl( 'exif' ) ) { |
| 9 | 9 | $this->markTestSkipped( "This test needs the exif extension." ); |
| 10 | 10 | } |
| 11 | | - global $wgShowEXIF; |
| 12 | | - $this->showExif = $wgShowEXIF; |
| 13 | | - $wgShowEXIF = true; |
| | 11 | + global $wgShowEXIF; |
| | 12 | + $this->showExif = $wgShowEXIF; |
| | 13 | + $wgShowEXIF = true; |
| 14 | 14 | } |
| 15 | | - public function tearDown() { |
| 16 | | - global $wgShowEXIF; |
| 17 | | - $wgShowEXIF = $this->showExif; |
| 18 | | - } |
| 19 | 15 | |
| | 16 | + public function tearDown() { |
| | 17 | + global $wgShowEXIF; |
| | 18 | + $wgShowEXIF = $this->showExif; |
| | 19 | + } |
| | 20 | + |
| 20 | 21 | public function testGPSExtraction() { |
| 21 | | - |
| 22 | 22 | $filename = $this->mediaPath . 'exif-gps.jpg'; |
| 23 | 23 | $seg = JpegMetadataExtractor::segmentSplitter( $filename ); |
| 24 | 24 | $exif = new Exif( $filename, $seg['byteOrder'] ); |
| — | — | @@ -31,8 +31,8 @@ |
| 32 | 32 | ); |
| 33 | 33 | $this->assertEquals( $expected, $data, '', 0.0000000001 ); |
| 34 | 34 | } |
| | 35 | + |
| 35 | 36 | public function testUnicodeUserComment() { |
| 36 | | - |
| 37 | 37 | $filename = $this->mediaPath . 'exif-user-comment.jpg'; |
| 38 | 38 | $seg = JpegMetadataExtractor::segmentSplitter( $filename ); |
| 39 | 39 | $exif = new Exif( $filename, $seg['byteOrder'] ); |