Aude has uploaded a new change for review.
https://gerrit.wikimedia.org/r/181047
Change subject: Cleanup SiteListFileCache test files in tearDown
......................................................................
Cleanup SiteListFileCache test files in tearDown
Change-Id: I5eb4379671cde45f70bb03d4634f9f34495a6b29
---
M tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
M tests/phpunit/includes/site/SiteListFileCacheTest.php
2 files changed, 30 insertions(+), 16 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/mediawiki/core
refs/changes/47/181047/1
diff --git a/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
b/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
index af02429..c7d157f 100644
--- a/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
+++ b/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
@@ -30,13 +30,21 @@
*/
class SiteListFileCacheBuilderTest extends PHPUnit_Framework_TestCase {
- public function testBuild() {
- $cacheFile = $this->getCacheFile();
+ private static $cacheFile;
- $cacheBuilder = $this->newSiteListFileCacheBuilder(
$this->getSites(), $cacheFile );
+ protected function setUp() {
+ self::$cacheFile = $this->getCacheFile();
+ }
+
+ protected function tearDown() {
+ unlink( self::$cacheFile );
+ }
+
+ public function testBuild() {
+ $cacheBuilder = $this->newSiteListFileCacheBuilder(
$this->getSites() );
$cacheBuilder->build();
- $contents = file_get_contents( $cacheFile );
+ $contents = file_get_contents( self::$cacheFile );
$this->assertEquals( json_encode( $this->getExpectedData() ),
$contents );
}
@@ -85,10 +93,10 @@
);
}
- private function newSiteListFileCacheBuilder( SiteList $sites,
$cacheFile ) {
+ private function newSiteListFileCacheBuilder( SiteList $sites ) {
return new SiteListFileCacheBuilder(
$this->getSiteSQLStore( $sites ),
- $cacheFile
+ self::$cacheFile
);
}
diff --git a/tests/phpunit/includes/site/SiteListFileCacheTest.php
b/tests/phpunit/includes/site/SiteListFileCacheTest.php
index b598eed..d5fb827 100644
--- a/tests/phpunit/includes/site/SiteListFileCacheTest.php
+++ b/tests/phpunit/includes/site/SiteListFileCacheTest.php
@@ -30,33 +30,39 @@
*/
class SiteListFileCacheTest extends PHPUnit_Framework_TestCase {
- public function testGetSites() {
- $cacheFile = $this->getCacheFile();
+ private static $cacheFile;
+ protected function setUp() {
+ self::$cacheFile = $this->getCacheFile();
+ }
+
+ protected function tearDown() {
+ unlink( self::$cacheFile );
+ }
+
+ public function testGetSites() {
$sites = $this->getSites();
- $cacheBuilder = $this->newSiteListFileCacheBuilder( $sites,
$cacheFile );
+ $cacheBuilder = $this->newSiteListFileCacheBuilder( $sites );
$cacheBuilder->build();
- $cache = new SiteListFileCache( $cacheFile );
+ $cache = new SiteListFileCache( self::$cacheFile );
$this->assertEquals( $sites, $cache->getSites() );
}
public function testGetSite() {
- $cacheFile = $this->getCacheFile();
-
$sites = $this->getSites();
- $cacheBuilder = $this->newSiteListFileCacheBuilder( $sites,
$cacheFile );
+ $cacheBuilder = $this->newSiteListFileCacheBuilder( $sites );
$cacheBuilder->build();
- $cache = new SiteListFileCache( $cacheFile );
+ $cache = new SiteListFileCache( self::$cacheFile );
$this->assertEquals( $sites->getSite( 'enwiktionary' ),
$cache->getSite( 'enwiktionary' ) );
}
- private function newSiteListFileCacheBuilder( SiteList $sites,
$cacheFile ) {
+ private function newSiteListFileCacheBuilder( SiteList $sites ) {
return new SiteListFileCacheBuilder(
$this->getSiteSQLStore( $sites ),
- $cacheFile
+ self::$cacheFile
);
}
--
To view, visit https://gerrit.wikimedia.org/r/181047
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I5eb4379671cde45f70bb03d4634f9f34495a6b29
Gerrit-PatchSet: 1
Gerrit-Project: mediawiki/core
Gerrit-Branch: master
Gerrit-Owner: Aude <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
