Merge "Revert "Log the reason why revision->getContent() returns null""

[lhc/web/wiklou.git] / tests / phpunit / includes / filerepo / file / FileTest.php

diff --git a/tests/phpunit/includes/filerepo/file/FileTest.php b/tests/phpunit/includes/filerepo/file/FileTest.php
index 5b5f1b0..3f4e46b 100644 (file)
--- a/tests/phpunit/includes/filerepo/file/FileTest.php
+++ b/tests/phpunit/includes/filerepo/file/FileTest.php
@@ -6,6 +6,7 @@ class FileTest extends MediaWikiMediaTestCase {
         * @param string $filename
         * @param bool $expected
         * @dataProvider providerCanAnimate
+        * @covers File::canAnimateThumbIfAppropriate
         */
        function testCanAnimateThumbIfAppropriate( $filename, $expected ) {
                $this->setMwGlobals( 'wgMaxAnimatedGifArea', 9000 );
@@ -37,7 +38,7 @@ class FileTest extends MediaWikiMediaTestCase {
                $this->setMwGlobals( 'wgThumbnailBuckets', $data['buckets'] );
                $this->setMwGlobals( 'wgThumbnailMinimumBucketDistance', $data['minimumBucketDistance'] );
 
-               $fileMock = $this->getMockBuilder( 'File' )
+               $fileMock = $this->getMockBuilder( File::class )
                        ->setConstructorArgs( [ 'fileMock', false ] )
                        ->setMethods( [ 'getWidth' ] )
                        ->getMockForAbstractClass();
@@ -136,11 +137,11 @@ class FileTest extends MediaWikiMediaTestCase {
         * @covers File::getThumbnailSource
         */
        public function testGetThumbnailSource( $data ) {
-               $backendMock = $this->getMockBuilder( 'FSFileBackend' )
+               $backendMock = $this->getMockBuilder( FSFileBackend::class )
                        ->setConstructorArgs( [ [ 'name' => 'backendMock', 'wikiId' => wfWikiID() ] ] )
                        ->getMock();
 
-               $repoMock = $this->getMockBuilder( 'FileRepo' )
+               $repoMock = $this->getMockBuilder( FileRepo::class )
                        ->setConstructorArgs( [ [ 'name' => 'repoMock', 'backend' => $backendMock ] ] )
                        ->setMethods( [ 'fileExists', 'getLocalReference' ] )
                        ->getMock();
@@ -155,13 +156,13 @@ class FileTest extends MediaWikiMediaTestCase {
                        ->method( 'getLocalReference' )
                        ->will( $this->returnValue( $fsFile ) );
 
-               $handlerMock = $this->getMockBuilder( 'BitmapHandler' )
+               $handlerMock = $this->getMockBuilder( BitmapHandler::class )
                        ->setMethods( [ 'supportsBucketing' ] )->getMock();
                $handlerMock->expects( $this->any() )
                        ->method( 'supportsBucketing' )
                        ->will( $this->returnValue( $data['supportsBucketing'] ) );
 
-               $fileMock = $this->getMockBuilder( 'File' )
+               $fileMock = $this->getMockBuilder( File::class )
                        ->setConstructorArgs( [ 'fileMock', $repoMock ] )
                        ->setMethods( [ 'getThumbnailBucket', 'getLocalRefPath', 'getHandler' ] )
                        ->getMockForAbstractClass();
@@ -247,22 +248,22 @@ class FileTest extends MediaWikiMediaTestCase {
        public function testGenerateBucketsIfNeeded( $data ) {
                $this->setMwGlobals( 'wgThumbnailBuckets', $data['buckets'] );
 
-               $backendMock = $this->getMockBuilder( 'FSFileBackend' )
+               $backendMock = $this->getMockBuilder( FSFileBackend::class )
                        ->setConstructorArgs( [ [ 'name' => 'backendMock', 'wikiId' => wfWikiID() ] ] )
                        ->getMock();
 
-               $repoMock = $this->getMockBuilder( 'FileRepo' )
+               $repoMock = $this->getMockBuilder( FileRepo::class )
                        ->setConstructorArgs( [ [ 'name' => 'repoMock', 'backend' => $backendMock ] ] )
                        ->setMethods( [ 'fileExists', 'getLocalReference' ] )
                        ->getMock();
 
-               $fileMock = $this->getMockBuilder( 'File' )
+               $fileMock = $this->getMockBuilder( File::class )
                        ->setConstructorArgs( [ 'fileMock', $repoMock ] )
                        ->setMethods( [ 'getWidth', 'getBucketThumbPath', 'makeTransformTmpFile',
                                'generateAndSaveThumb', 'getHandler' ] )
                        ->getMockForAbstractClass();
 
-               $handlerMock = $this->getMockBuilder( 'JpegHandler' )
+               $handlerMock = $this->getMockBuilder( JpegHandler::class )
                        ->setMethods( [ 'supportsBucketing' ] )->getMock();
                $handlerMock->expects( $this->any() )
                        ->method( 'supportsBucketing' )
@@ -272,7 +273,7 @@ class FileTest extends MediaWikiMediaTestCase {
                        ->method( 'getHandler' )
                        ->will( $this->returnValue( $handlerMock ) );
 
-               $reflectionMethod = new ReflectionMethod( 'File', 'generateBucketsIfNeeded' );
+               $reflectionMethod = new ReflectionMethod( File::class, 'generateBucketsIfNeeded' );
                $reflectionMethod->setAccessible( true );
 
                $fileMock->expects( $this->any() )