[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Partially fix class-file name mismatch sniffs

2017-12-06 Thread jenkins-bot (Code Review) 
jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/395889 )

Change subject: Partially fix class-file name mismatch sniffs
..


Partially fix class-file name mismatch sniffs

Fix one instance of bad code that triggers both 
MediaWiki.Files.ClassMatchesFilename.NotMatch
and MediaWiki.Files.OneClassPerFile.MultipleFound. One more set of errors 
remains.

Bug: T170583
Change-Id: I45c237b4366477954726a0116fb2d56256276693
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 9 insertions(+), 18 deletions(-)

Approvals:
  Gergő Tisza: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index eb819f8..20dfe3d 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -10,23 +10,6 @@
 use Title;
 use Wikimedia\TestingAccessWrapper;
 
-class ApiPageSetStub extends ApiPageSet {
-
-   public function __construct( $goodTitles, $missingTitlesByNamespace ) {
-   $this->goodTitles = $goodTitles;
-   $this->missingTitlesByNamespace = $missingTitlesByNamespace;
-   }
-
-   public function getGoodTitles() {
-   return $this->goodTitles;
-   }
-
-   public function getMissingTitlesByNamespace() {
-   return $this->missingTitlesByNamespace;
-   }
-
-}
-
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {
 
public function __construct( ApiPageSet $pageSet ) {
@@ -134,7 +117,15 @@
 * @dataProvider provideGetTitles
 */
public function testGetTitles( $titles, $missingTitlesByNamespace, 
$expected ) {
-   $pageSet = new ApiPageSetStub( $titles, 
$missingTitlesByNamespace );
+   $pageSet = $this->getMockBuilder( 'ApiPageSet' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $pageSet->expects( $this->any() )
+   ->method( 'getGoodTitles' )
+   ->will( $this->returnValue( $titles ) );
+   $pageSet->expects( $this->any() )
+   ->method( 'getMissingTitlesByNamespace' )
+   ->will( $this->returnValue( $missingTitlesByNamespace ) 
);
$queryPageImages = new ApiQueryPageImagesProxy( $pageSet );
 
$this->assertEquals( $expected, $queryPageImages->getTitles() );

-- 
To view, visit https://gerrit.wikimedia.org/r/395889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I45c237b4366477954726a0116fb2d56256276693
Gerrit-PatchSet: 5
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 
Gerrit-Reviewer: Gergő Tisza 
Gerrit-Reviewer: Pppery 
Gerrit-Reviewer: jenkins-bot <>

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

[MediaWiki-commits] [Gerrit] mediawiki...PageImages[master]: Partially fix class-file name mismatch sniffs

2017-12-06 Thread Pppery (Code Review) 
Pppery has uploaded a new change for review. ( 
https://gerrit.wikimedia.org/r/395889 )

Change subject: Partially fix class-file name mismatch sniffs
..

Partially fix class-file name mismatch sniffs

Fix one instance of bad code that triggers both 
MediaWiki.Files.ClassMatchesFilename.NotMatch
and MediaWiki.Files.ClassMatchesFilename.WrongCase. One more set of errors 
remains.

Bug: T170583
Change-Id: I45c237b4366477954726a0116fb2d56256276693
---
M tests/phpunit/ApiQueryPageImagesTest.php
1 file changed, 9 insertions(+), 18 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/PageImages 
refs/changes/89/395889/1

diff --git a/tests/phpunit/ApiQueryPageImagesTest.php 
b/tests/phpunit/ApiQueryPageImagesTest.php
index eb819f8..e1b7cc2 100644
--- a/tests/phpunit/ApiQueryPageImagesTest.php
+++ b/tests/phpunit/ApiQueryPageImagesTest.php
@@ -10,23 +10,6 @@
 use Title;
 use Wikimedia\TestingAccessWrapper;
 
-class ApiPageSetStub extends ApiPageSet {
-
-   public function __construct( $goodTitles, $missingTitlesByNamespace ) {
-   $this->goodTitles = $goodTitles;
-   $this->missingTitlesByNamespace = $missingTitlesByNamespace;
-   }
-
-   public function getGoodTitles() {
-   return $this->goodTitles;
-   }
-
-   public function getMissingTitlesByNamespace() {
-   return $this->missingTitlesByNamespace;
-   }
-
-}
-
 class ApiQueryPageImagesProxy extends ApiQueryPageImages {
 
public function __construct( ApiPageSet $pageSet ) {
@@ -134,7 +117,15 @@
 * @dataProvider provideGetTitles
 */
public function testGetTitles( $titles, $missingTitlesByNamespace, 
$expected ) {
-   $pageSet = new ApiPageSetStub( $titles, 
$missingTitlesByNamespace );
+   $pageSet = $this->getMockBuilder( 'ApiPageSet' )
+   ->disableOriginalConstructor()
+   ->getMock();
+   $pageSet->expects( $this->once() )
+   ->method( 'getGoodTitles' )
+   ->will( $this->returnValue( $titles ) );
+   $pageSet->expects( $this->once() )
+   ->method( 'getMissingTitlesByNamespace' )
+   ->will( $this->returnValue( $missingTitlesByNamespace ) 
);
$queryPageImages = new ApiQueryPageImagesProxy( $pageSet );
 
$this->assertEquals( $expected, $queryPageImages->getTitles() );

-- 
To view, visit https://gerrit.wikimedia.org/r/395889
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I45c237b4366477954726a0116fb2d56256276693
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/PageImages
Gerrit-Branch: master
Gerrit-Owner: Pppery 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits