X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=tests%2Fphpunit%2Fincludes%2FDiffHistoryBlobTest.php;h=b75862ea0c9a53a9769fd03d9aa47b1f6dde2970;hb=c2ac59c01515237e6f675b101b8fa0914fb4e653;hp=0b04c6e5ea127fa3dc7674692fe6681763471723;hpb=e10da2622db03b1cad17045b49f09acd505679de;p=lhc%2Fweb%2Fwiklou.git

diff --git a/tests/phpunit/includes/DiffHistoryBlobTest.php b/tests/phpunit/includes/DiffHistoryBlobTest.php
index 0b04c6e5ea..b75862ea0c 100644
--- a/tests/phpunit/includes/DiffHistoryBlobTest.php
+++ b/tests/phpunit/includes/DiffHistoryBlobTest.php
@@ -5,25 +5,16 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 	protected function setUp() {
 		parent::setUp();
 
-		if ( !extension_loaded( 'xdiff' ) ) {
-			$this->markTestSkipped( 'The xdiff extension is not available' );
+		$this->checkPHPExtension( 'hash' );
+		$this->checkPHPExtension( 'xdiff' );
 
-			return;
-		}
 		if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
 			$this->markTestSkipped( 'The version of xdiff extension is lower than 1.5.0' );
-
-			return;
-		}
-		if ( !extension_loaded( 'hash' ) ) {
-			$this->markTestSkipped( 'The hash extension is not available' );
-
 			return;
 		}
 	}
 
 	/**
-	 * Test for DiffHistoryBlob::xdiffAdler32()
 	 * @dataProvider provideXdiffAdler32
 	 * @covers DiffHistoryBlob::xdiffAdler32
 	 */
@@ -35,13 +26,19 @@ class DiffHistoryBlobTest extends MediaWikiTestCase {
 			"Hash of " . addcslashes( $input, "\0..\37!@\@\177..\377" ) );
 	}
 
-	public static function provideXdiffAdler32() {
-		return array(
-			array( '', 'Empty string' ),
-			array( "\0", 'Null' ),
-			array( "\0\0\0", "Several nulls" ),
-			array( "Hello", "An ASCII string" ),
-			array( str_repeat( "x", 6000 ), "A string larger than xdiff's NMAX (5552)" )
-		);
+	public function provideXdiffAdler32() {
+		// Hack non-empty early return since PHPUnit expands this provider before running
+		// the setUp() which marks the test as skipped.
+		if ( !function_exists( 'xdiff_string_rabdiff' ) ) {
+			return [ [ '', 'Empty string' ] ];
+		}
+
+		return [
+			[ '', 'Empty string' ],
+			[ "\0", 'Null' ],
+			[ "\0\0\0", "Several nulls" ],
+			[ "Hello", "An ASCII string" ],
+			[ str_repeat( "x", 6000 ), "A string larger than xdiff's NMAX (5552)" ]
+		];
 	}
 }