Skip to content

Test moveNodeBelow is reentrant #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Feb 15, 2017
Merged

Test moveNodeBelow is reentrant #12

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ac0713
Test moveNodeBelow is reentrant
larowlan Feb 8, 2017
c8654bb
Test for moving before being reentrant
larowlan Feb 8, 2017
e69d426
Merge branch 'master' into test-move-node-below-is-reentrant
pnx-test Feb 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
108 changes: 65 additions & 43 deletions tests/Functional/DbalNestedSetTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,29 +320,11 @@ public function testMoveSubTreeBelow() {
$node = $this->nestedSet->getNode($nodeKey);

$this->nestedSet->moveSubTreeBelow($parent, $node);
$this->assertNodeMovedBelow();

// Check node is in new position.
$node = $this->nestedSet->getNode($nodeKey);
$this->assertEquals(2, $node->getLeft());
$this->assertEquals(7, $node->getRight());
$this->assertEquals(1, $node->getDepth());

// Check children are in new position.
$node = $this->nestedSet->getNode(new NodeKey(10, 1));
$this->assertEquals(3, $node->getLeft());
$this->assertEquals(4, $node->getRight());
$this->assertEquals(2, $node->getDepth());

$node = $this->nestedSet->getNode(new NodeKey(11, 1));
$this->assertEquals(5, $node->getLeft());
$this->assertEquals(6, $node->getRight());
$this->assertEquals(2, $node->getDepth());

// Check old parent is updated.
$node = $this->nestedSet->getNode(new NodeKey(3, 1));
$this->assertEquals(16, $node->getLeft());
$this->assertEquals(21, $node->getRight());
$this->assertEquals(1, $node->getDepth());
$node = $this->nestedSet->getNode(new NodeKey(7, 1));
$this->nestedSet->moveSubTreeBelow($parent, $node);
$this->assertNodeMovedBelow();

}

Expand Down Expand Up @@ -455,30 +437,14 @@ public function testMoveSubTreeBefore() {
$node = $this->nestedSet->getNode($nodeKey);

$this->nestedSet->moveSubTreeBefore($target, $node);
$this->assertNodeMovedBefore();

$node = $this->nestedSet->getNode(new NodeKey(7, 1));
// Check node is in new position.
$node = $this->nestedSet->getNode($nodeKey);
$this->assertEquals(3, $node->getLeft());
$this->assertEquals(8, $node->getRight());
$this->assertEquals(2, $node->getDepth());

// Check children are in new position.
$node = $this->nestedSet->getNode(new NodeKey(10, 1));
$this->assertEquals(4, $node->getLeft());
$this->assertEquals(5, $node->getRight());
$this->assertEquals(3, $node->getDepth());

$node = $this->nestedSet->getNode(new NodeKey(11, 1));
$this->assertEquals(6, $node->getLeft());
$this->assertEquals(7, $node->getRight());
$this->assertEquals(3, $node->getDepth());

// Check old parent is updated.
$node = $this->nestedSet->getNode(new NodeKey(3, 1));
$this->assertEquals(16, $node->getLeft());
$this->assertEquals(21, $node->getRight());
$this->assertEquals(1, $node->getDepth());

$this->nestedSet->moveSubTreeBefore($target, $node);
$this->assertNodeMovedBefore();
}

/**
Expand Down Expand Up @@ -659,7 +625,63 @@ public function printTree($tree) {
$node->getDepth(),
]);
}
echo $table->getTable();
echo PHP_EOL . $table->getTable();
}

/**
* Assert node correctly moved below.
*/
protected function assertNodeMovedBelow() {
// Check node is in new position.
$node = $this->nestedSet->getNode(new NodeKey(7, 1));
$this->assertEquals(2, $node->getLeft());
$this->assertEquals(7, $node->getRight());
$this->assertEquals(1, $node->getDepth());

// Check children are in new position.
$node = $this->nestedSet->getNode(new NodeKey(10, 1));
$this->assertEquals(3, $node->getLeft());
$this->assertEquals(4, $node->getRight());
$this->assertEquals(2, $node->getDepth());

$node = $this->nestedSet->getNode(new NodeKey(11, 1));
$this->assertEquals(5, $node->getLeft());
$this->assertEquals(6, $node->getRight());
$this->assertEquals(2, $node->getDepth());

// Check old parent is updated.
$node = $this->nestedSet->getNode(new NodeKey(3, 1));
$this->assertEquals(16, $node->getLeft());
$this->assertEquals(21, $node->getRight());
$this->assertEquals(1, $node->getDepth());
}

/**
* Assert node correctly moved before.
*/
protected function assertNodeMovedBefore() {
// Check node is in new position.
$node = $this->nestedSet->getNode(new NodeKey(7, 1));
$this->assertEquals(3, $node->getLeft());
$this->assertEquals(8, $node->getRight());
$this->assertEquals(2, $node->getDepth());

// Check children are in new position.
$node = $this->nestedSet->getNode(new NodeKey(10, 1));
$this->assertEquals(4, $node->getLeft());
$this->assertEquals(5, $node->getRight());
$this->assertEquals(3, $node->getDepth());

$node = $this->nestedSet->getNode(new NodeKey(11, 1));
$this->assertEquals(6, $node->getLeft());
$this->assertEquals(7, $node->getRight());
$this->assertEquals(3, $node->getDepth());

// Check old parent is updated.
$node = $this->nestedSet->getNode(new NodeKey(3, 1));
$this->assertEquals(16, $node->getLeft());
$this->assertEquals(21, $node->getRight());
$this->assertEquals(1, $node->getDepth());
}

}