mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2025-02-07 12:36:25 +00:00
Removing invalid testMoveLast which relied on incorrect logic in the tree behavior
Adding testSaveNoMove to address [ticket:3409 TreeBehavior moves item on save of existing item] Adding tearDown code to aide debugging in the future. git-svn-id: https://svn.cakephp.org/repo/branches/1.2.x.x@5829 3807eeeb-6ff5-0310-8944-8be069107fe0
This commit is contained in:
parent
712276510e
commit
7addec3dcc
1 changed files with 39 additions and 19 deletions
|
@ -70,6 +70,22 @@ class NumberTree extends CakeTestModel {
|
||||||
|
|
||||||
class NumberTreeCase extends CakeTestCase {
|
class NumberTreeCase extends CakeTestCase {
|
||||||
var $fixtures = array('core.number_tree');
|
var $fixtures = array('core.number_tree');
|
||||||
|
var $debug = false;
|
||||||
|
|
||||||
|
function before($method) {
|
||||||
|
if ($this->debug) {
|
||||||
|
pr( $method);
|
||||||
|
}
|
||||||
|
parent::before($method);
|
||||||
|
}
|
||||||
|
|
||||||
|
function tearDown() {
|
||||||
|
if ($this->debug && isset($this->NumberTree)) {
|
||||||
|
pr ($this->NumberTree->generateTreeList(null, null, null, '.....'));
|
||||||
|
unset($this->NumberTree);
|
||||||
|
}
|
||||||
|
parent::tearDown();
|
||||||
|
}
|
||||||
|
|
||||||
function testInitialize() {
|
function testInitialize() {
|
||||||
$this->NumberTree = & new NumberTree();
|
$this->NumberTree = & new NumberTree();
|
||||||
|
@ -336,21 +352,6 @@ class NumberTreeCase extends CakeTestCase {
|
||||||
$this->assertIdentical($validTree, true);
|
$this->assertIdentical($validTree, true);
|
||||||
}
|
}
|
||||||
|
|
||||||
function testMoveToEnd() {
|
|
||||||
$this->NumberTree = & new NumberTree();
|
|
||||||
$this->NumberTree->__initialize(2, 2);
|
|
||||||
$this->NumberTree->id = null;
|
|
||||||
|
|
||||||
$data = $this->NumberTree->find(array('NumberTree.name' => '1.1'), array('id'));
|
|
||||||
$this->NumberTree->id = $data['NumberTree']['id'];
|
|
||||||
$this->NumberTree->saveField('parent_id', null);
|
|
||||||
//$this->NumberTree->setparent(null);
|
|
||||||
// Find the last parent node in the tree
|
|
||||||
$result = $this->NumberTree->find(null, array('name','parent_id'), 'NumberTree.rght desc');
|
|
||||||
$expected = array('NumberTree' => array('name' => '1.1', 'parent_id' => null));
|
|
||||||
$this->assertEqual($result, $expected);
|
|
||||||
}
|
|
||||||
|
|
||||||
function testMoveInvalid() {
|
function testMoveInvalid() {
|
||||||
$this->NumberTree = & new NumberTree();
|
$this->NumberTree = & new NumberTree();
|
||||||
$this->NumberTree->__initialize(2, 2);
|
$this->NumberTree->__initialize(2, 2);
|
||||||
|
@ -550,6 +551,29 @@ class NumberTreeCase extends CakeTestCase {
|
||||||
$this->assertIdentical($result, $expected);
|
$this->assertIdentical($result, $expected);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function testSaveNoMove() {
|
||||||
|
$this->NumberTree = & new NumberTree();
|
||||||
|
$this->NumberTree->__initialize(1, 10);
|
||||||
|
|
||||||
|
$data = $this->NumberTree->find(array('NumberTree.name' => '1.5'), array('id'));
|
||||||
|
$this->NumberTree->id = $data['NumberTree']['id'];
|
||||||
|
$this->NumberTree->saveField('name', 'renamed');
|
||||||
|
$parent = $this->NumberTree->findByName('1. Root', array('id'));
|
||||||
|
$this->NumberTree->id = $parent['NumberTree']['id'];
|
||||||
|
$result = $this->NumberTree->children(null, true, array('name'));
|
||||||
|
$expected = array(
|
||||||
|
array('NumberTree' => array('name' => '1.1',)),
|
||||||
|
array('NumberTree' => array('name' => '1.2',)),
|
||||||
|
array('NumberTree' => array('name' => '1.3',)),
|
||||||
|
array('NumberTree' => array('name' => '1.4',)),
|
||||||
|
array('NumberTree' => array('name' => 'renamed',)),
|
||||||
|
array('NumberTree' => array('name' => '1.6',)),
|
||||||
|
array('NumberTree' => array('name' => '1.7',)),
|
||||||
|
array('NumberTree' => array('name' => '1.8',)),
|
||||||
|
array('NumberTree' => array('name' => '1.9',)),
|
||||||
|
array('NumberTree' => array('name' => '1.10',)));
|
||||||
|
$this->assertIdentical($result, $expected);
|
||||||
|
}
|
||||||
|
|
||||||
function testDelete() {
|
function testDelete() {
|
||||||
$this->NumberTree = & new NumberTree();
|
$this->NumberTree = & new NumberTree();
|
||||||
|
@ -745,9 +769,5 @@ class NumberTreeCase extends CakeTestCase {
|
||||||
array('NumberTree' => array('id' => 7, 'name' => '1.2.2', 'parent_id' => 5, 'lft' => 11, 'rght' => 12)));
|
array('NumberTree' => array('id' => 7, 'name' => '1.2.2', 'parent_id' => 5, 'lft' => 11, 'rght' => 12)));
|
||||||
$this->assertEqual($total, $expects);
|
$this->assertEqual($total, $expects);
|
||||||
}
|
}
|
||||||
|
|
||||||
function tearDown() {
|
|
||||||
unset($this->NumberTree);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
?>
|
?>
|
||||||
|
|
Loading…
Add table
Reference in a new issue