Skip to content

Commit fe02218

Browse files
nickvergessennickvergessen
committed
[ticket/11495] Remove forum_parents from tests where it is not required
PHPBB3-11495
1 parent 5c4d695 commit fe02218

3 files changed

Lines changed: 200 additions & 200 deletions

File tree

‎tests/tree/nestedset_forum_insert_delete_test.php‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -15,26 +15,26 @@ public function delete_data()
1515
{
1616
return array(
1717
array(1, array(1, 2, 3), array(
18-
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
19-
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
20-
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
21-
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16, 'forum_parents' => 'a:0:{}'),
22-
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
23-
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13, 'forum_parents' => 'a:0:{}'),
24-
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
25-
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
18+
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
19+
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 2, 'right_id' => 5),
20+
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 3, 'right_id' => 4),
21+
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 16),
22+
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 8, 'right_id' => 9),
23+
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 10, 'right_id' => 13),
24+
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 11, 'right_id' => 12),
25+
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
2626
)),
2727
array(2, array(2), array(
28-
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 4, 'forum_parents' => 'a:0:{}'),
29-
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
30-
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 5, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
31-
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 6, 'right_id' => 9, 'forum_parents' => 'a:0:{}'),
32-
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 7, 'right_id' => 8, 'forum_parents' => 'a:0:{}'),
33-
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 20, 'forum_parents' => 'a:0:{}'),
34-
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13, 'forum_parents' => 'a:0:{}'),
35-
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17, 'forum_parents' => 'a:0:{}'),
36-
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16, 'forum_parents' => 'a:0:{}'),
37-
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
28+
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 4),
29+
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
30+
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 5, 'right_id' => 10),
31+
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 6, 'right_id' => 9),
32+
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 7, 'right_id' => 8),
33+
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 11, 'right_id' => 20),
34+
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 12, 'right_id' => 13),
35+
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 17),
36+
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 15, 'right_id' => 16),
37+
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 18, 'right_id' => 19),
3838
)),
3939
);
4040
}
@@ -46,7 +46,7 @@ public function test_delete($forum_id, $expected_deleted, $expected)
4646
{
4747
$this->assertEquals($expected_deleted, $this->set->delete($forum_id));
4848

49-
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id, forum_parents
49+
$result = $this->db->sql_query("SELECT forum_id, parent_id, left_id, right_id
5050
FROM phpbb_forums
5151
ORDER BY left_id, forum_id ASC");
5252
$this->assertEquals($expected, $this->db->sql_fetchrowset($result));
@@ -64,21 +64,21 @@ public function insert_data()
6464
'right_id' => 24,
6565
'forum_parents' => '',
6666
), array(
67-
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6, 'forum_parents' => 'a:0:{}'),
68-
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3, 'forum_parents' => 'a:0:{}'),
69-
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5, 'forum_parents' => 'a:0:{}'),
67+
array('forum_id' => 1, 'parent_id' => 0, 'left_id' => 1, 'right_id' => 6),
68+
array('forum_id' => 2, 'parent_id' => 1, 'left_id' => 2, 'right_id' => 3),
69+
array('forum_id' => 3, 'parent_id' => 1, 'left_id' => 4, 'right_id' => 5),
7070

71-
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12, 'forum_parents' => 'a:0:{}'),
72-
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11, 'forum_parents' => 'a:0:{}'),
73-
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10, 'forum_parents' => 'a:0:{}'),
71+
array('forum_id' => 4, 'parent_id' => 0, 'left_id' => 7, 'right_id' => 12),
72+
array('forum_id' => 5, 'parent_id' => 4, 'left_id' => 8, 'right_id' => 11),
73+
array('forum_id' => 6, 'parent_id' => 5, 'left_id' => 9, 'right_id' => 10),
7474

75-
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22, 'forum_parents' => 'a:0:{}'),
76-
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15, 'forum_parents' => 'a:0:{}'),
77-
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19, 'forum_parents' => 'a:0:{}'),
78-
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18, 'forum_parents' => 'a:0:{}'),
79-
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21, 'forum_parents' => 'a:0:{}'),
75+
array('forum_id' => 7, 'parent_id' => 0, 'left_id' => 13, 'right_id' => 22),
76+
array('forum_id' => 8, 'parent_id' => 7, 'left_id' => 14, 'right_id' => 15),
77+
array('forum_id' => 9, 'parent_id' => 7, 'left_id' => 16, 'right_id' => 19),
78+
array('forum_id' => 10, 'parent_id' => 9, 'left_id' => 17, 'right_id' => 18),
79+
array('forum_id' => 11, 'parent_id' => 7, 'left_id' => 20, 'right_id' => 21),
8080

81-
array('forum_id' => 12, 'parent_id' => 0, 'left_id' => 23, 'right_id' => 24, 'forum_parents' => ''),
81+
array('forum_id' => 12, 'parent_id' => 0, 'left_id' => 23, 'right_id' => 24),
8282
)),
8383
);
8484
}
@@ -93,7 +93,7 @@ public function test_insert($expected_data, $expected)
9393
'forum_rules' => '',
9494
)));
9595

96-
$result = $this->db->sql_query('SELECT forum_id, parent_id, left_id, right_id, forum_parents
96+
$result = $this->db->sql_query('SELECT forum_id, parent_id, left_id, right_id
9797
FROM phpbb_forums
9898
ORDER BY left_id, forum_id ASC');
9999
$this->assertEquals($expected, $this->db->sql_fetchrowset($result));

0 commit comments

Comments
 (0)