diff --git a/cake/tests/cases/libs/controller/components/acl.test.php b/cake/tests/cases/libs/controller/components/acl.test.php index de9de9463..91dc313d3 100644 --- a/cake/tests/cases/libs/controller/components/acl.test.php +++ b/cake/tests/cases/libs/controller/components/acl.test.php @@ -29,48 +29,42 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { define('CAKEPHP_UNIT_TEST_EXECUTION', 1); } -App::import('Core', array('Component', 'Controller')); -App::import('Component', array('Acl')); -uses('model'.DS.'db_acl'); +App::import(array('controller'.DS.'components'.DS.'acl', 'model'.DS.'db_acl')); -class AclNodeTestBase extends AclNode { +class AclNodeTwoTestBase extends AclNode { var $useDbConfig = 'test_suite'; var $cacheSources = false; } -class AroTest extends AclNodeTestBase { - var $name = 'AroTest'; - var $useTable = 'aros'; - var $hasAndBelongsToMany = array('AcoTest' => array('with' => 'PermissionTest')); +class AroTwoTest extends AclNodeTwoTestBase { + var $name = 'AroTwoTest'; + var $useTable = 'aro_twos'; + var $hasAndBelongsToMany = array('AcoTwoTest' => array('with' => 'PermissionTwoTest')); } -class AcoTest extends AclNodeTestBase { - var $name = 'AcoTest'; - var $useTable = 'acos'; - var $hasAndBelongsToMany = array('AroTest' => array('with' => 'PermissionTest')); +class AcoTwoTest extends AclNodeTwoTestBase { + var $name = 'AcoTwoTest'; + var $useTable = 'aco_twos'; + var $hasAndBelongsToMany = array('AroTwoTest' => array('with' => 'PermissionTwoTest')); } -class PermissionTest extends CakeTestModel { - var $name = 'PermissionTest'; - var $useTable = 'aros_acos'; +class PermissionTwoTest extends CakeTestModel { + var $name = 'PermissionTwoTest'; + var $useTable = 'aros_aco_twos'; var $cacheQueries = false; - var $belongsTo = array('AroTest' => array('foreignKey' => 'aro_id'), 'AcoTest' => array('foreignKey' => 'aco_id')); + var $belongsTo = array('AroTwoTest' => array('foreignKey' => 'aro_id'), 'AcoTwoTest' => array('foreignKey' => 'aco_id')); var $actsAs = null; } -class AcoActionTest extends CakeTestModel { - var $name = 'AcoActionTest'; - var $useTable = 'aco_actions'; - var $belongsTo = array('AcoTest' => array('foreignKey' => 'aco_id')); -} -class DB_ACL_TEST extends DB_ACL { + +class DB_ACL_TWO_TEST extends DB_ACL { function __construct() { - $this->Aro =& new AroTest(); - $this->Aro->Permission =& new PermissionTest(); - $this->Aco =& new AcoTest(); - $this->Aro->Permission =& new PermissionTest(); + $this->Aro =& new AroTwoTest(); + $this->Aro->Permission =& new PermissionTwoTest(); + $this->Aco =& new AcoTwoTest(); + $this->Aro->Permission =& new PermissionTwoTest(); } } class INI_ACL_TEST extends INI_ACL { - + } /** @@ -81,16 +75,16 @@ class INI_ACL_TEST extends INI_ACL { */ class AclComponentTest extends CakeTestCase { - var $fixtures = array('core.aro', 'core.aco', 'core.aros_aco'); + var $fixtures = array('core.aro_two', 'core.aco_two', 'core.aros_aco_two'); function startTest() { $this->Acl =& new AclComponent(); } function before($method) { - Configure::write('Acl.classname', 'DB_ACL_TEST'); + Configure::write('Acl.classname', 'DB_ACL_TWO_TEST'); Configure::write('Acl.database', 'test_suite'); - parent::before($method); + parent::before($method); } function testAclCreate() { @@ -101,12 +95,12 @@ class AclComponentTest extends CakeTestCase { $this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Joanna')); $this->assertTrue($this->Acl->Aro->save()); - + $this->Acl->Aro->create(array('parent_id' => $parent, 'alias' => 'Stapler')); $this->assertTrue($this->Acl->Aro->save()); $root = $this->Acl->Aco->node('ROOT'); - $parent = $root[0]['AcoTest']['id']; + $parent = $root[0]['AcoTwoTest']['id']; $this->Acl->Aco->create(array('parent_id' => $parent, 'alias' => 'Drinks')); $this->assertTrue($this->Acl->Aco->save()); @@ -122,15 +116,15 @@ class AclComponentTest extends CakeTestCase { $this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'update')); $this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'read')); $this->assertTrue($this->Acl->check('Micheal', 'tpsReports', 'delete')); - + $this->assertFalse($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view')); $this->assertTrue($this->Acl->allow('root/users/Samir', 'ROOT/tpsReports/view', '*')); $this->assertTrue($this->Acl->check('Samir', 'view', 'read')); $this->assertTrue($this->Acl->check('root/users/Samir', 'ROOT/tpsReports/view', 'update')); - + $this->expectError('DB_ACL::allow() - Invalid node'); $this->assertFalse($this->Acl->allow('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create')); - + $this->expectError('DB_ACL::allow() - Invalid node'); $this->assertFalse($this->Acl->allow('Homer', 'tpsReports', 'create')); } @@ -140,26 +134,26 @@ class AclComponentTest extends CakeTestCase { $this->assertTrue($this->Acl->check('Lumbergh', 'current', 'read')); $this->assertFalse($this->Acl->check('Milton', 'smash', 'read')); $this->assertFalse($this->Acl->check('Milton', 'current', 'update')); - + $this->expectError("DB_ACL::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: WRONG\nAco: tpsReports"); $this->assertFalse($this->Acl->check('WRONG', 'tpsReports', 'read')); - + $this->expectError("ACO permissions key foobar does not exist in DB_ACL::check()"); $this->assertFalse($this->Acl->check('Lumbergh', 'smash', 'foobar')); - + //The next assertion should generate an error but only returns false. //$this->expectError("DB_ACL::check() - Failed ARO/ACO node lookup in permissions check. Node references:\nAro: users\nAco: NonExistant"); $this->assertFalse($this->Acl->check('users', 'NonExistant', 'read')); - + $this->assertFalse($this->Acl->check(null, 'printers', 'create')); $this->assertFalse($this->Acl->check('managers', null, 'read')); - + $this->assertTrue($this->Acl->check('Bobs', 'ROOT/tpsReports/view/current', 'read')); $this->assertFalse($this->Acl->check('Samir', 'ROOT/tpsReports/update', 'read')); - + $this->assertFalse($this->Acl->check('root/users/Milton', 'smash', 'delete')); } - + function testDbAclDeny() { $this->assertTrue($this->Acl->check('Micheal', 'smash', 'delete')); $this->Acl->deny('Micheal', 'smash', 'delete'); @@ -168,47 +162,47 @@ class AclComponentTest extends CakeTestCase { $this->assertTrue($this->Acl->check('Micheal', 'smash', 'create')); $this->assertTrue($this->Acl->check('Micheal', 'smash', 'update')); $this->assertFalse($this->Acl->check('Micheal', 'smash', '*')); - + $this->assertTrue($this->Acl->check('Samir', 'refill', '*')); $this->Acl->deny('Samir', 'refill', '*'); $this->assertFalse($this->Acl->check('Samir', 'refill', 'create')); $this->assertFalse($this->Acl->check('Samir', 'refill', 'update')); $this->assertFalse($this->Acl->check('Samir', 'refill', 'read')); $this->assertFalse($this->Acl->check('Samir', 'refill', 'delete')); - - $result = $this->Acl->Aro->Permission->find('all', array('conditions' => array('AroTest.alias' => 'Samir'))); + + $result = $this->Acl->Aro->Permission->find('all', array('conditions' => array('AroTwoTest.alias' => 'Samir'))); $expected = '-1'; - $this->assertEqual($result[0]['PermissionTest']['_delete'], $expected); - + $this->assertEqual($result[0]['PermissionTwoTest']['_delete'], $expected); + $this->expectError('DB_ACL::allow() - Invalid node'); - $this->assertFalse($this->Acl->deny('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create')); + $this->assertFalse($this->Acl->deny('Lumbergh', 'ROOT/tpsReports/DoesNotExist', 'create')); } function testAclNodeLookup() { $result = $this->Acl->Aro->node('root/users/Samir'); $expected = array( - array('AroTest' => array('id' => '7', 'parent_id' => '4', 'model' => 'User', 'foreign_key' => 3, 'alias' => 'Samir')), - array('AroTest' => array('id' => '4', 'parent_id' => '1', 'model' => 'Group', 'foreign_key' => 3, 'alias' => 'users')), - array('AroTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root')) + array('AroTwoTest' => array('id' => '7', 'parent_id' => '4', 'model' => 'User', 'foreign_key' => 3, 'alias' => 'Samir')), + array('AroTwoTest' => array('id' => '4', 'parent_id' => '1', 'model' => 'Group', 'foreign_key' => 3, 'alias' => 'users')), + array('AroTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root')) ); $this->assertEqual($result, $expected); - + $result = $this->Acl->Aco->node('ROOT/tpsReports/view/current'); $expected = array( - array('AcoTest' => array('id' => '4', 'parent_id' => '3', 'model' => null, 'foreign_key' => null, 'alias' => 'current')), - array('AcoTest' => array('id' => '3', 'parent_id' => '2', 'model' => null, 'foreign_key' => null, 'alias' => 'view')), - array('AcoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports')), - array('AcoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT')), + array('AcoTwoTest' => array('id' => '4', 'parent_id' => '3', 'model' => null, 'foreign_key' => null, 'alias' => 'current')), + array('AcoTwoTest' => array('id' => '3', 'parent_id' => '2', 'model' => null, 'foreign_key' => null, 'alias' => 'view')), + array('AcoTwoTest' => array('id' => '2', 'parent_id' => '1', 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports')), + array('AcoTwoTest' => array('id' => '1', 'parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT')), ); $this->assertEqual($result, $expected); } - + function testDbInherit() { //parent doesn't have access inherit should still deny $this->assertFalse($this->Acl->check('Milton', 'smash', 'delete')); $this->Acl->inherit('Milton', 'smash', 'delete'); $this->assertFalse($this->Acl->check('Milton', 'smash', 'delete')); - + //inherit parent $this->assertFalse($this->Acl->check('Milton', 'smash', 'read')); $this->Acl->inherit('Milton', 'smash', 'read'); @@ -220,29 +214,29 @@ class AclComponentTest extends CakeTestCase { $this->assertFalse($this->Acl->check('Samir', 'tpsReports', 'create')); $this->Acl->grant('Samir', 'tpsReports', 'create'); $this->assertTrue($this->Acl->check('Samir', 'tpsReports', 'create')); - + $this->assertFalse($this->Acl->check('Micheal', 'view', 'read')); $this->Acl->grant('Micheal', 'view', array('read', 'create', 'update')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'read')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'create')); $this->assertTrue($this->Acl->check('Micheal', 'view', 'update')); $this->assertFalse($this->Acl->check('Micheal', 'view', 'delete')); - + $this->expectError('DB_ACL::allow() - Invalid node'); $this->assertFalse($this->Acl->grant('Peter', 'ROOT/tpsReports/DoesNotExist', 'create')); } - + function testDbRevoke() { $this->assertTrue($this->Acl->check('Bobs', 'tpsReports', 'read')); $this->Acl->revoke('Bobs', 'tpsReports', 'read'); $this->assertFalse($this->Acl->check('Bobs', 'tpsReports', 'read')); - + $this->assertTrue($this->Acl->check('users', 'printers', 'read')); $this->Acl->revoke('users', 'printers', 'read'); $this->assertFalse($this->Acl->check('users', 'printers', 'read')); $this->assertFalse($this->Acl->check('Samir', 'printers', 'read')); $this->assertFalse($this->Acl->check('Peter', 'printers', 'read')); - + $this->expectError('DB_ACL::allow() - Invalid node'); $this->assertFalse($this->Acl->deny('Bobs', 'ROOT/printers/DoesNotExist', 'create')); } @@ -253,30 +247,30 @@ class AclComponentTest extends CakeTestCase { } /* The following tests and AclComponent methods are not fully implemented yet - + function testDbSetAro() { //This method is not implemented in either INI_ACL or DB_ACL //$result = $this->Acl->setAro('Samir'); //$this->assertEqual($result, $expected); } - + function testDbSetAco() { //This method is not implemented in either INI_ACL or DB_ACL //$result = $this->Acl->getAco('printers'); //$this->assertEqual($result, $expected); } - + function testDbGetAro() { //This method is not implemented in either INI_ACL or DB_ACL //$result = $this->Acl->getAro('Samir'); //$this->assertEqual($result, $expected); } - + function testDbGetAco() { //This method is not implemented in either INI_ACL or DB_ACL //$result = $this->Acl->getAco('tpsReports'); //$this->assertEqual($result, $expected); - + } */ function testIniReadConfigFile() { @@ -293,7 +287,7 @@ class AclComponentTest extends CakeTestCase { ), 'paul' => array( 'groups' => 'users', - 'allow' =>'', + 'allow' =>'', 'deny' => '', ), 'jenny' => array( @@ -321,30 +315,30 @@ class AclComponentTest extends CakeTestCase { ); $this->assertEqual($result, $expected); } - + function testIniCheck() { Configure::write('Acl.classname', 'INI_ACL_TEST'); unset($this->Acl); $iniFile = TEST_CAKE_CORE_INCLUDE_PATH . 'tests' . DS . 'test_app' . DS . 'configs'. DS . 'acl.ini.php'; - + $this->Acl = new AclComponent(); $this->Acl->_Instance->config= $this->Acl->_Instance->readConfigFile($iniFile); - + $this->assertFalse($this->Acl->check('admin', 'ads')); $this->assertTrue($this->Acl->check('admin', 'posts')); - + $this->assertTrue($this->Acl->check('jenny', 'posts')); $this->assertTrue($this->Acl->check('jenny', 'ads')); - + $this->assertTrue($this->Acl->check('paul', 'posts')); $this->assertFalse($this->Acl->check('paul', 'ads')); - + $this->assertFalse($this->Acl->check('nobody', 'comments')); } - + function tearDown() { unset($this->Acl); - } + } } ?> \ No newline at end of file diff --git a/cake/tests/cases/libs/model/db_acl.test.php b/cake/tests/cases/libs/model/db_acl.test.php index b6b3d19c5..22bcfabba 100644 --- a/cake/tests/cases/libs/model/db_acl.test.php +++ b/cake/tests/cases/libs/model/db_acl.test.php @@ -30,7 +30,7 @@ if (!defined('CAKEPHP_UNIT_TEST_EXECUTION')) { define('CAKEPHP_UNIT_TEST_EXECUTION', 1); } -uses('controller'.DS.'components'.DS.'acl', 'model'.DS.'db_acl'); +App::import(array('controller'.DS.'components'.DS.'acl', 'model'.DS.'db_acl')); /** * Short description for class. diff --git a/cake/tests/fixtures/aco_fixture.php b/cake/tests/fixtures/aco_fixture.php index fd0ed4212..20838ee26 100644 --- a/cake/tests/fixtures/aco_fixture.php +++ b/cake/tests/fixtures/aco_fixture.php @@ -45,17 +45,15 @@ class AcoFixture extends CakeTestFixture { ); var $records = array( - array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 20), - array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports', 'lft' => 2, 'rght' => 9), - array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 3, 'rght' => 6), - array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'current', 'lft' => 4, 'rght' => 5), - array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'update', 'lft' => 7, 'rght' => 8), - array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'printers', 'lft' => 10, 'rght' => 19), - array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'print', 'lft' => 11, 'rght' => 14), - array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize', 'lft' => 12, 'rght' => 13), - array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'refill', 'lft' => 15, 'rght' => 16), - array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18), + array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 18), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller1', 'lft' => 2, 'rght' => 9), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 3, 'rght' => 6), + array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 4, 'rght' => 5), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 7, 'rght' => 8), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'Controller2', 'lft' => 10, 'rght' => 17), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action1', 'lft' => 11, 'rght' => 14), + array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'record1', 'lft' => 12, 'rght' => 13), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'action2', 'lft' => 15, 'rght' => 16), ); } - ?> \ No newline at end of file diff --git a/cake/tests/fixtures/aco_two_fixture.php b/cake/tests/fixtures/aco_two_fixture.php new file mode 100644 index 000000000..74846032a --- /dev/null +++ b/cake/tests/fixtures/aco_two_fixture.php @@ -0,0 +1,61 @@ + + * Copyright 2005-2008, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.fixtures + * @since CakePHP(tm) v 1.2.0.4667 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.fixtures + */ +class AcoTwoFixture extends CakeTestFixture { + var $name = 'AcoTwo'; + var $fields = array( + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'parent_id' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'model' => array('type' => 'string', 'default' => ''), + 'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'alias' => array('type' => 'string', 'default' => ''), + 'lft' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'rght' => array('type' => 'integer', 'length' => 10, 'null' => true) + ); + + var $records = array( + array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'ROOT', 'lft' => 1, 'rght' => 20), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'tpsReports', 'lft' => 2, 'rght' => 9), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'view', 'lft' => 3, 'rght' => 6), + array('parent_id' => 3, 'model' => null, 'foreign_key' => null, 'alias' => 'current', 'lft' => 4, 'rght' => 5), + array('parent_id' => 2, 'model' => null, 'foreign_key' => null, 'alias' => 'update', 'lft' => 7, 'rght' => 8), + array('parent_id' => 1, 'model' => null, 'foreign_key' => null, 'alias' => 'printers', 'lft' => 10, 'rght' => 19), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'print', 'lft' => 11, 'rght' => 14), + array('parent_id' => 7, 'model' => null, 'foreign_key' => null, 'alias' => 'lettersize', 'lft' => 12, 'rght' => 13), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'refill', 'lft' => 15, 'rght' => 16), + array('parent_id' => 6, 'model' => null, 'foreign_key' => null, 'alias' => 'smash', 'lft' => 17, 'rght' => 18), + ); +} + +?> \ No newline at end of file diff --git a/cake/tests/fixtures/aro_fixture.php b/cake/tests/fixtures/aro_fixture.php index 30f69ae0e..a0aa8ddc2 100644 --- a/cake/tests/fixtures/aro_fixture.php +++ b/cake/tests/fixtures/aro_fixture.php @@ -46,16 +46,6 @@ class AroFixture extends CakeTestFixture { ); var $records = array( - array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root', 'lft' => '1', 'rght' => '20'), - array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '1', 'alias' => 'admin', 'lft' => '2', 'rght' => '5'), - array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '2', 'alias' => 'managers', 'lft' => '6', 'rght' => '9'), - array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '3', 'alias' => 'users', 'lft' => '10', 'rght' => '19'), - array('parent_id' => 2, 'model' => 'User', 'foreign_key' => '1', 'alias' => 'Bobs', 'lft' => '3', 'rght' => '4' ), - array('parent_id' => 3, 'model' => 'User', 'foreign_key' => '2', 'alias' => 'Lumbergh', 'lft' => '7' , 'rght' => '8'), - array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '3', 'alias' => 'Samir', 'lft' => '11' , 'rght' => '12' ), - array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '4', 'alias' => 'Micheal', 'lft' => '13', 'rght' => '14'), - array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '5', 'alias' => 'Peter', 'lft' => '15', 'rght' => '16'), - array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '6', 'alias' => 'Milton', 'lft' => '17', 'rght' => '18'), ); } diff --git a/cake/tests/fixtures/aro_two_fixture.php b/cake/tests/fixtures/aro_two_fixture.php new file mode 100644 index 000000000..8b9a3ce00 --- /dev/null +++ b/cake/tests/fixtures/aro_two_fixture.php @@ -0,0 +1,62 @@ + + * Copyright 2005-2008, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.fixtures + * @since CakePHP(tm) v 1.2.0.4667 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.fixtures + */ +class AroTwoFixture extends CakeTestFixture { + var $name = 'AroTwo'; + + var $fields = array( + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'parent_id' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'model' => array('type' => 'string', 'default' => ''), + 'foreign_key' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'alias' => array('type' => 'string', 'default' => ''), + 'lft' => array('type' => 'integer', 'length' => 10, 'null' => true), + 'rght' => array('type' => 'integer', 'length' => 10, 'null' => true) + ); + + var $records = array( + array('parent_id' => null, 'model' => null, 'foreign_key' => null, 'alias' => 'root', 'lft' => '1', 'rght' => '20'), + array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '1', 'alias' => 'admin', 'lft' => '2', 'rght' => '5'), + array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '2', 'alias' => 'managers', 'lft' => '6', 'rght' => '9'), + array('parent_id' => 1, 'model' => 'Group', 'foreign_key' => '3', 'alias' => 'users', 'lft' => '10', 'rght' => '19'), + array('parent_id' => 2, 'model' => 'User', 'foreign_key' => '1', 'alias' => 'Bobs', 'lft' => '3', 'rght' => '4' ), + array('parent_id' => 3, 'model' => 'User', 'foreign_key' => '2', 'alias' => 'Lumbergh', 'lft' => '7' , 'rght' => '8'), + array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '3', 'alias' => 'Samir', 'lft' => '11' , 'rght' => '12' ), + array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '4', 'alias' => 'Micheal', 'lft' => '13', 'rght' => '14'), + array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '5', 'alias' => 'Peter', 'lft' => '15', 'rght' => '16'), + array('parent_id' => 4, 'model' => 'User', 'foreign_key' => '6', 'alias' => 'Milton', 'lft' => '17', 'rght' => '18'), + ); +} + +?> \ No newline at end of file diff --git a/cake/tests/fixtures/aros_aco_fixture.php b/cake/tests/fixtures/aros_aco_fixture.php index dacbd97d3..d9430dd99 100644 --- a/cake/tests/fixtures/aros_aco_fixture.php +++ b/cake/tests/fixtures/aros_aco_fixture.php @@ -43,28 +43,7 @@ class ArosAcoFixture extends CakeTestFixture { '_update' => array('type' => 'string', 'length' => 2, 'default' => 0), '_delete' => array('type' => 'string', 'length' => 2, 'default' => 0) ); - var $records = array( - array('aro_id' => '1', 'aco_id' => '1', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), - array('aro_id' => '2', 'aco_id' => '1', '_create' => '0', '_read' => '1', '_update' => '1', '_delete' => '1'), - array('aro_id' => '3', 'aco_id' => '2', '_create' => '0', '_read' => '1', '_update' => '0', '_delete' => '0'), - array('aro_id' => '4', 'aco_id' => '2', '_create' => '1', '_read' => '1', '_update' => '0', '_delete' => '-1'), - array('aro_id' => '4', 'aco_id' => '6', '_create' => '1', '_read' => '1', '_update' => '0', '_delete' => '0'), - array('aro_id' => '5', 'aco_id' => '1', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), - array('aro_id' => '6', 'aco_id' => '3', '_create' => '-1', '_read' => '1', '_update' => '-1', '_delete' => '-1'), - array('aro_id' => '6', 'aco_id' => '4', '_create' => '-1', '_read' => '1', '_update' => '-1', '_delete' => '1'), - array('aro_id' => '6', 'aco_id' => '6', '_create' => '-1', '_read' => '1', '_update' => '1', '_delete' => '-1'), - array('aro_id' => '7', 'aco_id' => '2', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), - array('aro_id' => '7', 'aco_id' => '7', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '0'), - array('aro_id' => '7', 'aco_id' => '8', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '0'), - array('aro_id' => '7', 'aco_id' => '9', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), - array('aro_id' => '7', 'aco_id' => '10', '_create' => '0', '_read' => '0', '_update' => '0', '_delete' => '1'), - array('aro_id' => '8', 'aco_id' => '10', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), - array('aro_id' => '8', 'aco_id' => '2', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), - array('aro_id' => '9', 'aco_id' => '4', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '-1'), - array('aro_id' => '9', 'aco_id' => '9', '_create' => '0', '_read' => '0', '_update' => '1', '_delete' => '1'), - array('aro_id' => '10', 'aco_id' => '9', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), - array('aro_id' => '10', 'aco_id' => '10', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), - ); + var $records = array(); } ?> \ No newline at end of file diff --git a/cake/tests/fixtures/aros_aco_two_fixture.php b/cake/tests/fixtures/aros_aco_two_fixture.php new file mode 100644 index 000000000..c61156e70 --- /dev/null +++ b/cake/tests/fixtures/aros_aco_two_fixture.php @@ -0,0 +1,70 @@ + + * Copyright 2005-2008, Cake Software Foundation, Inc. + * 1785 E. Sahara Avenue, Suite 490-204 + * Las Vegas, Nevada 89104 + * + * Licensed under The Open Group Test Suite License + * Redistributions of files must retain the above copyright notice. + * + * @filesource + * @copyright Copyright 2005-2008, Cake Software Foundation, Inc. + * @link https://trac.cakephp.org/wiki/Developement/TestSuite CakePHP(tm) Tests + * @package cake.tests + * @subpackage cake.tests.fixtures + * @since CakePHP(tm) v 1.2.0.4667 + * @version $Revision$ + * @modifiedby $LastChangedBy$ + * @lastmodified $Date$ + * @license http://www.opensource.org/licenses/opengroup.php The Open Group Test Suite License + */ +/** + * Short description for class. + * + * @package cake.tests + * @subpackage cake.tests.fixtures + */ +class ArosAcoTwoFixture extends CakeTestFixture { + var $name = 'ArosAcoTwo'; + var $fields = array( + 'id' => array('type' => 'integer', 'key' => 'primary'), + 'aro_id' => array('type' => 'integer', 'length' => 10, 'null' => false), + 'aco_id' => array('type' => 'integer', 'length' => 10, 'null' => false), + '_create' => array('type' => 'string', 'length' => 2, 'default' => 0), + '_read' => array('type' => 'string', 'length' => 2, 'default' => 0), + '_update' => array('type' => 'string', 'length' => 2, 'default' => 0), + '_delete' => array('type' => 'string', 'length' => 2, 'default' => 0) + ); + var $records = array( + array('aro_id' => '1', 'aco_id' => '1', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), + array('aro_id' => '2', 'aco_id' => '1', '_create' => '0', '_read' => '1', '_update' => '1', '_delete' => '1'), + array('aro_id' => '3', 'aco_id' => '2', '_create' => '0', '_read' => '1', '_update' => '0', '_delete' => '0'), + array('aro_id' => '4', 'aco_id' => '2', '_create' => '1', '_read' => '1', '_update' => '0', '_delete' => '-1'), + array('aro_id' => '4', 'aco_id' => '6', '_create' => '1', '_read' => '1', '_update' => '0', '_delete' => '0'), + array('aro_id' => '5', 'aco_id' => '1', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), + array('aro_id' => '6', 'aco_id' => '3', '_create' => '-1', '_read' => '1', '_update' => '-1', '_delete' => '-1'), + array('aro_id' => '6', 'aco_id' => '4', '_create' => '-1', '_read' => '1', '_update' => '-1', '_delete' => '1'), + array('aro_id' => '6', 'aco_id' => '6', '_create' => '-1', '_read' => '1', '_update' => '1', '_delete' => '-1'), + array('aro_id' => '7', 'aco_id' => '2', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), + array('aro_id' => '7', 'aco_id' => '7', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '0'), + array('aro_id' => '7', 'aco_id' => '8', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '0'), + array('aro_id' => '7', 'aco_id' => '9', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), + array('aro_id' => '7', 'aco_id' => '10', '_create' => '0', '_read' => '0', '_update' => '0', '_delete' => '1'), + array('aro_id' => '8', 'aco_id' => '10', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), + array('aro_id' => '8', 'aco_id' => '2', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), + array('aro_id' => '9', 'aco_id' => '4', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '-1'), + array('aro_id' => '9', 'aco_id' => '9', '_create' => '0', '_read' => '0', '_update' => '1', '_delete' => '1'), + array('aro_id' => '10', 'aco_id' => '9', '_create' => '1', '_read' => '1', '_update' => '1', '_delete' => '1'), + array('aro_id' => '10', 'aco_id' => '10', '_create' => '-1', '_read' => '-1', '_update' => '-1', '_delete' => '-1'), + ); +} + +?> \ No newline at end of file