[Unit Test improvements] Use getMockBuilder rather than getMock direc…

…tly (#12990) * Use getMockBuilder rather than getMock directly Avoid situations that would cause `PHP Fatal error: Call to protected method PHPUnit_Framework_TestCase::getMock()` on newer versions of phpunit * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use the correct $this object * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Set up a more mock JTableExtension with getMockBuilder * Use getMockBuilder rather than getMock directly * Use the correct $this object * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * remove the method after replacing * Use getMockBuilder rather than getMock directly * More getMockBuilder in place of getMock * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Fix testParse mock Constructor Args * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * disableOriginalConstructor * disableOriginalConstructor() * disableOriginalConstructor() * disableOriginalConstructor() * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * another spot for getMockBuilder * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * remove duplicate $this->transport * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Use getMockBuilder rather than getMock directly * Add 'setUserState' to MockApplicationCms Fixes 2 warnings on phpUnit 5.6: 1) JModelListTest::testGetuserstateUsesDefault Trying to configure method "setUserState" which cannot be configured because it does not exist, has not been specified, is final, or is static 2) JModelListTest::testGetuserstateUsesRequestData Trying to configure method "setUserState" which cannot be configured because it does not exist, has not been specified, is final, or is static * mockDatabase fails for mockTableExtension on hhvm Fixes 10 hhvm failures that have one of the following messages ```php UnexpectedValueException: No columns found for #__extensions table Expectation failed for method name is equal to <string:parseSchemaUpdates> when invoked 1 time(s). Method was expected to be called 1 times, actually called 0 times. ``` * cs-fix extra semicolon * remove trailing coma * remove trailing comma
joomla · Dec 11, 2016 · d9e1f90 · d9e1f90
1 parent 8e20e66
commit d9e1f90
Show file tree

Hide file tree

Showing 171 changed files with 2,325 additions and 2,184 deletions.
diff --git a/tests/unit/core/mock/application.php b/tests/unit/core/mock/application.php
@@ -36,17 +36,13 @@ public static function create($test)
 			'getLanguage'
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JApplication',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JApplication')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		$menu = TestMockMenu::create($test);
 		$mockObject->expects($test->any())

diff --git a/tests/unit/core/mock/application/base.php b/tests/unit/core/mock/application/base.php
@@ -75,17 +75,12 @@ public static function create($test, $options = array())
 		// Collect all the relevant methods in JApplicationBase.
 		$methods = self::getMethods();
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JApplicationBase',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			true
-		);
+		// Build the mock object & allow Call to original constructor
+		$mockObject = $test->getMockBuilder('JApplicationBase')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->getMock();
 
 		$mockObject = self::addBehaviours($test, $mockObject, $options);
 

diff --git a/tests/unit/core/mock/application/cli.php b/tests/unit/core/mock/application/cli.php
@@ -51,17 +51,12 @@ public static function create($test, $options = array())
 		// Collect all the relevant methods in JApplicationCli.
 		$methods = self::getMethods();
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JApplicationCli',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			true
-		);
+		// Build the mock object & allow Call to original constructor.
+		$mockObject = $test->getMockBuilder('JApplicationCli')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->getMock();
 
 		$mockObject = self::addBehaviours($test, $mockObject, $options);
 

diff --git a/tests/unit/core/mock/application/cms.php b/tests/unit/core/mock/application/cms.php
@@ -33,7 +33,8 @@ public static function getMethods()
 			'isAdmin',
 			'isSite',
 			'getUserState',
-			'getUserStateFromRequest'
+			'getUserStateFromRequest',
+			'setUserState',
 		);
 
 		return array_merge($methods, parent::getMethods());
@@ -88,17 +89,14 @@ public static function create($test, $options = array(), $constructor = array())
 		$methods = self::getMethods();
 
 		if (isset($options))
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JApplicationCms',
-			$methods,
-			// Constructor arguments.
-			$constructor,
-			// Mock class name.
-			'',
-			// Call original constructor.
-			true
-		);
+		{
+			// Build the mock object & allow call to original constructor.
+			$mockObject = $test->getMockBuilder('JApplicationCms')
+						->setMethods($methods)
+						->setConstructorArgs($constructor)
+						->setMockClassName('')
+						->getMock();
+		}
 
 		$mockObject = self::addBehaviours($test, $mockObject, $options);
 

diff --git a/tests/unit/core/mock/application/web.php b/tests/unit/core/mock/application/web.php
@@ -161,17 +161,12 @@ public static function create($test, $options = array())
 		// Collect all the relevant methods in JApplicationWeb (work in progress).
 		$methods = self::getMethods();
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JApplicationWeb',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			true
-		);
+		// Build the mock object & allow call to original constructor.
+		$mockObject = $test->getMockBuilder('JApplicationWeb')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->getMock();
 
 		$mockObject = self::addBehaviours($test, $mockObject, $options);
 

diff --git a/tests/unit/core/mock/cache.php b/tests/unit/core/mock/cache.php
@@ -42,17 +42,13 @@ public static function create(TestCase $test, $data = array())
 			'store',
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JCache',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JCache')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		$test->assignMockCallbacks(
 			$mockObject,

diff --git a/tests/unit/core/mock/config.php b/tests/unit/core/mock/config.php
@@ -31,17 +31,13 @@ public static function create($test)
 			'set'
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JConfig',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JConfig')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		return $mockObject;
 	}

diff --git a/tests/unit/core/mock/controller.php b/tests/unit/core/mock/controller.php
@@ -34,17 +34,13 @@ public static function create($test)
 			'unserialize',
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JControllerBase',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JControllerBase')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		// TODO  Mock the input.
 		TestReflection::setValue($mockObject, 'input', new JInput);

diff --git a/tests/unit/core/mock/database/driver.php b/tests/unit/core/mock/database/driver.php
@@ -97,17 +97,13 @@ public static function create($test, $driver = '', array $extraMethods = array()
 			'updateObject',
 		));
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JDatabaseDriver' . $driver,
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JDatabaseDriver' . $driver)
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		// Mock selected methods.
 		$test->assignMockReturns(

diff --git a/tests/unit/core/mock/dispatcher.php b/tests/unit/core/mock/dispatcher.php
@@ -53,18 +53,13 @@ public static function create($test, $defaults = true)
 			'test',
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JEventDispatcher',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
-
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JEventDispatcher')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 		// Mock selected methods.
 		$test->assignMockReturns(
 			$mockObject, array(

diff --git a/tests/unit/core/mock/document.php b/tests/unit/core/mock/document.php
@@ -33,16 +33,12 @@ public static function create($test)
 		);
 
 		// Create the mock.
-		$mockObject = $test->getMock(
-			'JDocument',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		$mockObject = $test->getMockBuilder('JDocument')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		// Mock selected methods.
 		$test->assignMockReturns(

diff --git a/tests/unit/core/mock/input.php b/tests/unit/core/mock/input.php
@@ -72,17 +72,13 @@ public function createInput(array $options = null)
 			$methods = array_merge($methods, $options['methods']);
 		}
 
-		// Create the mock.
-		$mockObject = self::$test->getMock(
-			'JInput',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = self::$test->getMockBuilder('JInput')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		self::$test->assignMockCallbacks(
 			$mockObject,

diff --git a/tests/unit/core/mock/language.php b/tests/unit/core/mock/language.php
@@ -33,17 +33,13 @@ public static function create($test)
 			'test',
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JLanguage',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JLanguage')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		// Mock selected methods.
 		$test->assignMockReturns(

diff --git a/tests/unit/core/mock/menu.php b/tests/unit/core/mock/menu.php
@@ -41,17 +41,13 @@ public static function create(PHPUnit_Framework_TestCase $test, $setDefault = tr
 			'load'
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JMenu',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JMenu')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		self::createMenuSampleData();
 

diff --git a/tests/unit/core/mock/rules.php b/tests/unit/core/mock/rules.php
@@ -30,17 +30,13 @@ public static function create($test)
 			'allow',
 		);
 
-		// Create the mock.
-		$mockObject = $test->getMock(
-			'JAccessRules',
-			$methods,
-			// Constructor arguments.
-			array(),
-			// Mock class name.
-			'',
-			// Call original constructor.
-			false
-		);
+		// Build the mock object.
+		$mockObject = $test->getMockBuilder('JAccessRules')
+					->setMethods($methods)
+					->setConstructorArgs(array())
+					->setMockClassName('')
+					->disableOriginalConstructor()
+					->getMock();
 
 		$test->assignMockCallbacks(
 			$mockObject,