mirror of
				https://github.com/brmlab/brmsklad.git
				synced 2025-10-31 16:23:59 +01:00 
			
		
		
		
	Upgrade CakePHP from 2.2.5 to 2.9.5
This commit is contained in:
		
							parent
							
								
									5a580df460
								
							
						
					
					
						commit
						235a541597
					
				
					 793 changed files with 60746 additions and 23753 deletions
				
			
		|  | @ -4,23 +4,23 @@ | |||
|  * | ||||
|  * This is the basic Tree behavior test | ||||
|  * | ||||
|  * PHP 5 | ||||
|  * | ||||
|  * CakePHP(tm) Tests <http://book.cakephp.org/2.0/en/development/testing.html> | ||||
|  * Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org) | ||||
|  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) | ||||
|  * | ||||
|  * Licensed under The MIT License | ||||
|  * For full copyright and license information, please see the LICENSE.txt | ||||
|  * Redistributions of files must retain the above copyright notice | ||||
|  * | ||||
|  * @copyright     Copyright 2005-2012, Cake Software Foundation, Inc. (http://cakefoundation.org) | ||||
|  * @copyright     Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org) | ||||
|  * @link          http://book.cakephp.org/2.0/en/development/testing.html CakePHP(tm) Tests | ||||
|  * @package       Cake.Test.Case.Model.Behavior | ||||
|  * @since         CakePHP(tm) v 1.2.0.5330 | ||||
|  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php) | ||||
|  * @license       http://www.opensource.org/licenses/mit-license.php MIT License | ||||
|  */ | ||||
| 
 | ||||
| App::uses('Model', 'Model'); | ||||
| App::uses('AppModel', 'Model'); | ||||
| 
 | ||||
| require_once dirname(dirname(__FILE__)) . DS . 'models.php'; | ||||
| 
 | ||||
| /** | ||||
|  | @ -33,7 +33,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| /** | ||||
|  * Whether backup global state for each test method or not | ||||
|  * | ||||
|  * @var bool false | ||||
|  * @var bool | ||||
|  */ | ||||
| 	public $backupGlobals = false; | ||||
| 
 | ||||
|  | @ -46,7 +46,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		'modelClass' => 'NumberTree', | ||||
| 		'leftField' => 'lft', | ||||
| 		'rightField' => 'rght', | ||||
| 		'parentField' => 'parent_id' | ||||
| 		'parentField' => 'parent_id', | ||||
| 		'level' => 'level' | ||||
| 	); | ||||
| 
 | ||||
| /** | ||||
|  | @ -70,7 +71,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals(7, $result); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -88,15 +89,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$save[$modelClass]['id'] = $result[$modelClass]['id']; | ||||
| 		$save[$modelClass][$leftField] = 0; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save($save); | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -114,15 +116,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$save[$modelClass]['id'] = $result[$modelClass]['id']; | ||||
| 		$save[$modelClass][$rightField] = 0; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save($save); | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -141,13 +144,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->updateAll(array($parentField => null), array('id' => $result[$modelClass]['id'])); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -164,13 +167,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id'])); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover('MPTT'); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -183,24 +186,28 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->Behaviors->disable('Tree'); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Main', $parentField => null, $leftField => 0, $rightField => 0)); | ||||
| 		$node1 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'About Us', $parentField => $node1, $leftField => 0, $rightField => 0)); | ||||
| 		$node11 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Programs', $parentField => $node1, $leftField => 0, $rightField => 0)); | ||||
| 		$node12 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Mission and History', $parentField => $node11, $leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Overview', $parentField => $node12, $leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
| 		$this->Tree->Behaviors->enable('Tree'); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertTrue($result); | ||||
|  | @ -234,19 +241,24 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->Behaviors->disable('Tree'); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Main', $parentField => null, $leftField => 0, $rightField => 0)); | ||||
| 		$node1 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'About Us', $parentField => $node1, $leftField => 0, $rightField => 0)); | ||||
| 		$node11 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Programs', $parentField => $node1, $leftField => 0, $rightField => 0)); | ||||
| 		$node12 = $this->Tree->id; | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Mission and History', $parentField => $node11, $leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Overview', $parentField => $node12, $leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'Lost', $parentField => 9, $leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
|  | @ -262,7 +274,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		)))); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$count = $this->Tree->find('count'); | ||||
| 		$this->assertEquals(6, $count); | ||||
|  | @ -306,13 +318,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->updateAll(array($parentField => 999999), array('id' => $result[$modelClass]['id'])); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -328,13 +340,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->updateAll(array($parentField => null)); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -350,12 +362,12 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->updateAll(array($leftField => 0, $rightField => 0)); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$this->Tree->recover(); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -376,7 +388,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 			array($rightField . ' >' => $result[$modelClass][$leftField])); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertNotSame($result, true); | ||||
| 		$this->assertNotSame(true, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->recover(); | ||||
| 		$this->assertTrue($result); | ||||
|  | @ -395,13 +407,14 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->initialize(2, 2); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null))); | ||||
| 		$result = $this->Tree->find('first', array('fields' => array('name', $parentField), 'order' => $modelClass . '.' . $leftField . ' desc')); | ||||
| 		$expected = array($modelClass => array('name' => 'testAddOrphan', $parentField => null)); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -426,13 +439,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount + 1, $laterCount); | ||||
| 
 | ||||
| 		$children = $this->Tree->children($data[$modelClass]['id'], true, array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 			array($modelClass => array('name' => '1.1.2')), | ||||
| 			array($modelClass => array('name' => 'testAddMiddle'))); | ||||
| 		$this->assertSame($children, $expects); | ||||
| 		$this->assertSame($expected, $children); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -479,14 +492,15 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$initialCount = $this->Tree->find('count'); | ||||
| 		//$this->expectError('Trying to save a node under a none-existant node in TreeBehavior::beforeSave');
 | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$saveSuccess = $this->Tree->save(array($modelClass => array('name' => 'testAddInvalid', $parentField => 99999))); | ||||
| 		$this->assertSame($saveSuccess, false); | ||||
| 		$this->assertFalse($saveSuccess); | ||||
| 
 | ||||
| 		$laterCount = $this->Tree->find('count'); | ||||
| 		$this->assertSame($initialCount, $laterCount); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -499,13 +513,14 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->initialize(2, 2); | ||||
| 
 | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array('name' => 'testAddNotIndexed', $parentField => null)); | ||||
| 		$result = $this->Tree->find('first', array('fields' => array('name', $parentField), 'order' => $modelClass . '.' . $leftField . ' desc')); | ||||
| 		$expected = array($modelClass => array('name' => 'testAddNotIndexed', $parentField => null)); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -526,12 +541,32 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 		$this->Tree->saveField($parentField, $parentId); | ||||
| 		$direct = $this->Tree->children($parentId, true, array('id', 'name', $parentField, $leftField, $rightField)); | ||||
| 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)), | ||||
| 		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 5)), | ||||
| 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 6, $rightField => 11)), | ||||
| 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 1, $leftField => 12, $rightField => 13))); | ||||
| 		$this->assertEquals($direct, $expects); | ||||
| 		$this->assertEquals($expected, $direct); | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * testGetLevel method | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testGetLevel() { | ||||
| 		extract($this->settings); | ||||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->initialize(2, 2); | ||||
| 		$this->Tree->id = null; | ||||
| 
 | ||||
| 		$result = $this->Tree->getLevel(5); | ||||
| 		$this->assertEquals(1, $result); | ||||
| 
 | ||||
| 		$result = $this->Tree->getLevel(3); | ||||
| 		$this->assertEquals(2, $result); | ||||
| 
 | ||||
| 		$this->assertFalse($this->Tree->getLevel(999)); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -572,11 +607,12 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->initialize(2, 2); | ||||
| 
 | ||||
| 		$this->Tree->whitelist = array('name', $parentField); | ||||
| 		$this->Tree->create(); | ||||
| 		$this->Tree->save(array($modelClass => array('name' => 'testAddOrphan', $parentField => null))); | ||||
| 		$result = $this->Tree->findByName('testAddOrphan', array('name', $parentField, $leftField, $rightField)); | ||||
| 		$expected = array('name' => 'testAddOrphan', $parentField => null, $leftField => '15', $rightField => 16); | ||||
| 		$this->assertEquals($expected, $result[$modelClass]); | ||||
| 		$this->assertSame($this->Tree->verify(), true); | ||||
| 		$this->assertTrue($this->Tree->verify()); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -598,13 +634,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->saveField($parentField, $parentId); | ||||
| 
 | ||||
| 		$result = $this->Tree->children($parentId, true, array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 			array($modelClass => array('name' => '1.1.2')), | ||||
| 			array($modelClass => array('name' => '1.2'))); | ||||
| 		$this->assertEquals($expects, $result); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -626,13 +662,13 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->saveField($parentField, $parentId); | ||||
| 
 | ||||
| 		$result = $this->Tree->children($parentId, true, array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1.2.1')), | ||||
| 		$expected = array(array($modelClass => array('name' => '1.2.1')), | ||||
| 			array($modelClass => array('name' => '1.2.2')), | ||||
| 			array($modelClass => array('name' => '1.1'))); | ||||
| 		$this->assertEquals($expects, $result); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -651,7 +687,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 
 | ||||
| 		$data = $this->Tree->find('first', array('fields' => array('id'), 'conditions' => array($modelClass . '.name' => '1.1.1'))); | ||||
| 
 | ||||
| 		$expects = $this->Tree->find('all'); | ||||
| 		$expected = $this->Tree->find('all'); | ||||
| 		$before = $this->Tree->read(null, $data[$modelClass]['id']); | ||||
| 
 | ||||
| 		$this->Tree->id = $parentId; | ||||
|  | @ -660,11 +696,11 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$results = $this->Tree->find('all'); | ||||
| 		$after = $this->Tree->read(null, $data[$modelClass]['id']); | ||||
| 
 | ||||
| 		$this->assertEquals($expects, $results); | ||||
| 		$this->assertEquals($expected, $results); | ||||
| 		$this->assertEquals($before, $after); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -688,7 +724,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertSame($initialCount, $laterCount); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -708,12 +744,12 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 		$saveSuccess = $this->Tree->saveField($parentField, $this->Tree->id); | ||||
| 
 | ||||
| 		$this->assertSame($saveSuccess, false); | ||||
| 		$this->assertFalse($saveSuccess); | ||||
| 		$laterCount = $this->Tree->find('count'); | ||||
| 		$this->assertSame($initialCount, $laterCount); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -732,8 +768,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$parent = $this->Tree->findByName('1. Root', array('id')); | ||||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.1', ))); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.1'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -754,8 +790,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$parent = $this->Tree->findByName('1. Root', array('id')); | ||||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', ))); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -776,16 +812,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.5', )), | ||||
| 			array($modelClass => array('name' => '1.3', )), | ||||
| 			array($modelClass => array('name' => '1.4', )), | ||||
| 			array($modelClass => array('name' => '1.6', )), | ||||
| 			array($modelClass => array('name' => '1.7', )), | ||||
| 			array($modelClass => array('name' => '1.8', )), | ||||
| 			array($modelClass => array('name' => '1.9', )), | ||||
| 			array($modelClass => array('name' => '1.10', ))); | ||||
| 			array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.5')), | ||||
| 			array($modelClass => array('name' => '1.3')), | ||||
| 			array($modelClass => array('name' => '1.4')), | ||||
| 			array($modelClass => array('name' => '1.6')), | ||||
| 			array($modelClass => array('name' => '1.7')), | ||||
| 			array($modelClass => array('name' => '1.8')), | ||||
| 			array($modelClass => array('name' => '1.9')), | ||||
| 			array($modelClass => array('name' => '1.10'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -806,16 +842,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.5', )), | ||||
| 			array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.3', )), | ||||
| 			array($modelClass => array('name' => '1.4', )), | ||||
| 			array($modelClass => array('name' => '1.6', )), | ||||
| 			array($modelClass => array('name' => '1.7', )), | ||||
| 			array($modelClass => array('name' => '1.8', )), | ||||
| 			array($modelClass => array('name' => '1.9', )), | ||||
| 			array($modelClass => array('name' => '1.10', ))); | ||||
| 			array($modelClass => array('name' => '1.5')), | ||||
| 			array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.3')), | ||||
| 			array($modelClass => array('name' => '1.4')), | ||||
| 			array($modelClass => array('name' => '1.6')), | ||||
| 			array($modelClass => array('name' => '1.7')), | ||||
| 			array($modelClass => array('name' => '1.8')), | ||||
| 			array($modelClass => array('name' => '1.9')), | ||||
| 			array($modelClass => array('name' => '1.10'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -835,8 +871,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$parent = $this->Tree->findByName('1. Root', array('id')); | ||||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.1', ))); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.1'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -856,8 +892,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$parent = $this->Tree->findByName('1. Root', array('id')); | ||||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', ))); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -878,16 +914,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.3', )), | ||||
| 			array($modelClass => array('name' => '1.4', )), | ||||
| 			array($modelClass => array('name' => '1.6', )), | ||||
| 			array($modelClass => array('name' => '1.7', )), | ||||
| 			array($modelClass => array('name' => '1.8', )), | ||||
| 			array($modelClass => array('name' => '1.9', )), | ||||
| 			array($modelClass => array('name' => '1.10', )), | ||||
| 			array($modelClass => array('name' => '1.5', ))); | ||||
| 			array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.3')), | ||||
| 			array($modelClass => array('name' => '1.4')), | ||||
| 			array($modelClass => array('name' => '1.6')), | ||||
| 			array($modelClass => array('name' => '1.7')), | ||||
| 			array($modelClass => array('name' => '1.8')), | ||||
| 			array($modelClass => array('name' => '1.9')), | ||||
| 			array($modelClass => array('name' => '1.10')), | ||||
| 			array($modelClass => array('name' => '1.5'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -908,16 +944,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.3', )), | ||||
| 			array($modelClass => array('name' => '1.4', )), | ||||
| 			array($modelClass => array('name' => '1.6', )), | ||||
| 			array($modelClass => array('name' => '1.7', )), | ||||
| 			array($modelClass => array('name' => '1.5', )), | ||||
| 			array($modelClass => array('name' => '1.8', )), | ||||
| 			array($modelClass => array('name' => '1.9', )), | ||||
| 			array($modelClass => array('name' => '1.10', ))); | ||||
| 			array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.3')), | ||||
| 			array($modelClass => array('name' => '1.4')), | ||||
| 			array($modelClass => array('name' => '1.6')), | ||||
| 			array($modelClass => array('name' => '1.7')), | ||||
| 			array($modelClass => array('name' => '1.5')), | ||||
| 			array($modelClass => array('name' => '1.8')), | ||||
| 			array($modelClass => array('name' => '1.9')), | ||||
| 			array($modelClass => array('name' => '1.10'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -938,16 +974,16 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $parent[$modelClass]['id']; | ||||
| 		$result = $this->Tree->children(null, true, array('name')); | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.1', )), | ||||
| 			array($modelClass => array('name' => '1.2', )), | ||||
| 			array($modelClass => array('name' => '1.3', )), | ||||
| 			array($modelClass => array('name' => '1.4', )), | ||||
| 			array($modelClass => array('name' => 'renamed', )), | ||||
| 			array($modelClass => array('name' => '1.6', )), | ||||
| 			array($modelClass => array('name' => '1.7', )), | ||||
| 			array($modelClass => array('name' => '1.8', )), | ||||
| 			array($modelClass => array('name' => '1.9', )), | ||||
| 			array($modelClass => array('name' => '1.10', ))); | ||||
| 			array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.3')), | ||||
| 			array($modelClass => array('name' => '1.4')), | ||||
| 			array($modelClass => array('name' => 'renamed')), | ||||
| 			array($modelClass => array('name' => '1.6')), | ||||
| 			array($modelClass => array('name' => '1.7')), | ||||
| 			array($modelClass => array('name' => '1.8')), | ||||
| 			array($modelClass => array('name' => '1.9')), | ||||
| 			array($modelClass => array('name' => '1.10'))); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
|  | @ -965,7 +1001,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->save(array($parentField => null)); | ||||
| 
 | ||||
| 		$result = $this->Tree->verify(); | ||||
| 		$this->assertSame($result, true); | ||||
| 		$this->assertTrue($result); | ||||
| 
 | ||||
| 		$this->Tree->moveUp(); | ||||
| 
 | ||||
|  | @ -995,7 +1031,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount - 1, $laterCount); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 
 | ||||
| 		$initialCount = $this->Tree->find('count'); | ||||
| 		$result = $this->Tree->findByName('1.1'); | ||||
|  | @ -1007,7 +1043,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount - 2, $laterCount); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1040,18 +1076,18 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount, $laterCount); | ||||
| 
 | ||||
| 		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1.1')), | ||||
| 			array($modelClass => array('name' => '1.1.2')), | ||||
| 			array($modelClass => array('name' => '1.2'))); | ||||
| 		$this->assertEquals($children, $expects); | ||||
| 		$this->assertEquals($expected, $children); | ||||
| 
 | ||||
| 		$topNodes = $this->Tree->children(false, true,array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1. Root')), | ||||
| 		$topNodes = $this->Tree->children(false, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1. Root')), | ||||
| 			array($modelClass => array('name' => '1.1'))); | ||||
| 		$this->assertEquals($topNodes, $expects); | ||||
| 		$this->assertEquals($expected, $topNodes); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1076,15 +1112,15 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount, $laterCount); | ||||
| 		$this->assertEquals($initialTopNodes, $laterTopNodes); | ||||
| 
 | ||||
| 		$topNodes = $this->Tree->children(false, true,array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1.1')), | ||||
| 		$topNodes = $this->Tree->children(false, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1.1')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1. Root'))); | ||||
| 
 | ||||
| 		$this->assertEquals($topNodes, $expects); | ||||
| 		$this->assertEquals($expected, $topNodes); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1105,7 +1141,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount, $laterCount); | ||||
| 
 | ||||
| 		$nodes = $this->Tree->find('list', array('order' => $leftField)); | ||||
| 		$expects = array( | ||||
| 		$expected = array( | ||||
| 			1 => '1. Root', | ||||
| 			2 => '1.1', | ||||
| 			4 => '1.1.2', | ||||
|  | @ -1115,10 +1151,10 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 			3 => '1.1.1', | ||||
| 		); | ||||
| 
 | ||||
| 		$this->assertEquals($nodes, $expects); | ||||
| 		$this->assertEquals($expected, $nodes); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1140,19 +1176,19 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount - 1, $laterCount); | ||||
| 
 | ||||
| 		$children = $this->Tree->children($result[$modelClass][$parentField], true, array('name'), $leftField . ' asc'); | ||||
| 		$expects = array( | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('name' => '1.1.1')), | ||||
| 			array($modelClass => array('name' => '1.1.2')), | ||||
| 			array($modelClass => array('name' => '1.2')) | ||||
| 		); | ||||
| 		$this->assertEquals($children, $expects); | ||||
| 		$this->assertEquals($expected, $children); | ||||
| 
 | ||||
| 		$topNodes = $this->Tree->children(false, true,array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1. Root'))); | ||||
| 		$this->assertEquals($topNodes, $expects); | ||||
| 		$topNodes = $this->Tree->children(false, true, array('name')); | ||||
| 		$expected = array(array($modelClass => array('name' => '1. Root'))); | ||||
| 		$this->assertEquals($expected, $topNodes); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1173,7 +1209,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals($initialCount - 1, $laterCount); | ||||
| 
 | ||||
| 		$nodes = $this->Tree->find('list', array('order' => $leftField)); | ||||
| 		$expects = array( | ||||
| 		$expected = array( | ||||
| 			1 => '1. Root', | ||||
| 			2 => '1.1', | ||||
| 			4 => '1.1.2', | ||||
|  | @ -1181,10 +1217,10 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 			6 => '1.2.1', | ||||
| 			7 => '1.2.2', | ||||
| 		); | ||||
| 		$this->assertEquals($nodes, $expects); | ||||
| 		$this->assertEquals($expected, $nodes); | ||||
| 
 | ||||
| 		$validTree = $this->Tree->verify(); | ||||
| 		$this->assertSame($validTree, true); | ||||
| 		$this->assertTrue($validTree); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1201,18 +1237,18 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 
 | ||||
| 		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField)); | ||||
| 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13))); | ||||
| 		$this->assertEquals($direct, $expects); | ||||
| 		$this->assertEquals($expected, $direct); | ||||
| 
 | ||||
| 		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField)); | ||||
| 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 2, $leftField => 3, $rightField => 4)), | ||||
| 			array($modelClass => array('id' => 4, 'name' => '1.1.2', $parentField => 2, $leftField => 5, $rightField => 6)), | ||||
| 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13)), | ||||
| 			array($modelClass => array('id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)), | ||||
| 			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12))); | ||||
| 		$this->assertEquals($total, $expects); | ||||
| 		$this->assertEquals($expected, $total); | ||||
| 
 | ||||
| 		$this->assertEquals(array(), $this->Tree->children(10000)); | ||||
| 	} | ||||
|  | @ -1256,8 +1292,8 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 
 | ||||
| 		$result = $this->Tree->getParentNode(null, array('name')); | ||||
| 		$expects = array($modelClass => array('name' => '1.2')); | ||||
| 		$this->assertSame($expects, $result); | ||||
| 		$expected = array($modelClass => array('name' => '1.2')); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1274,10 +1310,10 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 
 | ||||
| 		$result = $this->Tree->getPath(null, array('name')); | ||||
| 		$expects = array(array($modelClass => array('name' => '1. Root')), | ||||
| 		$expected = array(array($modelClass => array('name' => '1. Root')), | ||||
| 			array($modelClass => array('name' => '1.2')), | ||||
| 			array($modelClass => array('name' => '1.2.2'))); | ||||
| 		$this->assertSame($expects, $result); | ||||
| 		$this->assertSame($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1296,12 +1332,12 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->Tree->id = $data[$modelClass]['id']; | ||||
| 
 | ||||
| 		$direct = $this->Tree->children(null, true, array('id', 'name', $parentField, $leftField, $rightField)); | ||||
| 		$expects = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 		$expected = array(array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 			array($modelClass => array('id' => 5, 'name' => '1.2', $parentField => 1, $leftField => 8, $rightField => 13))); | ||||
| 		$this->assertEquals($direct, $expects); | ||||
| 		$this->assertEquals($expected, $direct); | ||||
| 
 | ||||
| 		$total = $this->Tree->children(null, null, array('id', 'name', $parentField, $leftField, $rightField)); | ||||
| 		$expects = array( | ||||
| 		$expected = array( | ||||
| 			array($modelClass => array('id' => 2, 'name' => '1.1', $parentField => 1, $leftField => 2, $rightField => 7)), | ||||
| 			array($modelClass => array('id' => 3, 'name' => '1.1.1', $parentField => 2, $leftField => 3, $rightField => 4)), | ||||
| 			array($modelClass => array('id' => 4, 'name' => '1.1.2', $parentField => 2, $leftField => 5, $rightField => 6)), | ||||
|  | @ -1309,7 +1345,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 			array($modelClass => array('id' => 6, 'name' => '1.2.1', $parentField => 5, $leftField => 9, $rightField => 10)), | ||||
| 			array($modelClass => array('id' => 7, 'name' => '1.2.2', $parentField => 5, $leftField => 11, $rightField => 12)) | ||||
| 		); | ||||
| 		$this->assertEquals($total, $expects); | ||||
| 		$this->assertEquals($expected, $total); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  | @ -1397,6 +1433,29 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		$this->assertEquals('__3 - 1.1.1', $result[3]); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * Test the formatting options of formatTreeList() | ||||
|  * | ||||
|  * @return void | ||||
|  */ | ||||
| 	public function testFormatTreeList() { | ||||
| 		extract($this->settings); | ||||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->initialize(2, 2); | ||||
| 
 | ||||
| 		$options = array('order' => array('lft' => 'asc')); | ||||
| 		$records = $this->Tree->find('all', $options); | ||||
| 
 | ||||
| 		$options = array( | ||||
| 			'keyPath' => "{n}.$modelClass.id", | ||||
| 			'valuePath' => array('%s - %s', "{n}.$modelClass.id", "{n}.$modelClass.name"), | ||||
| 			'spacer' => '--'); | ||||
| 		$result = $this->Tree->formatTreeList($records, $options); | ||||
| 		$this->assertEquals('1 - 1. Root', $result[1]); | ||||
| 		$this->assertEquals('--2 - 1.1', $result[2]); | ||||
| 		$this->assertEquals('----3 - 1.1.1', $result[3]); | ||||
| 	} | ||||
| 
 | ||||
| /** | ||||
|  * testArraySyntax method | ||||
|  * | ||||
|  | @ -1419,7 +1478,7 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 	public function testFindThreaded() { | ||||
| 		$Model = new Person(); | ||||
| 		$Model->recursive = -1; | ||||
| 		$Model->Behaviors->attach('Tree', array('parent' => 'mother_id')); | ||||
| 		$Model->Behaviors->load('Tree', array('parent' => 'mother_id')); | ||||
| 
 | ||||
| 		$result = $Model->find('threaded'); | ||||
| 		$expected = array( | ||||
|  | @ -1492,4 +1551,61 @@ class TreeBehaviorNumberTest extends CakeTestCase { | |||
| 		); | ||||
| 		$this->assertEquals($expected, $result); | ||||
| 	} | ||||
| 
 | ||||
| 	public function testLevel() { | ||||
| 		extract($this->settings); | ||||
| 		$this->Tree = new $modelClass(); | ||||
| 		$this->Tree->Behaviors->attach('Tree', array('level' => 'level')); | ||||
| 		$this->Tree->initialize(2, 2); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1. Root'); | ||||
| 		$this->assertEquals(0, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1.1'); | ||||
| 		$this->assertEquals(1, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1.2.2'); | ||||
| 		$this->assertEquals(2, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1.2.1'); | ||||
| 		$this->assertEquals(2, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		// Save with parent_id not set
 | ||||
| 		$this->Tree->save(array('id' => $result[$modelClass]['id'], 'name' => 'foo')); | ||||
| 		$result = $this->Tree->findByName('foo'); | ||||
| 		$this->assertEquals(2, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		// Save with parent_id not changed
 | ||||
| 		$this->Tree->save(array( | ||||
| 			'id' => $result[$modelClass]['id'], | ||||
| 			'parent_id' => $result[$modelClass]['parent_id'], | ||||
| 			'name' => 'foo2' | ||||
| 		)); | ||||
| 		$result = $this->Tree->findByName('foo2'); | ||||
| 		$this->assertEquals(2, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		// Save with parent_id changed
 | ||||
| 		$result = $this->Tree->findByName('1.1'); | ||||
| 		$this->Tree->save(array( | ||||
| 			'id' => $result[$modelClass]['id'], | ||||
| 			'parent_id' => '' | ||||
| 		)); | ||||
| 		$result = $this->Tree->findByName('1.1'); | ||||
| 		$this->assertEquals(0, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1.1.2'); | ||||
| 		$this->assertEquals(1, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$parent = $this->Tree->findByName('1.1.2'); | ||||
| 		$result = $this->Tree->findByName('1.2'); | ||||
| 		$this->Tree->save(array( | ||||
| 			'id' => $result[$modelClass]['id'], | ||||
| 			'parent_id' => $parent[$modelClass]['id'] | ||||
| 		)); | ||||
| 		$result = $this->Tree->findByName('1.2'); | ||||
| 		$this->assertEquals(2, $result[$modelClass][$level]); | ||||
| 
 | ||||
| 		$result = $this->Tree->findByName('1.2.2'); | ||||
| 		$this->assertEquals(3, $result[$modelClass][$level]); | ||||
| 	} | ||||
| } | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Brm Ko
						Brm Ko