From d732e4df25af8df7e01cbb9fcebfeb7d5ccd6fcb Mon Sep 17 00:00:00 2001 From: Max Semenik Date: Wed, 3 Feb 2010 19:21:37 +0000 Subject: [PATCH] Moved tests to maintenance - one directory less to care about when configuring access. --- RELEASE-NOTES | 2 ++ {tests => maintenance/tests}/.svnignore | 0 {tests => maintenance/tests}/ArticleTest.php | 0 {tests => maintenance/tests}/DatabaseTest.php | 0 {tests => maintenance/tests}/GlobalTest.php | 0 {tests => maintenance/tests}/HttpTest.php | 0 {tests => maintenance/tests}/IPTest.php | 0 {tests => maintenance/tests}/ImageFunctionsTest.php | 0 {tests => maintenance/tests}/LanguageConverterTest.php | 0 {tests => maintenance/tests}/LicensesTest.php | 0 {tests => maintenance/tests}/LocalFileTest.php | 0 {tests => maintenance/tests}/Makefile | 0 {tests => maintenance/tests}/MediaWikiAPITest.php | 0 {tests => maintenance/tests}/MediaWikiAPI_TestCase.php | 0 {tests => maintenance/tests}/MediaWikiParserTest.php | 0 {tests => maintenance/tests}/MediaWiki_TestCase.php | 0 {tests => maintenance/tests}/README | 0 {tests => maintenance/tests}/SanitizerTest.php | 0 {tests => maintenance/tests}/SearchEngineTest.php | 0 {tests => maintenance/tests}/SearchMySQL4Test.php | 0 {tests => maintenance/tests}/SearchUpdateTest.php | 0 {tests => maintenance/tests}/SiteConfigurationTest.php | 0 {tests => maintenance/tests}/TimeAdjustTest.php | 0 {tests => maintenance/tests}/TitleTest.php | 0 {tests => maintenance/tests}/XmlTest.php | 0 {tests => maintenance/tests}/bootstrap.php | 2 +- {tests => maintenance/tests}/phpunit.xml | 0 {tests => maintenance/tests}/test-prefetch-current.xml | 0 {tests => maintenance/tests}/test-prefetch-previous.xml | 0 {tests => maintenance/tests}/test-prefetch-stub.xml | 0 tests/.htaccess | 1 - 31 files changed, 3 insertions(+), 2 deletions(-) rename {tests => maintenance/tests}/.svnignore (100%) rename {tests => maintenance/tests}/ArticleTest.php (100%) rename {tests => maintenance/tests}/DatabaseTest.php (100%) rename {tests => maintenance/tests}/GlobalTest.php (100%) rename {tests => maintenance/tests}/HttpTest.php (100%) rename {tests => maintenance/tests}/IPTest.php (100%) rename {tests => maintenance/tests}/ImageFunctionsTest.php (100%) rename {tests => maintenance/tests}/LanguageConverterTest.php (100%) rename {tests => maintenance/tests}/LicensesTest.php (100%) rename {tests => maintenance/tests}/LocalFileTest.php (100%) rename {tests => maintenance/tests}/Makefile (100%) rename {tests => maintenance/tests}/MediaWikiAPITest.php (100%) rename {tests => maintenance/tests}/MediaWikiAPI_TestCase.php (100%) rename {tests => maintenance/tests}/MediaWikiParserTest.php (100%) rename {tests => maintenance/tests}/MediaWiki_TestCase.php (100%) rename {tests => maintenance/tests}/README (100%) rename {tests => maintenance/tests}/SanitizerTest.php (100%) rename {tests => maintenance/tests}/SearchEngineTest.php (100%) rename {tests => maintenance/tests}/SearchMySQL4Test.php (100%) rename {tests => maintenance/tests}/SearchUpdateTest.php (100%) rename {tests => maintenance/tests}/SiteConfigurationTest.php (100%) rename {tests => maintenance/tests}/TimeAdjustTest.php (100%) rename {tests => maintenance/tests}/TitleTest.php (100%) rename {tests => maintenance/tests}/XmlTest.php (100%) rename {tests => maintenance/tests}/bootstrap.php (92%) rename {tests => maintenance/tests}/phpunit.xml (100%) rename {tests => maintenance/tests}/test-prefetch-current.xml (100%) rename {tests => maintenance/tests}/test-prefetch-previous.xml (100%) rename {tests => maintenance/tests}/test-prefetch-stub.xml (100%) delete mode 100644 tests/.htaccess diff --git a/RELEASE-NOTES b/RELEASE-NOTES index 3c6147a012..e5cee933cd 100644 --- a/RELEASE-NOTES +++ b/RELEASE-NOTES @@ -316,6 +316,8 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN article * (bug 22315) SpecialRecentChangesQuery hook now pass $query_options and checks the return value +* Separate unit test suites under t/ and tests/ were merged and moved to + maintenance/tests/. === Bug fixes in 1.16 === diff --git a/tests/.svnignore b/maintenance/tests/.svnignore similarity index 100% rename from tests/.svnignore rename to maintenance/tests/.svnignore diff --git a/tests/ArticleTest.php b/maintenance/tests/ArticleTest.php similarity index 100% rename from tests/ArticleTest.php rename to maintenance/tests/ArticleTest.php diff --git a/tests/DatabaseTest.php b/maintenance/tests/DatabaseTest.php similarity index 100% rename from tests/DatabaseTest.php rename to maintenance/tests/DatabaseTest.php diff --git a/tests/GlobalTest.php b/maintenance/tests/GlobalTest.php similarity index 100% rename from tests/GlobalTest.php rename to maintenance/tests/GlobalTest.php diff --git a/tests/HttpTest.php b/maintenance/tests/HttpTest.php similarity index 100% rename from tests/HttpTest.php rename to maintenance/tests/HttpTest.php diff --git a/tests/IPTest.php b/maintenance/tests/IPTest.php similarity index 100% rename from tests/IPTest.php rename to maintenance/tests/IPTest.php diff --git a/tests/ImageFunctionsTest.php b/maintenance/tests/ImageFunctionsTest.php similarity index 100% rename from tests/ImageFunctionsTest.php rename to maintenance/tests/ImageFunctionsTest.php diff --git a/tests/LanguageConverterTest.php b/maintenance/tests/LanguageConverterTest.php similarity index 100% rename from tests/LanguageConverterTest.php rename to maintenance/tests/LanguageConverterTest.php diff --git a/tests/LicensesTest.php b/maintenance/tests/LicensesTest.php similarity index 100% rename from tests/LicensesTest.php rename to maintenance/tests/LicensesTest.php diff --git a/tests/LocalFileTest.php b/maintenance/tests/LocalFileTest.php similarity index 100% rename from tests/LocalFileTest.php rename to maintenance/tests/LocalFileTest.php diff --git a/tests/Makefile b/maintenance/tests/Makefile similarity index 100% rename from tests/Makefile rename to maintenance/tests/Makefile diff --git a/tests/MediaWikiAPITest.php b/maintenance/tests/MediaWikiAPITest.php similarity index 100% rename from tests/MediaWikiAPITest.php rename to maintenance/tests/MediaWikiAPITest.php diff --git a/tests/MediaWikiAPI_TestCase.php b/maintenance/tests/MediaWikiAPI_TestCase.php similarity index 100% rename from tests/MediaWikiAPI_TestCase.php rename to maintenance/tests/MediaWikiAPI_TestCase.php diff --git a/tests/MediaWikiParserTest.php b/maintenance/tests/MediaWikiParserTest.php similarity index 100% rename from tests/MediaWikiParserTest.php rename to maintenance/tests/MediaWikiParserTest.php diff --git a/tests/MediaWiki_TestCase.php b/maintenance/tests/MediaWiki_TestCase.php similarity index 100% rename from tests/MediaWiki_TestCase.php rename to maintenance/tests/MediaWiki_TestCase.php diff --git a/tests/README b/maintenance/tests/README similarity index 100% rename from tests/README rename to maintenance/tests/README diff --git a/tests/SanitizerTest.php b/maintenance/tests/SanitizerTest.php similarity index 100% rename from tests/SanitizerTest.php rename to maintenance/tests/SanitizerTest.php diff --git a/tests/SearchEngineTest.php b/maintenance/tests/SearchEngineTest.php similarity index 100% rename from tests/SearchEngineTest.php rename to maintenance/tests/SearchEngineTest.php diff --git a/tests/SearchMySQL4Test.php b/maintenance/tests/SearchMySQL4Test.php similarity index 100% rename from tests/SearchMySQL4Test.php rename to maintenance/tests/SearchMySQL4Test.php diff --git a/tests/SearchUpdateTest.php b/maintenance/tests/SearchUpdateTest.php similarity index 100% rename from tests/SearchUpdateTest.php rename to maintenance/tests/SearchUpdateTest.php diff --git a/tests/SiteConfigurationTest.php b/maintenance/tests/SiteConfigurationTest.php similarity index 100% rename from tests/SiteConfigurationTest.php rename to maintenance/tests/SiteConfigurationTest.php diff --git a/tests/TimeAdjustTest.php b/maintenance/tests/TimeAdjustTest.php similarity index 100% rename from tests/TimeAdjustTest.php rename to maintenance/tests/TimeAdjustTest.php diff --git a/tests/TitleTest.php b/maintenance/tests/TitleTest.php similarity index 100% rename from tests/TitleTest.php rename to maintenance/tests/TitleTest.php diff --git a/tests/XmlTest.php b/maintenance/tests/XmlTest.php similarity index 100% rename from tests/XmlTest.php rename to maintenance/tests/XmlTest.php diff --git a/tests/bootstrap.php b/maintenance/tests/bootstrap.php similarity index 92% rename from tests/bootstrap.php rename to maintenance/tests/bootstrap.php index a576f66e28..91ffdbef3a 100644 --- a/tests/bootstrap.php +++ b/maintenance/tests/bootstrap.php @@ -9,7 +9,7 @@ global $wgCommandLineMode, $IP; $wgCommandLineMode = true; -$IP = dirname( dirname( __FILE__ ) ); +$IP = dirname( dirname( dirname( __FILE__ ) ) ); define( 'MEDIAWIKI', true ); define( 'MW_PHPUNIT_TEST', true ); diff --git a/tests/phpunit.xml b/maintenance/tests/phpunit.xml similarity index 100% rename from tests/phpunit.xml rename to maintenance/tests/phpunit.xml diff --git a/tests/test-prefetch-current.xml b/maintenance/tests/test-prefetch-current.xml similarity index 100% rename from tests/test-prefetch-current.xml rename to maintenance/tests/test-prefetch-current.xml diff --git a/tests/test-prefetch-previous.xml b/maintenance/tests/test-prefetch-previous.xml similarity index 100% rename from tests/test-prefetch-previous.xml rename to maintenance/tests/test-prefetch-previous.xml diff --git a/tests/test-prefetch-stub.xml b/maintenance/tests/test-prefetch-stub.xml similarity index 100% rename from tests/test-prefetch-stub.xml rename to maintenance/tests/test-prefetch-stub.xml diff --git a/tests/.htaccess b/tests/.htaccess deleted file mode 100644 index 3a42882788..0000000000 --- a/tests/.htaccess +++ /dev/null @@ -1 +0,0 @@ -Deny from all -- 2.20.1