Fixing tests broken by previous commit.

lib/Cake/Test/Case/Core/AppTest.php

@@ -316,11 +316,6 @@ class AppTest extends CakeTestCase {
 		$result = App::objects('Model/Behavior', null, false);
 		$this->assertTrue(in_array('TreeBehavior', $result));
 
-		$result = App::objects('controller', null, false);
-		$this->assertTrue(in_array('PagesController', $result));
-		$result = App::objects('Controller', null, false);
-		$this->assertTrue(in_array('PagesController', $result));
-
 		$result = App::objects('component', null, false);
 		$this->assertTrue(in_array('AuthComponent', $result));
 		$result = App::objects('Controller/Component', null, false);

lib/Cake/Test/Case/Routing/DispatcherTest.php

@@ -19,7 +19,7 @@
 App::uses('Dispatcher', 'Routing');
 
 if (!class_exists('AppController', false)) {
-	require_once CAKE . 'Controller' . DS . 'AppController.php';
+	require_once CAKE . 'Test' . DS . 'test_app' . DS . 'Controller' . DS . 'AppController.php';
 } elseif (!defined('APP_CONTROLLER_EXISTS')){
 	define('APP_CONTROLLER_EXISTS', true);
 }
@@ -1206,7 +1206,7 @@ class DispatcherTest extends CakeTestCase {
 	public static function assetProvider() {
 		return array(
 			array(
-				'theme/test_theme/flash/theme_test.swf', 
+				'theme/test_theme/flash/theme_test.swf',
 				'View/Themed/TestTheme/webroot/flash/theme_test.swf'
 			),
 			array(
@@ -1369,7 +1369,7 @@ class DispatcherTest extends CakeTestCase {
 			array('test_cached_pages/themed'),
 		);
 	}
-	
+
 /**
  * testFullPageCachingDispatch method
  *