Expand mocking in JHtmlBehaviorTest

tests/unit/core/case/case.php

@@ -173,7 +173,7 @@ class_exists('JApplication');
 	 * @param   array  $options      A set of options to configure the mock.
 	 * @param   array  $constructor  An array containing constructor arguments to inject into the mock.
 	 *
-	 * @return  JApplicationCms
+	 * @return  JApplicationCms|PHPUnit_Framework_MockObject_MockObject
 	 *
 	 * @since   3.2
 	 */

tests/unit/core/mock/application/cms.php

@@ -26,6 +26,7 @@ public static function getMethods()
 		// Collect all the relevant methods in JApplicationCms (work in progress).
 		$methods = array(
 			'getMenu',
+			'getName',
 			'getPathway',
 			'getTemplate',
 			'getLanguageFilter',
@@ -75,7 +76,7 @@ public static function addBehaviours($test, $mockObject, $options)
 	 * @param   array     $options      A set of options to configure the mock.
 	 * @param   array     $constructor  An array containing constructor arguments to inject into the mock.
 	 *
-	 * @return  PHPUnit_Framework_MockObject_MockObject
+	 * @return  JApplicationCms|PHPUnit_Framework_MockObject_MockObject
 	 *
 	 * @since   3.2
 	 */

tests/unit/suites/libraries/cms/html/JHtmlBehaviorTest.php

@@ -43,7 +43,17 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockCmsApp();
+		$mockApp = $this->getMockCmsApp();
+		$mockApp->expects($this->any())
+			->method('getName')
+			->willReturn('site');
+
+		$mockApp->expects($this->any())
+			->method('isClient')
+			->with('site')
+			->willReturn(true);
+
+		JFactory::$application = $mockApp;
 		JFactory::$document = $this->getMockDocument();
 		JFactory::$session = $this->getMockSession();
 
@@ -56,6 +66,13 @@ protected function setUp()
 
 		$_SERVER['HTTP_HOST'] = 'example.com';
 		$_SERVER['SCRIPT_NAME'] = '';
+
+		$mockRouter = $this->getMockBuilder('Joomla\\CMS\\Router\\Router')->getMock();
+		$mockRouter->expects($this->any())
+			->method('build')
+			->willReturn(new \JUri);
+
+		TestReflection::setValue('JRoute', '_router', array('site' => $mockRouter));
 	}
 
 	/**
@@ -68,6 +85,8 @@ protected function setUp()
 	 */
 	protected function tearDown()
 	{
+		TestReflection::setValue('JRoute', '_router', null);
+
 		$_SERVER = $this->backupServer;
 		unset($this->backupServer);
 		$this->restoreFactoryState();