jenkins-bot has submitted this change and it was merged. Change subject: Move phpunit tests to tests/phpunit ......................................................................
Move phpunit tests to tests/phpunit Also fixed the UnitTestsList hook to include tests from subdirectories. Change-Id: I623c4856ee7a521eb3795990f1512659289330f6 --- M TranslateHooks.php M _autoload.php R tests/phpunit/BlackListTest.php R tests/phpunit/HookDocTest.php R tests/phpunit/Makefile R tests/phpunit/MediaWikiExtensionTest.php R tests/phpunit/MediaWikiMessageCheckerTest.php R tests/phpunit/MessageCollectionTest.php R tests/phpunit/MessageGroupBaseTest.php R tests/phpunit/MessageGroupStatesUpdaterJobTest.php R tests/phpunit/MessageGroupsTest.php R tests/phpunit/MessageIndexRebuildJobTest.php R tests/phpunit/MessageIndexTest.php R tests/phpunit/MockFileBasedMessageGroup.php R tests/phpunit/MockMessageCollectionForExport.php R tests/phpunit/MockSuperUser.php R tests/phpunit/MockWikiMessageGroup.php R tests/phpunit/PageTranslationParserTest.php R tests/phpunit/PageTranslationTaggingTest.php R tests/phpunit/SolrTTMServerTest.php R tests/phpunit/SpecialPagesTest.php R tests/phpunit/StringMatcherTest.php R tests/phpunit/TPParseTest.php R tests/phpunit/TTMServerTest.php R tests/phpunit/TranslateHooksTest.php R tests/phpunit/TranslateSandboxTest.php R tests/phpunit/TranslationFuzzyUpdaterTest.php R tests/phpunit/TranslationStashStorageTest.php R tests/phpunit/api/ApiGroupReviewTest.php R tests/phpunit/api/ApiQueryMessageGroupsTest.php R tests/phpunit/api/ApiTokensTest.php R tests/phpunit/api/ApiTranslationReviewTest.php R tests/phpunit/data/Example-result.i18n.php R tests/phpunit/data/Example.i18n.php R tests/phpunit/data/IniFFSTest1.ini R tests/phpunit/data/IniFFSTest2.ini R tests/phpunit/data/MediaWikiExtensionTest-conf1.yaml R tests/phpunit/data/MediaWikiExtensionTest-conf2.yaml R tests/phpunit/data/MixedSourceLanguageGroups.yaml R tests/phpunit/data/ParentGroups.yaml R tests/phpunit/data/jsontest_fi.json R tests/phpunit/data/mediawiki-extensions.txt R tests/phpunit/data/minimal.xlf R tests/phpunit/data/pythontest.py R tests/phpunit/ffs/AndroidXmlFFSTest.php R tests/phpunit/ffs/DtdFFSTest.php R tests/phpunit/ffs/GettextFFSTest.php R tests/phpunit/ffs/IniFFSTest.php R tests/phpunit/ffs/JavaFFSTest.php R tests/phpunit/ffs/JsonFFSTest.php R tests/phpunit/ffs/MediaWikiExtensionFFSTest.php R tests/phpunit/ffs/PythonSingleFFSTest.php R tests/phpunit/ffs/RubyYamlFFSTest.php R tests/phpunit/ffs/XliffFFSTest.php R tests/phpunit/insertables/MediaWikiInsertablesSuggesterTest.php R tests/phpunit/messageindexdata.ser R tests/phpunit/pagetranslation/FailDoubleOpen.ptfile R tests/phpunit/pagetranslation/FailEmptySection.ptfile R tests/phpunit/pagetranslation/FailMultipleSectionMarkers.ptfile R tests/phpunit/pagetranslation/FailNotAtomic.ptfile R tests/phpunit/pagetranslation/FailSectionMarkerPlace.ptfile R tests/phpunit/pagetranslation/FailTags.ptfile R tests/phpunit/pagetranslation/FailTags2.ptfile R tests/phpunit/pagetranslation/FailUnclosed.ptfile R tests/phpunit/pagetranslation/HeaderSection.ptfile R tests/phpunit/pagetranslation/HeaderSection.ptsource R tests/phpunit/pagetranslation/HeaderSection.pttarget R tests/phpunit/pagetranslation/Inline.ptfile R tests/phpunit/pagetranslation/Inline.pttarget R tests/phpunit/pagetranslation/LoneHeader.ptfile R tests/phpunit/pagetranslation/LoneHeader.ptsource R tests/phpunit/pagetranslation/Nowiki.ptfile R tests/phpunit/pagetranslation/Nowiki.pttarget R tests/phpunit/pagetranslation/NowikiInside.ptfile R tests/phpunit/pagetranslation/NowikiInside.pttarget R tests/phpunit/pagetranslation/NowikiOnly.ptfile R tests/phpunit/pagetranslation/NowikiOnly.pttest R tests/phpunit/pagetranslation/Simple.ptfile R tests/phpunit/pagetranslation/Simple.ptsource R tests/phpunit/pagetranslation/Simple.pttarget R tests/phpunit/pagetranslation/Simple.pttest R tests/phpunit/pagetranslation/SimpleWithMarker.ptfile R tests/phpunit/pagetranslation/SimpleWithMarker.pttarget R tests/phpunit/pagetranslation/Variables.ptfile R tests/phpunit/pagetranslation/Variables.pttarget R tests/phpunit/pagetranslation/Whitespace.ptfile R tests/phpunit/pagetranslation/Whitespace.pttarget 87 files changed, 22 insertions(+), 13 deletions(-) Approvals: Siebrand: Looks good to me, approved jenkins-bot: Verified diff --git a/TranslateHooks.php b/TranslateHooks.php index 9ae6c27..602b448 100644 --- a/TranslateHooks.php +++ b/TranslateHooks.php @@ -198,17 +198,25 @@ * @param $files array * @return bool */ - public static function setupUnitTests( &$files ) { - $testDir = __DIR__ . '/tests/'; - $files = array_merge( $files, glob( "$testDir/*Test.php" ) ); + public static function setupUnitTests( array &$files ) { + $dir = __DIR__ . '/tests/phpunit'; + $directoryIterator = new RecursiveDirectoryIterator( $dir ); + $fileIterator = new RecursiveIteratorIterator( $directoryIterator ); + + /// @var SplFileInfo $fileInfo + foreach ( $fileIterator as $fileInfo ) { + if ( substr( $fileInfo->getFilename(), -8 ) === 'Test.php' ) { + $files[] = $fileInfo->getPathname(); + } + } return true; } /** * Hook: LoadExtensionSchemaUpdates - * @param $updater DatabaseUpdater - * @return bool + * @param $updater DatabaseUpdater + * @return bool */ public static function schemaUpdates( DatabaseUpdater $updater ) { $dir = __DIR__ . '/sql'; diff --git a/_autoload.php b/_autoload.php index 321c475..4ea5c67 100644 --- a/_autoload.php +++ b/_autoload.php @@ -267,11 +267,12 @@ * @name "Test classes" * @{ */ -$wgAutoloadClasses['MockFileBasedMessageGroup'] = "$dir/tests/MockFileBasedMessageGroup.php"; +$wgAutoloadClasses['MockFileBasedMessageGroup'] = + "$dir/tests/phpunit/MockFileBasedMessageGroup.php"; $wgAutoloadClasses['MockMessageCollectionForExport'] = - "$dir/tests/MockMessageCollectionForExport.php"; -$wgAutoloadClasses['MockSuperUser'] = "$dir/tests/MockSuperUser.php"; -$wgAutoloadClasses['MockWikiMessageGroup'] = "$dir/tests/MockWikiMessageGroup.php"; + "$dir/tests/phpunit/MockMessageCollectionForExport.php"; +$wgAutoloadClasses['MockSuperUser'] = "$dir/tests/phpunit/MockSuperUser.php"; +$wgAutoloadClasses['MockWikiMessageGroup'] = "$dir/tests/phpunit/MockWikiMessageGroup.php"; /**@}*/ /** diff --git a/tests/BlackListTest.php b/tests/phpunit/BlackListTest.php similarity index 100% rename from tests/BlackListTest.php rename to tests/phpunit/BlackListTest.php diff --git a/tests/HookDocTest.php b/tests/phpunit/HookDocTest.php similarity index 97% rename from tests/HookDocTest.php rename to tests/phpunit/HookDocTest.php index c122847..f6bc77c 100644 --- a/tests/HookDocTest.php +++ b/tests/phpunit/HookDocTest.php @@ -31,7 +31,7 @@ protected function setUp() { parent::setUp(); - $contents = file_get_contents( __DIR__ . "/../hooks.txt" ); + $contents = file_get_contents( __DIR__ . '/../../hooks.txt' ); $blocks = preg_split( '/\n\n/', $contents ); $type = false; @@ -52,7 +52,7 @@ } } - $prefix = __DIR__ . '/..'; + $prefix = __DIR__ . '/../..'; foreach ( $this->paths['php'] as $path ) { $path = "$prefix/$path/"; $hooks = self::getHooksFromPath( $path, 'self::getPHPHooksFromFile' ); diff --git a/tests/Makefile b/tests/phpunit/Makefile similarity index 87% rename from tests/Makefile rename to tests/phpunit/Makefile index d55f81b..2435061 100644 --- a/tests/Makefile +++ b/tests/phpunit/Makefile @@ -1,5 +1,5 @@ ifndef MW_INSTALL_PATH - MW_INSTALL_PATH=../../.. + MW_INSTALL_PATH=../../../.. endif DIRS = api ffs insertables diff --git a/tests/MediaWikiExtensionTest.php b/tests/phpunit/MediaWikiExtensionTest.php similarity index 100% rename from tests/MediaWikiExtensionTest.php rename to tests/phpunit/MediaWikiExtensionTest.php diff --git a/tests/MediaWikiMessageCheckerTest.php b/tests/phpunit/MediaWikiMessageCheckerTest.php similarity index 100% rename from tests/MediaWikiMessageCheckerTest.php rename to tests/phpunit/MediaWikiMessageCheckerTest.php diff --git a/tests/MessageCollectionTest.php b/tests/phpunit/MessageCollectionTest.php similarity index 100% rename from tests/MessageCollectionTest.php rename to tests/phpunit/MessageCollectionTest.php diff --git a/tests/MessageGroupBaseTest.php b/tests/phpunit/MessageGroupBaseTest.php similarity index 100% rename from tests/MessageGroupBaseTest.php rename to tests/phpunit/MessageGroupBaseTest.php diff --git a/tests/MessageGroupStatesUpdaterJobTest.php b/tests/phpunit/MessageGroupStatesUpdaterJobTest.php similarity index 100% rename from tests/MessageGroupStatesUpdaterJobTest.php rename to tests/phpunit/MessageGroupStatesUpdaterJobTest.php diff --git a/tests/MessageGroupsTest.php b/tests/phpunit/MessageGroupsTest.php similarity index 100% rename from tests/MessageGroupsTest.php rename to tests/phpunit/MessageGroupsTest.php diff --git a/tests/MessageIndexRebuildJobTest.php b/tests/phpunit/MessageIndexRebuildJobTest.php similarity index 100% rename from tests/MessageIndexRebuildJobTest.php rename to tests/phpunit/MessageIndexRebuildJobTest.php diff --git a/tests/MessageIndexTest.php b/tests/phpunit/MessageIndexTest.php similarity index 100% rename from tests/MessageIndexTest.php rename to tests/phpunit/MessageIndexTest.php diff --git a/tests/MockFileBasedMessageGroup.php b/tests/phpunit/MockFileBasedMessageGroup.php similarity index 100% rename from tests/MockFileBasedMessageGroup.php rename to tests/phpunit/MockFileBasedMessageGroup.php diff --git a/tests/MockMessageCollectionForExport.php b/tests/phpunit/MockMessageCollectionForExport.php similarity index 100% rename from tests/MockMessageCollectionForExport.php rename to tests/phpunit/MockMessageCollectionForExport.php diff --git a/tests/MockSuperUser.php b/tests/phpunit/MockSuperUser.php similarity index 100% rename from tests/MockSuperUser.php rename to tests/phpunit/MockSuperUser.php diff --git a/tests/MockWikiMessageGroup.php b/tests/phpunit/MockWikiMessageGroup.php similarity index 100% rename from tests/MockWikiMessageGroup.php rename to tests/phpunit/MockWikiMessageGroup.php diff --git a/tests/PageTranslationParserTest.php b/tests/phpunit/PageTranslationParserTest.php similarity index 100% rename from tests/PageTranslationParserTest.php rename to tests/phpunit/PageTranslationParserTest.php diff --git a/tests/PageTranslationTaggingTest.php b/tests/phpunit/PageTranslationTaggingTest.php similarity index 100% rename from tests/PageTranslationTaggingTest.php rename to tests/phpunit/PageTranslationTaggingTest.php diff --git a/tests/SolrTTMServerTest.php b/tests/phpunit/SolrTTMServerTest.php similarity index 100% rename from tests/SolrTTMServerTest.php rename to tests/phpunit/SolrTTMServerTest.php diff --git a/tests/SpecialPagesTest.php b/tests/phpunit/SpecialPagesTest.php similarity index 97% rename from tests/SpecialPagesTest.php rename to tests/phpunit/SpecialPagesTest.php index bc95451..0910cf1 100644 --- a/tests/SpecialPagesTest.php +++ b/tests/phpunit/SpecialPagesTest.php @@ -26,7 +26,7 @@ } public static function provideSpecialPages() { - require __DIR__ . '/../_autoload.php'; + require __DIR__ . '/../../_autoload.php'; global $wgSpecialPages; $pages = array(); diff --git a/tests/StringMatcherTest.php b/tests/phpunit/StringMatcherTest.php similarity index 100% rename from tests/StringMatcherTest.php rename to tests/phpunit/StringMatcherTest.php diff --git a/tests/TPParseTest.php b/tests/phpunit/TPParseTest.php similarity index 100% rename from tests/TPParseTest.php rename to tests/phpunit/TPParseTest.php diff --git a/tests/TTMServerTest.php b/tests/phpunit/TTMServerTest.php similarity index 100% rename from tests/TTMServerTest.php rename to tests/phpunit/TTMServerTest.php diff --git a/tests/TranslateHooksTest.php b/tests/phpunit/TranslateHooksTest.php similarity index 100% rename from tests/TranslateHooksTest.php rename to tests/phpunit/TranslateHooksTest.php diff --git a/tests/TranslateSandboxTest.php b/tests/phpunit/TranslateSandboxTest.php similarity index 100% rename from tests/TranslateSandboxTest.php rename to tests/phpunit/TranslateSandboxTest.php diff --git a/tests/TranslationFuzzyUpdaterTest.php b/tests/phpunit/TranslationFuzzyUpdaterTest.php similarity index 100% rename from tests/TranslationFuzzyUpdaterTest.php rename to tests/phpunit/TranslationFuzzyUpdaterTest.php diff --git a/tests/TranslationStashStorageTest.php b/tests/phpunit/TranslationStashStorageTest.php similarity index 100% rename from tests/TranslationStashStorageTest.php rename to tests/phpunit/TranslationStashStorageTest.php diff --git a/tests/api/ApiGroupReviewTest.php b/tests/phpunit/api/ApiGroupReviewTest.php similarity index 100% rename from tests/api/ApiGroupReviewTest.php rename to tests/phpunit/api/ApiGroupReviewTest.php diff --git a/tests/api/ApiQueryMessageGroupsTest.php b/tests/phpunit/api/ApiQueryMessageGroupsTest.php similarity index 100% rename from tests/api/ApiQueryMessageGroupsTest.php rename to tests/phpunit/api/ApiQueryMessageGroupsTest.php diff --git a/tests/api/ApiTokensTest.php b/tests/phpunit/api/ApiTokensTest.php similarity index 100% rename from tests/api/ApiTokensTest.php rename to tests/phpunit/api/ApiTokensTest.php diff --git a/tests/api/ApiTranslationReviewTest.php b/tests/phpunit/api/ApiTranslationReviewTest.php similarity index 100% rename from tests/api/ApiTranslationReviewTest.php rename to tests/phpunit/api/ApiTranslationReviewTest.php diff --git a/tests/data/Example-result.i18n.php b/tests/phpunit/data/Example-result.i18n.php similarity index 100% rename from tests/data/Example-result.i18n.php rename to tests/phpunit/data/Example-result.i18n.php diff --git a/tests/data/Example.i18n.php b/tests/phpunit/data/Example.i18n.php similarity index 100% rename from tests/data/Example.i18n.php rename to tests/phpunit/data/Example.i18n.php diff --git a/tests/data/IniFFSTest1.ini b/tests/phpunit/data/IniFFSTest1.ini similarity index 100% rename from tests/data/IniFFSTest1.ini rename to tests/phpunit/data/IniFFSTest1.ini diff --git a/tests/data/IniFFSTest2.ini b/tests/phpunit/data/IniFFSTest2.ini similarity index 100% rename from tests/data/IniFFSTest2.ini rename to tests/phpunit/data/IniFFSTest2.ini diff --git a/tests/data/MediaWikiExtensionTest-conf1.yaml b/tests/phpunit/data/MediaWikiExtensionTest-conf1.yaml similarity index 100% rename from tests/data/MediaWikiExtensionTest-conf1.yaml rename to tests/phpunit/data/MediaWikiExtensionTest-conf1.yaml diff --git a/tests/data/MediaWikiExtensionTest-conf2.yaml b/tests/phpunit/data/MediaWikiExtensionTest-conf2.yaml similarity index 100% rename from tests/data/MediaWikiExtensionTest-conf2.yaml rename to tests/phpunit/data/MediaWikiExtensionTest-conf2.yaml diff --git a/tests/data/MixedSourceLanguageGroups.yaml b/tests/phpunit/data/MixedSourceLanguageGroups.yaml similarity index 100% rename from tests/data/MixedSourceLanguageGroups.yaml rename to tests/phpunit/data/MixedSourceLanguageGroups.yaml diff --git a/tests/data/ParentGroups.yaml b/tests/phpunit/data/ParentGroups.yaml similarity index 100% rename from tests/data/ParentGroups.yaml rename to tests/phpunit/data/ParentGroups.yaml diff --git a/tests/data/jsontest_fi.json b/tests/phpunit/data/jsontest_fi.json similarity index 100% rename from tests/data/jsontest_fi.json rename to tests/phpunit/data/jsontest_fi.json diff --git a/tests/data/mediawiki-extensions.txt b/tests/phpunit/data/mediawiki-extensions.txt similarity index 100% rename from tests/data/mediawiki-extensions.txt rename to tests/phpunit/data/mediawiki-extensions.txt diff --git a/tests/data/minimal.xlf b/tests/phpunit/data/minimal.xlf similarity index 100% rename from tests/data/minimal.xlf rename to tests/phpunit/data/minimal.xlf diff --git a/tests/data/pythontest.py b/tests/phpunit/data/pythontest.py similarity index 100% rename from tests/data/pythontest.py rename to tests/phpunit/data/pythontest.py diff --git a/tests/ffs/AndroidXmlFFSTest.php b/tests/phpunit/ffs/AndroidXmlFFSTest.php similarity index 100% rename from tests/ffs/AndroidXmlFFSTest.php rename to tests/phpunit/ffs/AndroidXmlFFSTest.php diff --git a/tests/ffs/DtdFFSTest.php b/tests/phpunit/ffs/DtdFFSTest.php similarity index 100% rename from tests/ffs/DtdFFSTest.php rename to tests/phpunit/ffs/DtdFFSTest.php diff --git a/tests/ffs/GettextFFSTest.php b/tests/phpunit/ffs/GettextFFSTest.php similarity index 100% rename from tests/ffs/GettextFFSTest.php rename to tests/phpunit/ffs/GettextFFSTest.php diff --git a/tests/ffs/IniFFSTest.php b/tests/phpunit/ffs/IniFFSTest.php similarity index 100% rename from tests/ffs/IniFFSTest.php rename to tests/phpunit/ffs/IniFFSTest.php diff --git a/tests/ffs/JavaFFSTest.php b/tests/phpunit/ffs/JavaFFSTest.php similarity index 100% rename from tests/ffs/JavaFFSTest.php rename to tests/phpunit/ffs/JavaFFSTest.php diff --git a/tests/ffs/JsonFFSTest.php b/tests/phpunit/ffs/JsonFFSTest.php similarity index 100% rename from tests/ffs/JsonFFSTest.php rename to tests/phpunit/ffs/JsonFFSTest.php diff --git a/tests/ffs/MediaWikiExtensionFFSTest.php b/tests/phpunit/ffs/MediaWikiExtensionFFSTest.php similarity index 100% rename from tests/ffs/MediaWikiExtensionFFSTest.php rename to tests/phpunit/ffs/MediaWikiExtensionFFSTest.php diff --git a/tests/ffs/PythonSingleFFSTest.php b/tests/phpunit/ffs/PythonSingleFFSTest.php similarity index 100% rename from tests/ffs/PythonSingleFFSTest.php rename to tests/phpunit/ffs/PythonSingleFFSTest.php diff --git a/tests/ffs/RubyYamlFFSTest.php b/tests/phpunit/ffs/RubyYamlFFSTest.php similarity index 100% rename from tests/ffs/RubyYamlFFSTest.php rename to tests/phpunit/ffs/RubyYamlFFSTest.php diff --git a/tests/ffs/XliffFFSTest.php b/tests/phpunit/ffs/XliffFFSTest.php similarity index 100% rename from tests/ffs/XliffFFSTest.php rename to tests/phpunit/ffs/XliffFFSTest.php diff --git a/tests/insertables/MediaWikiInsertablesSuggesterTest.php b/tests/phpunit/insertables/MediaWikiInsertablesSuggesterTest.php similarity index 100% rename from tests/insertables/MediaWikiInsertablesSuggesterTest.php rename to tests/phpunit/insertables/MediaWikiInsertablesSuggesterTest.php diff --git a/tests/messageindexdata.ser b/tests/phpunit/messageindexdata.ser similarity index 100% rename from tests/messageindexdata.ser rename to tests/phpunit/messageindexdata.ser diff --git a/tests/pagetranslation/FailDoubleOpen.ptfile b/tests/phpunit/pagetranslation/FailDoubleOpen.ptfile similarity index 100% rename from tests/pagetranslation/FailDoubleOpen.ptfile rename to tests/phpunit/pagetranslation/FailDoubleOpen.ptfile diff --git a/tests/pagetranslation/FailEmptySection.ptfile b/tests/phpunit/pagetranslation/FailEmptySection.ptfile similarity index 100% rename from tests/pagetranslation/FailEmptySection.ptfile rename to tests/phpunit/pagetranslation/FailEmptySection.ptfile diff --git a/tests/pagetranslation/FailMultipleSectionMarkers.ptfile b/tests/phpunit/pagetranslation/FailMultipleSectionMarkers.ptfile similarity index 100% rename from tests/pagetranslation/FailMultipleSectionMarkers.ptfile rename to tests/phpunit/pagetranslation/FailMultipleSectionMarkers.ptfile diff --git a/tests/pagetranslation/FailNotAtomic.ptfile b/tests/phpunit/pagetranslation/FailNotAtomic.ptfile similarity index 100% rename from tests/pagetranslation/FailNotAtomic.ptfile rename to tests/phpunit/pagetranslation/FailNotAtomic.ptfile diff --git a/tests/pagetranslation/FailSectionMarkerPlace.ptfile b/tests/phpunit/pagetranslation/FailSectionMarkerPlace.ptfile similarity index 100% rename from tests/pagetranslation/FailSectionMarkerPlace.ptfile rename to tests/phpunit/pagetranslation/FailSectionMarkerPlace.ptfile diff --git a/tests/pagetranslation/FailTags.ptfile b/tests/phpunit/pagetranslation/FailTags.ptfile similarity index 100% rename from tests/pagetranslation/FailTags.ptfile rename to tests/phpunit/pagetranslation/FailTags.ptfile diff --git a/tests/pagetranslation/FailTags2.ptfile b/tests/phpunit/pagetranslation/FailTags2.ptfile similarity index 100% rename from tests/pagetranslation/FailTags2.ptfile rename to tests/phpunit/pagetranslation/FailTags2.ptfile diff --git a/tests/pagetranslation/FailUnclosed.ptfile b/tests/phpunit/pagetranslation/FailUnclosed.ptfile similarity index 100% rename from tests/pagetranslation/FailUnclosed.ptfile rename to tests/phpunit/pagetranslation/FailUnclosed.ptfile diff --git a/tests/pagetranslation/HeaderSection.ptfile b/tests/phpunit/pagetranslation/HeaderSection.ptfile similarity index 100% rename from tests/pagetranslation/HeaderSection.ptfile rename to tests/phpunit/pagetranslation/HeaderSection.ptfile diff --git a/tests/pagetranslation/HeaderSection.ptsource b/tests/phpunit/pagetranslation/HeaderSection.ptsource similarity index 100% rename from tests/pagetranslation/HeaderSection.ptsource rename to tests/phpunit/pagetranslation/HeaderSection.ptsource diff --git a/tests/pagetranslation/HeaderSection.pttarget b/tests/phpunit/pagetranslation/HeaderSection.pttarget similarity index 100% rename from tests/pagetranslation/HeaderSection.pttarget rename to tests/phpunit/pagetranslation/HeaderSection.pttarget diff --git a/tests/pagetranslation/Inline.ptfile b/tests/phpunit/pagetranslation/Inline.ptfile similarity index 100% rename from tests/pagetranslation/Inline.ptfile rename to tests/phpunit/pagetranslation/Inline.ptfile diff --git a/tests/pagetranslation/Inline.pttarget b/tests/phpunit/pagetranslation/Inline.pttarget similarity index 100% rename from tests/pagetranslation/Inline.pttarget rename to tests/phpunit/pagetranslation/Inline.pttarget diff --git a/tests/pagetranslation/LoneHeader.ptfile b/tests/phpunit/pagetranslation/LoneHeader.ptfile similarity index 100% rename from tests/pagetranslation/LoneHeader.ptfile rename to tests/phpunit/pagetranslation/LoneHeader.ptfile diff --git a/tests/pagetranslation/LoneHeader.ptsource b/tests/phpunit/pagetranslation/LoneHeader.ptsource similarity index 100% rename from tests/pagetranslation/LoneHeader.ptsource rename to tests/phpunit/pagetranslation/LoneHeader.ptsource diff --git a/tests/pagetranslation/Nowiki.ptfile b/tests/phpunit/pagetranslation/Nowiki.ptfile similarity index 100% rename from tests/pagetranslation/Nowiki.ptfile rename to tests/phpunit/pagetranslation/Nowiki.ptfile diff --git a/tests/pagetranslation/Nowiki.pttarget b/tests/phpunit/pagetranslation/Nowiki.pttarget similarity index 100% rename from tests/pagetranslation/Nowiki.pttarget rename to tests/phpunit/pagetranslation/Nowiki.pttarget diff --git a/tests/pagetranslation/NowikiInside.ptfile b/tests/phpunit/pagetranslation/NowikiInside.ptfile similarity index 100% rename from tests/pagetranslation/NowikiInside.ptfile rename to tests/phpunit/pagetranslation/NowikiInside.ptfile diff --git a/tests/pagetranslation/NowikiInside.pttarget b/tests/phpunit/pagetranslation/NowikiInside.pttarget similarity index 100% rename from tests/pagetranslation/NowikiInside.pttarget rename to tests/phpunit/pagetranslation/NowikiInside.pttarget diff --git a/tests/pagetranslation/NowikiOnly.ptfile b/tests/phpunit/pagetranslation/NowikiOnly.ptfile similarity index 100% rename from tests/pagetranslation/NowikiOnly.ptfile rename to tests/phpunit/pagetranslation/NowikiOnly.ptfile diff --git a/tests/pagetranslation/NowikiOnly.pttest b/tests/phpunit/pagetranslation/NowikiOnly.pttest similarity index 100% rename from tests/pagetranslation/NowikiOnly.pttest rename to tests/phpunit/pagetranslation/NowikiOnly.pttest diff --git a/tests/pagetranslation/Simple.ptfile b/tests/phpunit/pagetranslation/Simple.ptfile similarity index 100% rename from tests/pagetranslation/Simple.ptfile rename to tests/phpunit/pagetranslation/Simple.ptfile diff --git a/tests/pagetranslation/Simple.ptsource b/tests/phpunit/pagetranslation/Simple.ptsource similarity index 100% rename from tests/pagetranslation/Simple.ptsource rename to tests/phpunit/pagetranslation/Simple.ptsource diff --git a/tests/pagetranslation/Simple.pttarget b/tests/phpunit/pagetranslation/Simple.pttarget similarity index 100% rename from tests/pagetranslation/Simple.pttarget rename to tests/phpunit/pagetranslation/Simple.pttarget diff --git a/tests/pagetranslation/Simple.pttest b/tests/phpunit/pagetranslation/Simple.pttest similarity index 100% rename from tests/pagetranslation/Simple.pttest rename to tests/phpunit/pagetranslation/Simple.pttest diff --git a/tests/pagetranslation/SimpleWithMarker.ptfile b/tests/phpunit/pagetranslation/SimpleWithMarker.ptfile similarity index 100% rename from tests/pagetranslation/SimpleWithMarker.ptfile rename to tests/phpunit/pagetranslation/SimpleWithMarker.ptfile diff --git a/tests/pagetranslation/SimpleWithMarker.pttarget b/tests/phpunit/pagetranslation/SimpleWithMarker.pttarget similarity index 100% rename from tests/pagetranslation/SimpleWithMarker.pttarget rename to tests/phpunit/pagetranslation/SimpleWithMarker.pttarget diff --git a/tests/pagetranslation/Variables.ptfile b/tests/phpunit/pagetranslation/Variables.ptfile similarity index 100% rename from tests/pagetranslation/Variables.ptfile rename to tests/phpunit/pagetranslation/Variables.ptfile diff --git a/tests/pagetranslation/Variables.pttarget b/tests/phpunit/pagetranslation/Variables.pttarget similarity index 100% rename from tests/pagetranslation/Variables.pttarget rename to tests/phpunit/pagetranslation/Variables.pttarget diff --git a/tests/pagetranslation/Whitespace.ptfile b/tests/phpunit/pagetranslation/Whitespace.ptfile similarity index 100% rename from tests/pagetranslation/Whitespace.ptfile rename to tests/phpunit/pagetranslation/Whitespace.ptfile diff --git a/tests/pagetranslation/Whitespace.pttarget b/tests/phpunit/pagetranslation/Whitespace.pttarget similarity index 100% rename from tests/pagetranslation/Whitespace.pttarget rename to tests/phpunit/pagetranslation/Whitespace.pttarget -- To view, visit https://gerrit.wikimedia.org/r/88726 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I623c4856ee7a521eb3795990f1512659289330f6 Gerrit-PatchSet: 4 Gerrit-Project: mediawiki/extensions/Translate Gerrit-Branch: master Gerrit-Owner: Nikerabbit <niklas.laxst...@gmail.com> Gerrit-Reviewer: Siebrand <siebr...@wikimedia.org> Gerrit-Reviewer: jenkins-bot _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits