| Index: trunk/phase3/tests/phpunit/includes/media/ExifRotationTest.php |
| — | — | @@ -26,32 +26,9 @@ |
| 27 | 27 | * @dataProvider providerFiles |
| 28 | 28 | */ |
| 29 | 29 | function testMetadata( $name, $type, $info ) { |
| 30 | | - # Force client side resizing |
| 31 | | - $params = array( 'width' => 10000, 'height' => 10000 ); |
| 32 | 30 | $file = UnregisteredLocalFile::newFromPath( $this->filePath . $name, $type ); |
| 33 | | - |
| 34 | | - # Normalize parameters |
| 35 | | - $this->assertTrue( $this->handler->normaliseParams( $file, $params ) ); |
| 36 | | - $rotation = $this->handler->getRotation( $file ); |
| 37 | | - |
| 38 | | - # Check if pre-rotation dimensions are still good |
| 39 | | - list( $width, $height ) = $this->handler->extractPreRotationDimensions( $params, $rotation ); |
| 40 | | - $this->assertEquals( $file->getWidth(), $width, |
| 41 | | - "$name: pre-rotation width check, $rotation:$width" ); |
| 42 | | - $this->assertEquals( $file->getHeight(), $height, |
| 43 | | - "$name: pre-rotation height check, $rotation" ); |
| 44 | | - |
| 45 | | - # Any further test require a scaler that can rotate |
| 46 | | - if ( !BitmapHandler::canRotate() ) { |
| 47 | | - $this->markTestSkipped( 'Scaler does not support rotation' ); |
| 48 | | - return; |
| 49 | | - } |
| 50 | | - |
| 51 | | - # Check post-rotation width |
| 52 | | - $this->assertEquals( $params['physicalWidth'], $info['width'], |
| 53 | | - "$name: post-rotation width check" ); |
| 54 | | - $this->assertEquals( $params['physicalHeight'], $info['height'], |
| 55 | | - "$name: post-rotation height check" ); |
| | 31 | + $this->assertEquals( $file->getWidth(), $info['width'], "$name: width check" ); |
| | 32 | + $this->assertEquals( $file->getHeight(), $info['height'], "$name: height check" ); |
| 56 | 33 | } |
| 57 | 34 | |
| 58 | 35 | function providerFiles() { |