adulau/cakephp2-php8
1
0
Fork 0
mirror of https://github.com/kamilwylegala/cakephp2-php8.git synced 2025-01-31 09:06:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

"Refactoring Component tests.

Browse source 
Removed Component::!__construct();"

git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@6374 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
phpnut 2008-01-13 04:06:01 +00:00
parent 6419ee2bc7
commit 654669d48f
2 changed files with 10 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
cake/libs/controller/component.php
View file

@ -44,14 +44,6 @@ class Component extends Object {
* @access public * @access public
*/ */
var $controller = null; var $controller = null;
/**
* Constructor
*
* @return object
*/
function __construct() {
}
/** /**
* Used to initialize the components for current controller * Used to initialize the components for current controller
* *

15
cake/tests/cases/libs/controller/component.test.php
View file

@ -47,7 +47,7 @@ class ComponentTest extends CakeTestCase {
$Controller = new ComponentTestController(); $Controller = new ComponentTestController();
$Controller->components = array('RequestHandler'); $Controller->components = array('RequestHandler');
$Component = new Component($Controller); $Component = new Component();
$Component->init($Controller); $Component->init($Controller);
$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent')); $this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
@ -56,6 +56,7 @@ class ComponentTest extends CakeTestCase {
$Controller->plugin = 'test_plugin'; $Controller->plugin = 'test_plugin';
$Controller->components = array('RequestHandler', 'TestPluginComponent'); $Controller->components = array('RequestHandler', 'TestPluginComponent');
$Component = new Component();
$Component->init($Controller); $Component->init($Controller);
$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent')); $this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));
@ -66,14 +67,18 @@ class ComponentTest extends CakeTestCase {
$Controller = new ComponentTestController(); $Controller = new ComponentTestController();
$Controller->components = array('Security'); $Controller->components = array('Security');
$result = $Component->init($Controller); $Component = new Component();
$this->assertTrue(is_object($Controller->Security)); $Component->init($Controller);
$this->assertTrue(is_object($Controller->Security->Session));
$this->assertTrue(is_a($Controller->Security, 'SecurityComponent'));
$this->assertTrue(is_a($Controller->Security->Session, 'SessionComponent'));
$Controller = new ComponentTestController(); $Controller = new ComponentTestController();
$Controller->components = array('Security', 'Cookie', 'RequestHandler'); $Controller->components = array('Security', 'Cookie', 'RequestHandler');
$result = $Component->init($Controller); $Component = new Component();
$Component->init($Controller);
$this->assertTrue(is_a($Controller->Security, 'SecurityComponent')); $this->assertTrue(is_a($Controller->Security, 'SecurityComponent'));
$this->assertTrue(is_a($Controller->Security->RequestHandler, 'RequestHandlerComponent')); $this->assertTrue(is_a($Controller->Security->RequestHandler, 'RequestHandlerComponent'));
$this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent')); $this->assertTrue(is_a($Controller->RequestHandler, 'RequestHandlerComponent'));