[MediaWiki-commits] [Gerrit] Fixes fail in PHP unit tests runned by CI - change (mediawiki...ProofreadPage)

[jenkins-bot (Code Review)]

jenkins-bot has submitted this change and it was merged.

Change subject: Fixes fail in PHP unit tests runned by CI
..


Fixes fail in PHP unit tests runned by CI

Change-Id: Ic606344a21ddd6fdcd74cee11c0487a89b88ddbd
---
M tests/includes/FileProviderTest.php
1 file changed, 46 insertions(+), 37 deletions(-)

Approvals:
  Tpt: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/tests/includes/FileProviderTest.php 
b/tests/includes/FileProviderTest.php
index f298871..2be187b 100644
--- a/tests/includes/FileProviderTest.php
+++ b/tests/includes/FileProviderTest.php
@@ -14,20 +14,6 @@
  */
 class FileProviderTest extends ProofreadPageTestCase {
 
-   /**
-* @var FileProvider
-*/
-   protected $fileProvider;
-
-   protected function setUp() {
-   parent::setUp();
-
-   $this->fileProvider = new FileProviderMock( [
-   $this->getFileFromName( 'LoremIpsum.djvu' ),
-   $this->getFileFromName( 'Test.jpg' )
-   ] );
-   }
-
private function getFileFromName( $fileName ) {
return 
$this->getContext()->getFileProvider()->getFileFromTitle( Title::makeTitle( 
NS_MEDIA, $fileName ) );
}
@@ -35,18 +21,21 @@
/**
 * @dataProvider indexFileProvider
 */
-   public function testGetForIndexPage( ProofreadIndexPage $index, File 
$file ) {
-   $this->assertEquals(
-   $file,
-   $this->fileProvider->getForIndexPage( $index )
-   );
+   public function testGetForIndexPage( ProofreadIndexPage $index, File 
$file, FileProvider $fileProvider ) {
+   $this->assertEquals( $file, $fileProvider->getForIndexPage( 
$index ) );
}
 
public function indexFileProvider() {
+   $fileProvider = new FileProviderMock( [
+   $this->getFileFromName( 'LoremIpsum.djvu' ),
+   $this->getFileFromName( 'Test.jpg' )
+   ] );
+
return [
[
ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum.djvu' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->getFileFromName( 'LoremIpsum.djvu' ),
+   $fileProvider
],
];
}
@@ -55,17 +44,24 @@
 * @expectedException \ProofreadPage\FileNotFoundException
 * @dataProvider indexFileNotFoundProvider
 */
-   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
 $index ) {
-   $this->fileProvider->getForIndexPage( $index );
+   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
$index, FileProvider $fileProvider ) {
+   $fileProvider->getForIndexPage( $index );
}
 
public function indexFileNotFoundProvider() {
+   $fileProvider = new FileProviderMock( [
+   $this->getFileFromName( 'LoremIpsum.djvu' ),
+   $this->getFileFromName( 'Test.jpg' )
+   ] );
+
return [
[
-   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum2.djvu' ) )
+   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum2.djvu' ) ),
+   $fileProvider
],
[
-   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'Test' ) )
+   ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'Test' ) ),
+   $fileProvider
],
];
}
@@ -73,30 +69,36 @@
/**
 * @dataProvider pageFileProvider
 */
-   public function testGetForPagePage( ProofreadPagePage $page, File $file 
) {
-   $this->assertEquals(
-   $file,
-   $this->fileProvider->getForPagePage( $page )
-   );
+   public function testGetForPagePage( ProofreadPagePage $page, File 
$file, FileProvider $fileProvider ) {
+   $this->assertEquals( $file, $fileProvider->getForPagePage( 
$page ) );
}
 
public function pageFileProvider() {
+   $fileProvider = new FileProviderMock( [
+   $this->getFileFromName( 'LoremIpsum.djvu' ),
+   $this->getFileFromName( 'Test.jpg' )
+   ] );
+
return [
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ),
-   $this->getFileFromName( 

[MediaWiki-commits] [Gerrit] Fixes fail in PHP unit tests runned by CI - change (mediawiki...ProofreadPage)

[Tpt (Code Review)]

Tpt has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/291488

Change subject: Fixes fail in PHP unit tests runned by CI
..

Fixes fail in PHP unit tests runned by CI

Change-Id: Ic606344a21ddd6fdcd74cee11c0487a89b88ddbd
---
M tests/includes/FileProviderTest.php
1 file changed, 22 insertions(+), 10 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/mediawiki/extensions/ProofreadPage 
refs/changes/88/291488/1

diff --git a/tests/includes/FileProviderTest.php 
b/tests/includes/FileProviderTest.php
index f298871..d2b7a9c 100644
--- a/tests/includes/FileProviderTest.php
+++ b/tests/includes/FileProviderTest.php
@@ -17,14 +17,26 @@
/**
 * @var FileProvider
 */
-   protected $fileProvider;
+   private $fileProvider;
+
+   /**
+* @var File
+*/
+   private $loremIpsumFile;
+
+   /**
+* @var File
+*/
+   private $testFile;
 
protected function setUp() {
parent::setUp();
 
+   $this->loremIpsumFile = $this->getFileFromName( 
'LoremIpsum.djvu' );
+   $this->testFile = $this->getFileFromName( 'Test.jpg' );
$this->fileProvider = new FileProviderMock( [
-   $this->getFileFromName( 'LoremIpsum.djvu' ),
-   $this->getFileFromName( 'Test.jpg' )
+   $this->loremIpsumFile,
+   $this->testFile
] );
}
 
@@ -46,7 +58,7 @@
return [
[
ProofreadIndexPage::newFromTitle( 
Title::makeTitle( 252, 'LoremIpsum.djvu' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
];
}
@@ -55,7 +67,7 @@
 * @expectedException \ProofreadPage\FileNotFoundException
 * @dataProvider indexFileNotFoundProvider
 */
-   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
 $index ) {
+   public function testGetForIndexPageWithFileNotFound( ProofreadIndexPage 
$index ) {
$this->fileProvider->getForIndexPage( $index );
}
 
@@ -84,19 +96,19 @@
return [
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/4' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu/djvu/1' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'LoremIpsum.djvu' ) ),
-   $this->getFileFromName( 'LoremIpsum.djvu' )
+   $this->loremIpsumFile
],
[
ProofreadPagePage::newFromTitle( 
Title::makeTitle( 250, 'Test.jpg' ) ),
-   $this->getFileFromName( 'Test.jpg' )
+   $this->testFile
],
];
}
@@ -105,7 +117,7 @@
 * @expectedException \ProofreadPage\FileNotFoundException
 * @dataProvider pageFileNotFoundProvider
 */
-   public function testGetForPagePageWithFileNotFound( ProofreadPagePage  
$page ) {
+   public function testGetForPagePageWithFileNotFound( ProofreadPagePage 
$page ) {
$this->fileProvider->getForPagePage( $page );
}
 

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic606344a21ddd6fdcd74cee11c0487a89b88ddbd
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/extensions/ProofreadPage
Gerrit-Branch: master
Gerrit-Owner: Tpt 

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