From f479ccf7314b4c831c679815d84c01210bd31607 Mon Sep 17 00:00:00 2001 From: addshore Date: Sat, 9 Aug 2014 01:16:43 +0100 Subject: [PATCH] Move MediaWikiPasswordTestCase to password dir Change-Id: I423e484929ce1bbc21e8f2ddd78196dee3520677 --- tests/TestsAutoLoader.php | 4 +++- tests/phpunit/includes/password/BcryptPasswordTest.php | 2 +- .../includes/password/LayeredParameterizedPasswordTest.php | 2 +- .../password/PasswordTestCase.php} | 2 +- tests/phpunit/includes/password/Pbkdf2PasswordTest.php | 2 +- 5 files changed, 7 insertions(+), 5 deletions(-) rename tests/phpunit/{MediaWikiPasswordTestCase.php => includes/password/PasswordTestCase.php} (97%) diff --git a/tests/TestsAutoLoader.php b/tests/TestsAutoLoader.php index b56890badb..0b7c6cf5d0 100644 --- a/tests/TestsAutoLoader.php +++ b/tests/TestsAutoLoader.php @@ -40,7 +40,6 @@ $wgAutoloadClasses += array( 'MediaWikiTestCase' => "$testDir/phpunit/MediaWikiTestCase.php", 'MediaWikiPHPUnitTestListener' => "$testDir/phpunit/MediaWikiPHPUnitTestListener.php", 'MediaWikiLangTestCase' => "$testDir/phpunit/MediaWikiLangTestCase.php", - 'MediaWikiPasswordTestCase' => "$testDir/phpunit/MediaWikiPasswordTestCase.php", 'ResourceLoaderTestCase' => "$testDir/phpunit/ResourceLoaderTestCase.php", 'ResourceLoaderTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php", 'ResourceLoaderFileModuleTestModule' => "$testDir/phpunit/ResourceLoaderTestCase.php", @@ -78,6 +77,9 @@ $wgAutoloadClasses += array( 'PageORMTableForTesting' => "$testDir/phpunit/includes/db/ORMTableTest.php", 'DatabaseTestHelper' => "$testDir/phpunit/includes/db/DatabaseTestHelper.php", + # tests/phpunit/includes/passwords + 'PasswordTestCase' => "$testDir/phpunit/includes/password/PasswordTestCase.php", + # tests/phpunit/languages 'LanguageClassesTestCase' => "$testDir/phpunit/languages/LanguageClassesTestCase.php", diff --git a/tests/phpunit/includes/password/BcryptPasswordTest.php b/tests/phpunit/includes/password/BcryptPasswordTest.php index b4d5f99691..4d5c78ac58 100644 --- a/tests/phpunit/includes/password/BcryptPasswordTest.php +++ b/tests/phpunit/includes/password/BcryptPasswordTest.php @@ -3,7 +3,7 @@ /** * @group large */ -class BcryptPasswordTestCase extends MediaWikiPasswordTestCase { +class BcryptPasswordTestCase extends PasswordTestCase { protected function getTypeConfigs() { return array( 'bcrypt' => array( 'class' => 'BcryptPassword', diff --git a/tests/phpunit/includes/password/LayeredParameterizedPasswordTest.php b/tests/phpunit/includes/password/LayeredParameterizedPasswordTest.php index c5522533a6..03a742bb81 100644 --- a/tests/phpunit/includes/password/LayeredParameterizedPasswordTest.php +++ b/tests/phpunit/includes/password/LayeredParameterizedPasswordTest.php @@ -1,6 +1,6 @@ array( diff --git a/tests/phpunit/MediaWikiPasswordTestCase.php b/tests/phpunit/includes/password/PasswordTestCase.php similarity index 97% rename from tests/phpunit/MediaWikiPasswordTestCase.php rename to tests/phpunit/includes/password/PasswordTestCase.php index edf944b47f..7820d535ff 100644 --- a/tests/phpunit/MediaWikiPasswordTestCase.php +++ b/tests/phpunit/includes/password/PasswordTestCase.php @@ -23,7 +23,7 @@ /** * @since 1.24 */ -abstract class MediaWikiPasswordTestCase extends MediaWikiTestCase { +abstract class PasswordTestCase extends MediaWikiTestCase { /** * @var PasswordFactory */ diff --git a/tests/phpunit/includes/password/Pbkdf2PasswordTest.php b/tests/phpunit/includes/password/Pbkdf2PasswordTest.php index c1b65d3c26..ae471207a5 100644 --- a/tests/phpunit/includes/password/Pbkdf2PasswordTest.php +++ b/tests/phpunit/includes/password/Pbkdf2PasswordTest.php @@ -3,7 +3,7 @@ /** * @group large */ -class Pbkdf2PasswordTest extends MediaWikiPasswordTestCase { +class Pbkdf2PasswordTest extends PasswordTestCase { protected function getTypeConfigs() { return array( 'pbkdf2' => array( 'class' => 'Pbkdf2Password', -- 2.20.1