Merge pull request #37 from Paladin/JDocumentRenderer

JDocumentRenderer tests skipped
elinw · Jun 10, 2011 · f3069b4 · f3069b4
2 parents 6b577c4 + 7fbcf27
commit f3069b4
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/tests/suite/joomla/document/feed/renderer/JDocumentRendererAtomTest.php b/tests/suite/joomla/document/feed/renderer/JDocumentRendererAtomTest.php
@@ -7,13 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/application/router.php';
-require_once JPATH_PLATFORM.'/joomla/document/renderer.php';
-require_once JPATH_PLATFORM.'/joomla/document/feed/feed.php';
-require_once JPATH_PLATFORM.'/joomla/document/feed/renderer/atom.php';
-require_once JPATH_PLATFORM.'/joomla/environment/request.php';
-require_once JPATH_PLATFORM.'/joomla/environment/response.php';
-
 /**
  * Test class for JDocumentRendererAtom.
  * Generated by PHPUnit on 2009-10-09 at 12:23:19.
@@ -30,10 +23,18 @@ class JDocumentRendererAtomTest extends JoomlaTestCase
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.
 	 *
+	 * @TODO Once the coupling has been loosed, revisit and build a test harness we can use
+	 *
 	 * @access protected
 	 */
 	protected function setUp()
 	{
+		$this->markTestSkipped("Too tightly coupled to internals to be testable now");
+
+		require_once JPATH_PLATFORM.'/joomla/application/router.php';
+		require_once JPATH_PLATFORM.'/joomla/environment/request.php';
+		require_once JPATH_PLATFORM.'/joomla/document/feed/feed.php';
+		require_once JPATH_PLATFORM.'/joomla/environment/response.php';
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMock(
@@ -61,8 +62,9 @@ protected function setUp()
 		JRequest::setVar('type', 'atom');
 		$this->object = new JDocumentFeed;
 		$_SERVER['HTTP_HOST'] = 'localhost';
-		$_SERVER['SCRIPT_NAME'] = '';
-	}
+//		$_SERVER['SCRIPT_NAME'] = '/index.php';
+		$_SERVER['REQUEST_URI'] = '/index.php?format=feed&amp;type=atom';
+}
 
 	/**
 	 * Tears down the fixture, for example, closes a network connection.

diff --git a/tests/suite/joomla/document/feed/renderer/JDocumentRendererRSSTest.php b/tests/suite/joomla/document/feed/renderer/JDocumentRendererRSSTest.php
@@ -7,11 +7,6 @@
  * @license     GNU General Public License version 2 or later; see LICENSE
  */
 
-require_once JPATH_PLATFORM.'/joomla/environment/request.php';
-require_once JPATH_PLATFORM.'/joomla/document/renderer.php';
-require_once JPATH_PLATFORM.'/joomla/document/feed/feed.php';
-require_once JPATH_PLATFORM.'/joomla/document/feed/renderer/rss.php';
-
 /**
  * Test class for JDocumentRendererRSS.
  * Generated by PHPUnit on 2009-10-09 at 13:47:52.
@@ -26,9 +21,20 @@ class JDocumentRendererRSSTest extends JoomlaTestCase
 	/**
 	 * Sets up the fixture, for example, opens a network connection.
 	 * This method is called before a test is executed.
+	 *
+	 * @TODO Once the coupling has been loosed, revisit and build a test harness we can use
+	 *
+	 * @access protected
 	 */
 	protected function setUp()
 	{
+		$this->markTestSkipped("Too tightly coupled to internals to be testable now");
+
+		require_once JPATH_PLATFORM.'/joomla/application/router.php';
+		require_once JPATH_PLATFORM.'/joomla/environment/request.php';
+		require_once JPATH_PLATFORM.'/joomla/document/feed/feed.php';
+		require_once JPATH_PLATFORM.'/joomla/environment/response.php';
+
 		$this->saveFactoryState();
 
 		JFactory::$application = $this->getMock(