Tests: Make phpunit providers "public static".

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

diff --git a/tests/phpunit/includes/media/ExifRotationTest.php b/tests/phpunit/includes/media/ExifRotationTest.php
index 692a5f9..075e12e 100644 (file)
--- a/tests/phpunit/includes/media/ExifRotationTest.php
+++ b/tests/phpunit/includes/media/ExifRotationTest.php
@@ -1,7 +1,8 @@
 <?php
-
 /**
- * Tests related to auto rotation
+ * Tests related to auto rotation.
+ *
+ * @group medium
  */
 class ExifRotationTest extends MediaWikiTestCase {
 
@@ -13,11 +14,11 @@ class ExifRotationTest extends MediaWikiTestCase {
                $tmpDir = $this->getNewTempDirectory();
 
                $this->repo = new FSRepo( array(
-                       'name'            => 'temp',
-                       'url'             => 'http://localhost/thumbtest',
-                       'backend'         => new FSFileBackend( array(
-                               'name'           => 'localtesting',
-                               'lockManager'    => 'nullLockManager',
+                       'name' => 'temp',
+                       'url' => 'http://localhost/thumbtest',
+                       'backend' => new FSFileBackend( array(
+                               'name' => 'localtesting',
+                               'lockManager' => 'nullLockManager',
                                'containerPaths' => array( 'temp-thumb' => $tmpDir, 'data' => $filePath )
                        ) )
                ) );
@@ -62,8 +63,8 @@ class ExifRotationTest extends MediaWikiTestCase {
                if ( !BitmapHandler::canRotate() ) {
                        $this->markTestSkipped( "This test needs a rasterizer that can auto-rotate." );
                }
-               foreach( $thumbs as $size => $out ) {
-                       if( preg_match('/^(\d+)px$/', $size, $matches ) ) {
+               foreach ( $thumbs as $size => $out ) {
+                       if ( preg_match( '/^(\d+)px$/', $size, $matches ) ) {
                                $params = array(
                                        'width' => $matches[1],
                                );
@@ -73,7 +74,7 @@ class ExifRotationTest extends MediaWikiTestCase {
                                        'height' => $matches[2]
                                );
                        } else {
-                               throw new MWException('bogus test data format ' . $size);
+                               throw new MWException( 'bogus test data format ' . $size );
                        }
 
                        $file = $this->dataFile( $name, $type );
@@ -83,13 +84,13 @@ class ExifRotationTest extends MediaWikiTestCase {
                        $this->assertEquals( $out[1], $thumb->getHeight(), "$name: thumb reported height check for $size" );
 
                        $gis = getimagesize( $thumb->getLocalCopyPath() );
-                       if ($out[0] > $info['width']) {
+                       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");
-                               $this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size");
+                               $this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size" );
+                               $this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size" );
                        } else {
-                               $this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size");
-                               $this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size");
+                               $this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size" );
+                               $this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size" );
                        }
                }
        }
@@ -156,8 +157,8 @@ class ExifRotationTest extends MediaWikiTestCase {
                global $wgEnableAutoRotation;
                $wgEnableAutoRotation = false;
 
-               foreach( $thumbs as $size => $out ) {
-                       if( preg_match('/^(\d+)px$/', $size, $matches ) ) {
+               foreach ( $thumbs as $size => $out ) {
+                       if ( preg_match( '/^(\d+)px$/', $size, $matches ) ) {
                                $params = array(
                                        'width' => $matches[1],
                                );
@@ -167,7 +168,7 @@ class ExifRotationTest extends MediaWikiTestCase {
                                        'height' => $matches[2]
                                );
                        } else {
-                               throw new MWException('bogus test data format ' . $size);
+                               throw new MWException( 'bogus test data format ' . $size );
                        }
 
                        $file = $this->dataFile( $name, $type );
@@ -177,13 +178,13 @@ class ExifRotationTest extends MediaWikiTestCase {
                        $this->assertEquals( $out[1], $thumb->getHeight(), "$name: thumb reported height check for $size" );
 
                        $gis = getimagesize( $thumb->getLocalCopyPath() );
-                       if ($out[0] > $info['width']) {
+                       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");
-                               $this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size");
+                               $this->assertEquals( $info['width'], $gis[0], "$name: thumb actual width check for $size" );
+                               $this->assertEquals( $info['height'], $gis[1], "$name: thumb actual height check for $size" );
                        } else {
-                               $this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size");
-                               $this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size");
+                               $this->assertEquals( $out[0], $gis[0], "$name: thumb actual width check for $size" );
+                               $this->assertEquals( $out[1], $gis[1], "$name: thumb actual height check for $size" );
                        }
                }
                $wgEnableAutoRotation = true;
@@ -221,41 +222,40 @@ class ExifRotationTest extends MediaWikiTestCase {
                        )
                );
        }
-       
-       
+
+
        const TEST_WIDTH = 100;
        const TEST_HEIGHT = 200;
-       
+
        /**
         * @dataProvider provideBitmapExtractPreRotationDimensions
         */
        function testBitmapExtractPreRotationDimensions( $rotation, $expected ) {
                $result = $this->handler->extractPreRotationDimensions( array(
-                               'physicalWidth' => self::TEST_WIDTH, 
-                               'physicalHeight' => self::TEST_HEIGHT,
-                       ), $rotation );
+                       'physicalWidth' => self::TEST_WIDTH,
+                       'physicalHeight' => self::TEST_HEIGHT,
+               ), $rotation );
                $this->assertEquals( $expected, $result );
        }
-       
-       function provideBitmapExtractPreRotationDimensions() {
+
+       public static function provideBitmapExtractPreRotationDimensions() {
                return array(
                        array(
                                0,
-                               array( self::TEST_WIDTH, self::TEST_HEIGHT ) 
+                               array( self::TEST_WIDTH, self::TEST_HEIGHT )
                        ),
                        array(
                                90,
-                               array( self::TEST_HEIGHT, self::TEST_WIDTH ) 
+                               array( self::TEST_HEIGHT, self::TEST_WIDTH )
                        ),
                        array(
                                180,
-                               array( self::TEST_WIDTH, self::TEST_HEIGHT ) 
+                               array( self::TEST_WIDTH, self::TEST_HEIGHT )
                        ),
                        array(
                                270,
-                               array( self::TEST_HEIGHT, self::TEST_WIDTH ) 
+                               array( self::TEST_HEIGHT, self::TEST_WIDTH )
                        ),
                );
        }
 }
-