[4.0] PHPUnit test fixes (#14084)

* [4.0] PHPUnit test fixes * [4.0] PHPUnit create a new JMediawiki http instance instead of jhttp * Fixed JDocumentFeedTest
joomla · Feb 17, 2017 · 6445be4 · 6445be4
1 parent 722ba93
commit 6445be4
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 8 deletions.
diff --git a/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php b/tests/unit/suites/libraries/cms/router/JRouterSiteTest.php
@@ -114,12 +114,13 @@ public function testConstruct()
 		$app->method('get')->will($this->returnValueMap($config));
 		$object = new JRouterSite($app, $app->getMenu());
 		$rules = $object->getRules();
-		$this->assertTrue(count($rules['parse' . JRouter::PROCESS_BEFORE]) == 3);
-		$this->assertTrue(count($rules['parse']) == 2);
-		$this->assertTrue(count($rules['parse' . JRouter::PROCESS_AFTER]) == 1);
+
+		$this->assertTrue(count($rules['parse' . JRouter::PROCESS_BEFORE]) == 2);
+		$this->assertTrue(count($rules['parse']) == 1);
+		$this->assertTrue(count($rules['parse' . JRouter::PROCESS_AFTER]) == 0);
 		$this->assertTrue(count($rules['build' . JRouter::PROCESS_BEFORE]) == 2);
-		$this->assertTrue(count($rules['build']) == 1);
-		$this->assertTrue(count($rules['build' . JRouter::PROCESS_AFTER]) == 4);
+		$this->assertTrue(count($rules['build']) == 0);
+		$this->assertTrue(count($rules['build' . JRouter::PROCESS_AFTER]) == 1);
 	}
 
 	/**

diff --git a/tests/unit/suites/libraries/joomla/document/feed/JDocumentFeedTest.php b/tests/unit/suites/libraries/joomla/document/feed/JDocumentFeedTest.php
@@ -27,7 +27,12 @@ protected function setUp()
 
 		$this->saveFactoryState();
 
-		JFactory::$application = $this->getMockWeb();
+		$config = array(
+			array('offset', 'UTC', 'UTC')
+		);
+
+		JFactory::$application = $this->getMockCmsApp();
+		JFactory::$application->method('get')->will($this->returnValueMap($config));
 
 		$this->object = new JDocumentFeed;
 	}

diff --git a/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php b/tests/unit/suites/libraries/joomla/mediawiki/JMediawikiHttpTest.php
@@ -36,7 +36,7 @@ public function testConstructorDisallowsNonArrayObjects()
 	 */
 	public function testConstructorSetsStreamTransport()
 	{
-		$http = new JHttp;
+		$http = new JMediawikiHttp(array());
 
 		$this->assertAttributeInstanceOf('JHttpTransportStream', 'transport', $http);
 	}

diff --git a/tests/unit/suites/libraries/joomla/table/JTableTest.php b/tests/unit/suites/libraries/joomla/table/JTableTest.php
@@ -204,7 +204,7 @@ public function testAddIncludePath()
 		$expected = array(
 			'/dummy/',
 			'dir/not/exist',
-			realpath(JPATH_PLATFORM . '/src/Joomla/Cms/Table')
+			realpath(JPATH_PLATFORM . '/src/Cms/Table')
 		);
 
 		// Add dummy paths