From c4b44cdc727d5d5097cf190fe76714bc6f23aeba Mon Sep 17 00:00:00 2001
From: aude <aude.wiki@gmail.com>
Date: Fri, 19 Dec 2014 10:20:38 +0100
Subject: [PATCH] Cleanup SiteListFileCache test files in tearDown

Also use tempnam instead of time().

Bug: T84970
Change-Id: I5eb4379671cde45f70bb03d4634f9f34495a6b29
---
 .../site/SiteListFileCacheBuilderTest.php     | 20 +++++++++-----
 .../includes/site/SiteListFileCacheTest.php   | 26 +++++++++++--------
 2 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php b/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
index af02429154..bbe8cc7356 100644
--- a/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
+++ b/tests/phpunit/includes/site/SiteListFileCacheBuilderTest.php
@@ -30,13 +30,19 @@
  */
 class SiteListFileCacheBuilderTest extends PHPUnit_Framework_TestCase {
 
-	public function testBuild() {
-		$cacheFile = $this->getCacheFile();
+	protected function setUp() {
+		$this->cacheFile = $this->getCacheFile();
+	}
 
-		$cacheBuilder = $this->newSiteListFileCacheBuilder( $this->getSites(), $cacheFile );
+	protected function tearDown() {
+		unlink( $this->cacheFile );
+	}
+
+	public function testBuild() {
+		$cacheBuilder = $this->newSiteListFileCacheBuilder( $this->getSites() );
 		$cacheBuilder->build();
 
-		$contents = file_get_contents( $cacheFile );
+		$contents = file_get_contents( $this->cacheFile );
 		$this->assertEquals( json_encode( $this->getExpectedData() ), $contents );
 	}
 
@@ -85,10 +91,10 @@ class SiteListFileCacheBuilderTest extends PHPUnit_Framework_TestCase {
 		);
 	}
 
-	private function newSiteListFileCacheBuilder( SiteList $sites, $cacheFile ) {
+	private function newSiteListFileCacheBuilder( SiteList $sites ) {
 		return new SiteListFileCacheBuilder(
 			$this->getSiteSQLStore( $sites ),
-			$cacheFile
+			$this->cacheFile
 		);
 	}
 
@@ -124,7 +130,7 @@ class SiteListFileCacheBuilderTest extends PHPUnit_Framework_TestCase {
 	}
 
 	private function getCacheFile() {
-		return sys_get_temp_dir() . '/sites-' . time() . '.json';
+		return tempnam( sys_get_temp_dir(), 'mw-test-sitelist' );
 	}
 
 }
diff --git a/tests/phpunit/includes/site/SiteListFileCacheTest.php b/tests/phpunit/includes/site/SiteListFileCacheTest.php
index b598eedab1..05dcd8a534 100644
--- a/tests/phpunit/includes/site/SiteListFileCacheTest.php
+++ b/tests/phpunit/includes/site/SiteListFileCacheTest.php
@@ -30,33 +30,37 @@
  */
 class SiteListFileCacheTest extends PHPUnit_Framework_TestCase {
 
-	public function testGetSites() {
-		$cacheFile = $this->getCacheFile();
+	protected function setUp() {
+		$this->cacheFile = $this->getCacheFile();
+	}
+
+	protected function tearDown() {
+		unlink( $this->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( $this->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( $this->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
+			$this->cacheFile
 		);
 	}
 
@@ -92,7 +96,7 @@ class SiteListFileCacheTest extends PHPUnit_Framework_TestCase {
 	}
 
 	private function getCacheFile() {
-		return sys_get_temp_dir() . '/sites-' . time() . '.json';
+		return tempnam( sys_get_temp_dir(), 'mw-test-sitelist' );
 	}
 
 }
-- 
2.20.1