mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/11495] Remove forum_parents from tests where it is not required

Browse Source 
PHPBB3-11495
This commit is contained in:
Joas Schilling
2013-04-30 18:11:24 +02:00
parent 5c4d69581a
commit fe02218a2d
3 changed files with 200 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

248
tests/tree/nestedset_forum_move_test.php
View File

@@ -16,101 +16,101 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
return array(
array('Move first item up',
1, 1, false, array(
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move last item down',
7, -1, false, array(
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move first item down',
1, -1, true, array(
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move second item up',
4, 1, true, array(
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move last item up',
7, 1, true, array(
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20),
)),
array('Move last item up by 2',
7, 2, true, array(
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20),
)),
array('Move last item up by 100',
7, 100, true, array(
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 10),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 4, 'right_id' => 7),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 5, 'right_id' => 6),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 16),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 12, 'right_id' => 13),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 17, 'right_id' => 22),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 18, 'right_id' => 21),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 19, 'right_id' => 20),
)),
);
}
@@ -122,7 +122,7 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
{
$this->assertEquals($expected_moved, $this->set->move($forum_id, $delta));
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id
FROM phpbb_forums
ORDER BY left_id, forum_id ASC");
$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
@@ -133,31 +133,31 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
return array(
array('Move last item down',
7, false, array(
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move first item down',
1, true, array(
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
);
}
@@ -169,7 +169,7 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
{
$this->assertEquals($expected_moved, $this->set->move_down($forum_id));
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id
FROM phpbb_forums
ORDER BY left_id, forum_id ASC");
$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
@@ -180,31 +180,31 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
return array(
array('Move first item up',
1, false, array(
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
array('Move second item up',
4, true, array(
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5),
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4),
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 8, 'right_id' => 9),
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 10, 'right_id' => 11),
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
)),
);
}
@@ -216,7 +216,7 @@ class phpbb_tests_tree_nestedset_forum_move_test extends phpbb_tests_tree_nested
{
$this->assertEquals($expected_moved, $this->set->move_up($forum_id));
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id
FROM phpbb_forums
ORDER BY left_id, forum_id ASC");
$this->assertEquals($expected, $this->db->sql_fetchrowset($result));