[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes unit test namespace ids independent
jenkins-bot has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/371469 ) Change subject: Makes unit test namespace ids independent .. Makes unit test namespace ids independent Change-Id: I2b64e6a2725992ce1524b3c73479f12b351e2d91 --- M tests/phpunit/FileProviderTest.php M tests/phpunit/Pagination/FilePaginationTest.php M tests/phpunit/Pagination/PagePaginationTest.php M tests/phpunit/Pagination/PaginationFactoryTest.php M tests/phpunit/ProofreadPageInitTest.php M tests/phpunit/ProofreadPageTestCase.php M tests/phpunit/index/IndexContentTest.php M tests/phpunit/index/IndexRedirectContentTest.php M tests/phpunit/index/ProofreadIndexPageTest.php M tests/phpunit/page/PageContentBuilderTest.php M tests/phpunit/page/PageContentTest.php M tests/phpunit/page/PageDisplayHandlerTest.php M tests/phpunit/page/ProofreadPagePageTest.php 13 files changed, 138 insertions(+), 128 deletions(-) Approvals: jenkins-bot: Verified Tpt: Looks good to me, approved diff --git a/tests/phpunit/FileProviderTest.php b/tests/phpunit/FileProviderTest.php index 3ebcdf4..85d5786 100644 --- a/tests/phpunit/FileProviderTest.php +++ b/tests/phpunit/FileProviderTest.php @@ -37,7 +37,7 @@ return [ [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum.djvu' ) ), + $this->newIndexPage( 'LoremIpsum.djvu' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], @@ -62,11 +62,11 @@ return [ [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum2.djvu' ) ), + $this->newIndexPage( 'LoremIpsum2.djvu' ), $fileProvider ], [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'Test' ) ), + $this->newIndexPage( 'Test' ), $fileProvider ], ]; @@ -89,24 +89,22 @@ return [ [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ), + $this->newPagePage( 'LoremIpsum.djvu/4' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( - Title::makeTitle( 250, 'LoremIpsum.djvu/djvu/1' ) - ), + $this->newPagePage( 'LoremIpsum.djvu/djvu/1' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'LoremIpsum.djvu' ) ), + $this->newPagePage( 'LoremIpsum.djvu' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'Test.jpg' ) ), + $this->newPagePage( 'Test.jpg' ), $this->getFileFromName( 'Test.jpg' ), $fileProvider ], @@ -131,11 +129,11 @@ return [ [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum2.djvu/4' ) ), + $this->newPagePage( 'LoremIpsum2.djvu/4' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 252, 'Test' ) ), + $this->newPagePage( 'Test' ), $fileProvider ], ]; diff --git a/tests/phpunit/Pagination/FilePaginationTest.php b/tests/phpunit/Pagination/FilePaginationTest.php index b17be7f..dadd19a 100644 --- a/tests/phpunit/Pagination/FilePaginationTest.php +++ b/tests/phpunit/Pagination/FilePaginationTest.php @@ -5,7 +5,6 @@ use InvalidArgumentException; use MediaHandler; use OutOfBoundsException; -use ProofreadIndexPageTest; use ProofreadPagePage; use ProofreadPageTestCase; use Title; @@ -17,7 +16,7 @@ class FilePaginationTest extends ProofreadPageTestCase { public
[MediaWiki-commits] [Gerrit] mediawiki...ProofreadPage[master]: Makes unit test namespace ids independent
Tpt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/371469 ) Change subject: Makes unit test namespace ids independent .. Makes unit test namespace ids independent Change-Id: I2b64e6a2725992ce1524b3c73479f12b351e2d91 --- M tests/phpunit/FileProviderTest.php M tests/phpunit/Pagination/FilePaginationTest.php M tests/phpunit/Pagination/PagePaginationTest.php M tests/phpunit/Pagination/PaginationFactoryTest.php M tests/phpunit/ProofreadPageTestCase.php M tests/phpunit/index/IndexContentTest.php M tests/phpunit/index/IndexRedirectContentTest.php M tests/phpunit/index/ProofreadIndexPageTest.php M tests/phpunit/page/PageContentBuilderTest.php M tests/phpunit/page/PageContentTest.php M tests/phpunit/page/PageDisplayHandlerTest.php M tests/phpunit/page/ProofreadPagePageTest.php 12 files changed, 123 insertions(+), 124 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage refs/changes/69/371469/1 diff --git a/tests/phpunit/FileProviderTest.php b/tests/phpunit/FileProviderTest.php index 3ebcdf4..85d5786 100644 --- a/tests/phpunit/FileProviderTest.php +++ b/tests/phpunit/FileProviderTest.php @@ -37,7 +37,7 @@ return [ [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum.djvu' ) ), + $this->newIndexPage( 'LoremIpsum.djvu' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], @@ -62,11 +62,11 @@ return [ [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum2.djvu' ) ), + $this->newIndexPage( 'LoremIpsum2.djvu' ), $fileProvider ], [ - ProofreadIndexPage::newFromTitle( Title::makeTitle( 252, 'Test' ) ), + $this->newIndexPage( 'Test' ), $fileProvider ], ]; @@ -89,24 +89,22 @@ return [ [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ), + $this->newPagePage( 'LoremIpsum.djvu/4' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( - Title::makeTitle( 250, 'LoremIpsum.djvu/djvu/1' ) - ), + $this->newPagePage( 'LoremIpsum.djvu/djvu/1' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'LoremIpsum.djvu' ) ), + $this->newPagePage( 'LoremIpsum.djvu' ), $this->getFileFromName( 'LoremIpsum.djvu' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 250, 'Test.jpg' ) ), + $this->newPagePage( 'Test.jpg' ), $this->getFileFromName( 'Test.jpg' ), $fileProvider ], @@ -131,11 +129,11 @@ return [ [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 252, 'LoremIpsum2.djvu/4' ) ), + $this->newPagePage( 'LoremIpsum2.djvu/4' ), $fileProvider ], [ - ProofreadPagePage::newFromTitle( Title::makeTitle( 252, 'Test' ) ), + $this->newPagePage( 'Test' ), $fileProvider ], ]; diff --git a/tests/phpunit/Pagination/FilePaginationTest.php b/tests/phpunit/Pagination/FilePaginationTest.php index b17be7f..dadd19a 100644 --- a/tests/phpunit/Pagination/FilePaginationTest.php +++ b/tests/phpunit/Pagination/FilePaginationTest.php @@ -5,7 +5,6 @@ use InvalidArgumentException; use MediaHandler; use OutOfBoundsException; -use ProofreadIndexPageTest; use ProofreadPagePage; use ProofreadPageTestCase; use Title; @@ -17,7 +16,7 @@ class FilePaginationTest extends ProofreadPageTestCase { public function testGetPageNumber()