From 42754c63ff8c7aecdc0bb65277f3800f24c27a82 Mon Sep 17 00:00:00 2001
From: mark_story <mark@mark-story.com>
Date: Thu, 16 Dec 2010 00:01:43 -0500
Subject: [PATCH] Making more tests no longer skip in test suites.

---
 .../cases/libs/controller/controller.test.php | 85 +++++++++----------
 1 file changed, 38 insertions(+), 47 deletions(-)

diff --git a/cake/tests/cases/libs/controller/controller.test.php b/cake/tests/cases/libs/controller/controller.test.php
index 6f217b3e9e6..851e3a4a41d 100644
--- a/cake/tests/cases/libs/controller/controller.test.php
+++ b/cake/tests/cases/libs/controller/controller.test.php
@@ -22,46 +22,38 @@
 App::import('Component', 'Security');
 App::import('Component', 'Cookie');
 
+
 /**
  * AppController class
  *
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
  */
-if (!class_exists('AppController')) {
-	/**
-	 * AppController class
-	 *
-	 * @package       cake
-	 * @subpackage    cake.tests.cases.libs.controller
-	 */
-	class AppController extends Controller {
-	/**
-	 * helpers property
-	 *
-	 * @var array
-	 * @access public
-	 */
-		public $helpers = array('Html');
-	/**
-	 * uses property
-	 *
-	 * @var array
-	 * @access public
-	 */
-		public $uses = array('ControllerPost');
-	/**
-	 * components property
-	 *
-	 * @var array
-	 * @access public
-	 */
-		public $components = array('Cookie');
-	}
-} elseif (!defined('APP_CONTROLLER_EXISTS')) {
-	define('APP_CONTROLLER_EXISTS', true);
+class ControllerTestAppController extends Controller {
+/**
+ * helpers property
+ *
+ * @var array
+ * @access public
+ */
+	public $helpers = array('Html');
+/**
+ * uses property
+ *
+ * @var array
+ * @access public
+ */
+	public $uses = array('ControllerPost');
+/**
+ * components property
+ *
+ * @var array
+ * @access public
+ */
+	public $components = array('Cookie');
 }
 
+
 /**
  * ControllerPost class
  *
@@ -137,7 +129,7 @@ function find($type, $options = array()) {
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
  */
-class ControllerCommentsController extends AppController {
+class ControllerCommentsController extends ControllerTestAppController {
 
 /**
  * name property
@@ -146,6 +138,8 @@ class ControllerCommentsController extends AppController {
  * @access public
  */
 	public $name = 'ControllerComments';
+	
+	protected $_mergeParent = 'ControllerTestAppController';
 }
 
 /**
@@ -259,7 +253,7 @@ class NameTest extends CakeTestModel {
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
  */
-class TestController extends AppController {
+class TestController extends ControllerTestAppController {
 
 /**
  * name property
@@ -291,6 +285,8 @@ class TestController extends AppController {
  * @access public
  */
 	public $uses = array('ControllerComment', 'ControllerAlias');
+	
+	protected $_mergeParent = 'ControllerTestAppController';
 
 /**
  * index method
@@ -367,7 +363,7 @@ function beforeRender(&$controller) {
  * @package       cake
  * @subpackage    cake.tests.cases.libs.controller
  */
-class AnotherTestController extends AppController {
+class AnotherTestController extends ControllerTestAppController {
 
 /**
  * name property
@@ -382,6 +378,8 @@ class AnotherTestController extends AppController {
  * @access public
  */
 	public $uses = null;
+	
+	protected $_mergeParent = 'ControllerTestAppController';
 }
 
 /**
@@ -870,17 +868,13 @@ function testRedirectBeforeRedirectModifyingParamsArrayReturn() {
  * @return void
  */
 	function testMergeVars() {
-		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
-			return;
-		}
 		$request = new CakeRequest('controller_posts/index');
 
-
 		$TestController = new TestController($request);
 		$TestController->constructClasses();
 
 		$testVars = get_class_vars('TestController');
-		$appVars = get_class_vars('AppController');
+		$appVars = get_class_vars('ControllerTestAppController');
 
 		$components = is_array($appVars['components'])
 						? array_merge($appVars['components'], $testVars['components'])
@@ -900,12 +894,12 @@ function testMergeVars() {
 		$this->assertEqual(count(array_diff_assoc(Set::normalize($TestController->components), Set::normalize($components))), 0);
 
 		$expected = array('ControllerComment', 'ControllerAlias', 'ControllerPost');
-		$this->assertEquals($expected, $TestController->uses, '$uses was merged incorrectly, AppController models should be last.');
+		$this->assertEquals($expected, $TestController->uses, '$uses was merged incorrectly, ControllerTestAppController models should be last.');
 
 		$TestController = new AnotherTestController($request);
 		$TestController->constructClasses();
 
-		$appVars = get_class_vars('AppController');
+		$appVars = get_class_vars('ControllerTestAppController');
 		$testVars = get_class_vars('AnotherTestController');
 
 
@@ -918,7 +912,7 @@ function testMergeVars() {
 		$TestController = new ControllerCommentsController($request);
 		$TestController->constructClasses();
 
-		$appVars = get_class_vars('AppController');
+		$appVars = get_class_vars('ControllerTestAppController');
 		$testVars = get_class_vars('ControllerCommentsController');
 
 
@@ -936,9 +930,6 @@ function testMergeVars() {
  * @return void
  */
 	function testChildComponentOptionsSupercedeParents() {
-		if ($this->skipIf(defined('APP_CONTROLLER_EXISTS'), '%s Need a non-existent AppController')) {
-			return;
-		}
 		$request = new CakeRequest('controller_posts/index');
 
 		$TestController = new TestController($request);
@@ -951,7 +942,7 @@ function testChildComponentOptionsSupercedeParents() {
 
 /**
  * Ensure that __mergeVars is not being greedy and merging with
- * AppController when you make an instance of Controller
+ * ControllerTestAppController when you make an instance of Controller
  *
  * @return void
  */