From ed6cd03027c2e046bfa7a6081c8a9b52d80ac5ca Mon Sep 17 00:00:00 2001
From: Alangi Derick <alangiderick@gmail.com>
Date: Tue, 18 Dec 2018 11:11:20 +0100
Subject: [PATCH] MagicWordFactory: Follow-up on I5d2166f155e31900cb40c

Applied comments from I5d2166f155e31900cb40c to improve on
the unit test. makeMagicWordFactory() makes passing "null"
optional (which is default, hence some cleanup for calls).

Change-Id: Ib9a096c519f0de7286aa244bf3bb842cc11740f9
---
 .../phpunit/includes/MagicWordFactoryTest.php | 32 ++++++++-----------
 1 file changed, 14 insertions(+), 18 deletions(-)

diff --git a/tests/phpunit/includes/MagicWordFactoryTest.php b/tests/phpunit/includes/MagicWordFactoryTest.php
index ec7f2abdaf..63ca1395cf 100644
--- a/tests/phpunit/includes/MagicWordFactoryTest.php
+++ b/tests/phpunit/includes/MagicWordFactoryTest.php
@@ -6,13 +6,9 @@
  * @author Derick N. Alangi
  */
 class MagicWordFactoryTest extends MediaWikiTestCase {
-	/**
-	 * Make magic word factory
-	 */
-	private function makeMagicWordFactory( $contLang ) {
+	private function makeMagicWordFactory( Language $contLang = null ) {
 		if ( $contLang === null ) {
-			$mwf = new MagicWordFactory( Language::factory( 'en' ) );
-			return $mwf;
+			return new MagicWordFactory( Language::factory( 'en' ) );
 		}
 		return new MagicWordFactory( $contLang );
 	}
@@ -21,14 +17,14 @@ class MagicWordFactoryTest extends MediaWikiTestCase {
 		$contLang = Language::factory( 'en' );
 
 		$magicWordFactory = $this->makeMagicWordFactory( $contLang );
-		$mwfActual = $magicWordFactory->getContentLanguage();
+		$magicWordContLang = $magicWordFactory->getContentLanguage();
 
-		$this->assertSame( $contLang, $mwfActual );
+		$this->assertSame( $contLang, $magicWordContLang );
 	}
 
 	public function testGetMagicWord() {
 		$magicWordIdValid = 'pageid';
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 		$mwActual = $magicWordFactory->get( $magicWordIdValid );
 		$contLang = $magicWordFactory->getContentLanguage();
 		$expected = new MagicWord( $magicWordIdValid, [ 'PAGEID' ], false, $contLang );
@@ -37,7 +33,7 @@ class MagicWordFactoryTest extends MediaWikiTestCase {
 	}
 
 	public function testGetInvalidMagicWord() {
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 
 		$this->setExpectedException( MWException::class );
 		\Wikimedia\suppressWarnings();
@@ -49,28 +45,28 @@ class MagicWordFactoryTest extends MediaWikiTestCase {
 	}
 
 	public function testGetVariableIDs() {
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 		$varIds = $magicWordFactory->getVariableIDs();
 
-		$this->assertContainsOnly( 'string', $varIds );
-		$this->assertNotEmpty( $varIds );
 		$this->assertInternalType( 'array', $varIds );
+		$this->assertNotEmpty( $varIds );
+		$this->assertContainsOnly( 'string', $varIds );
 	}
 
 	public function testGetSubstIDs() {
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 		$substIds = $magicWordFactory->getSubstIDs();
 
-		$this->assertContainsOnly( 'string', $substIds );
-		$this->assertNotEmpty( $substIds );
 		$this->assertInternalType( 'array', $substIds );
+		$this->assertNotEmpty( $substIds );
+		$this->assertContainsOnly( 'string', $substIds );
 	}
 
 	/**
 	 * Test both valid and invalid caching hints paths
 	 */
 	public function testGetCacheTTL() {
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 		$actual = $magicWordFactory->getCacheTTL( 'localday' );
 
 		$this->assertSame( 3600, $actual );
@@ -83,7 +79,7 @@ class MagicWordFactoryTest extends MediaWikiTestCase {
 	}
 
 	public function testGetDoubleUnderscoreArray() {
-		$magicWordFactory = $this->makeMagicWordFactory( null );
+		$magicWordFactory = $this->makeMagicWordFactory();
 		$actual = $magicWordFactory->getDoubleUnderscoreArray();
 
 		$this->assertInstanceOf( MagicWordArray::class, $actual );
-- 
2.20.1