jenkins-bot has submitted this change and it was merged. Change subject: From MediaWiki 1.24 on UnitTestsList can handle directories ......................................................................
From MediaWiki 1.24 on UnitTestsList can handle directories This was added in https://gerrit.wikimedia.org/r/163528 Change-Id: Ibd3a85751b2bb89df56889b0b0a4bcd6c98f41c7 --- M client/WikibaseClient.hooks.php M lib/WikibaseLib.hooks.php D lib/tests/phpunit/LibHooksTest.php M repo/Wikibase.hooks.php 4 files changed, 7 insertions(+), 60 deletions(-) Approvals: Thiemo Mättig (WMDE): Looks good to me, approved jenkins-bot: Verified diff --git a/client/WikibaseClient.hooks.php b/client/WikibaseClient.hooks.php index b62627c..2cc6c44 100644 --- a/client/WikibaseClient.hooks.php +++ b/client/WikibaseClient.hooks.php @@ -76,18 +76,9 @@ * * @return bool */ - public static function registerUnitTests( array &$files ) { + public static function registerUnitTests( array &$paths ) { // @codeCoverageIgnoreStart - $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . '/tests/phpunit/' ); - - /** - * @var SplFileInfo $fileInfo - */ - foreach ( new RecursiveIteratorIterator( $directoryIterator ) as $fileInfo ) { - if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) { - $files[] = $fileInfo->getPathname(); - } - } + $paths[] = __DIR__ . '/tests/phpunit/'; return true; // @codeCoverageIgnoreEnd diff --git a/lib/WikibaseLib.hooks.php b/lib/WikibaseLib.hooks.php index 73b1dd4..e1e0516 100644 --- a/lib/WikibaseLib.hooks.php +++ b/lib/WikibaseLib.hooks.php @@ -26,20 +26,11 @@ * * @param string[] $files * - * @return boolean + * @return bool */ - public static function registerPhpUnitTests( array &$files ) { + public static function registerPhpUnitTests( array &$paths ) { // @codeCoverageIgnoreStart - $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . '/tests/phpunit/' ); - - /** - * @var SplFileInfo $fileInfo - */ - foreach ( new RecursiveIteratorIterator( $directoryIterator ) as $fileInfo ) { - if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) { - $files[] = $fileInfo->getPathname(); - } - } + $paths[] = __DIR__ . '/tests/phpunit/'; return true; // @codeCoverageIgnoreEnd diff --git a/lib/tests/phpunit/LibHooksTest.php b/lib/tests/phpunit/LibHooksTest.php deleted file mode 100644 index a2178e2..0000000 --- a/lib/tests/phpunit/LibHooksTest.php +++ /dev/null @@ -1,26 +0,0 @@ -<?php - -namespace Wikibase\Test; - -use Wikibase\LibHooks; - -/** - * @covers Wikibase\LibHooks - * - * @group Wikibase - * @group WikibaseLib - * - * @licence GNU GPL v2+ - * @author Jeroen De Dauw < [email protected] > - */ -class LibHooksTest extends \MediaWikiTestCase { - - public function testRegisterPhpUnitTests() { - $files = array(); - - $this->assertTrue( LibHooks::registerPhpUnitTests( $files ) ); - - $this->assertTrue( count( $files ) > 0 ); - } - -} \ No newline at end of file diff --git a/repo/Wikibase.hooks.php b/repo/Wikibase.hooks.php index 73307ce..1d9011c 100644 --- a/repo/Wikibase.hooks.php +++ b/repo/Wikibase.hooks.php @@ -162,19 +162,10 @@ * * @return bool */ - public static function registerUnitTests( array &$files ) { + public static function registerUnitTests( array &$paths ) { // @codeCoverageIgnoreStart - $directoryIterator = new RecursiveDirectoryIterator( __DIR__ . '/tests/phpunit/' ); + $paths[] = __DIR__ . '/tests/phpunit/'; - /** @var SplFileInfo $fileInfo */ - $ourFiles = array(); - foreach ( new RecursiveIteratorIterator( $directoryIterator ) as $fileInfo ) { - if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) { - $ourFiles[] = $fileInfo->getPathname(); - } - } - - $files = array_merge( $files, $ourFiles ); return true; // @codeCoverageIgnoreEnd } -- To view, visit https://gerrit.wikimedia.org/r/188114 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ibd3a85751b2bb89df56889b0b0a4bcd6c98f41c7 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Wikibase Gerrit-Branch: master Gerrit-Owner: Hoo man <[email protected]> Gerrit-Reviewer: Aude <[email protected]> Gerrit-Reviewer: Hoo man <[email protected]> Gerrit-Reviewer: Jeroen De Dauw <[email protected]> Gerrit-Reviewer: Thiemo Mättig (WMDE) <[email protected]> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
