makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11495] Remove item class from unit tests

Browse source 
PHPBB3-11495
This commit is contained in:
Joas Schilling 2013-04-18 00:33:48 +02:00
parent 86937e03ec
commit d11fed65da
4 changed files with 18 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tests/nestedset/item_forum_test.php
View file

@ -1,31 +0,0 @@
<?php
/**
*
* @package testing
* @copyright (c) 2013 phpBB Group
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
*
*/
class phpbb_tests_nestedset_item_forum_test extends phpbb_test_case
{
public function test_item_forum_constructor()
{
$forum_data = array(
'parent_id' => 1,
'forum_id' => 5,
'user_id' => 32,
'left_id' => 2,
'right_id' => 3,
'forum_parents' => '',
);
$forum = new phpbb_nestedset_item_forum($forum_data);
$this->assertEquals($forum->get_item_id(), $forum_data['forum_id']);
$this->assertEquals($forum->get_left_id(), $forum_data['left_id']);
$this->assertEquals($forum->get_right_id(), $forum_data['right_id']);
$this->assertEquals($forum->get_parent_id(), $forum_data['parent_id']);
$this->assertEquals($forum->get_item_parents_data(), $forum_data['forum_parents']);
}
}

17
tests/nestedset/set_forum_add_remove_test.php
View file

@ -78,9 +78,7 @@ class phpbb_tests_nestedset_set_forum_add_remove_test extends phpbb_tests_nested
*/ */
public function test_remove_add($forum_id, $expected_removed, $expected_remove_table, $expected_added, $expected_add_table) public function test_remove_add($forum_id, $expected_removed, $expected_remove_table, $expected_added, $expected_add_table)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $removed_items = $this->set->remove($this->forum_data[$forum_id]);
$removed_items = $this->set->remove($forum);
$this->assertEquals($expected_removed, $removed_items); $this->assertEquals($expected_removed, $removed_items);
@ -92,8 +90,13 @@ class phpbb_tests_nestedset_set_forum_add_remove_test extends phpbb_tests_nested
$added_items = array(); $added_items = array();
foreach ($removed_items as $item_id) foreach ($removed_items as $item_id)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$item_id]); $added_items[$item_id] = $this->set->add(array_merge($this->forum_data[$item_id], array(
$added_items[$item_id] = $this->set->add($forum); 'forum_rules' => '',
'forum_desc' => '',
'parent_id' => 0,
'left_id' => 0,
'right_id' => 0,
)));
} }
$this->assertEquals($expected_added, $added_items); $this->assertEquals($expected_added, $added_items);
@ -136,9 +139,7 @@ class phpbb_tests_nestedset_set_forum_add_remove_test extends phpbb_tests_nested
*/ */
public function test_delete($forum_id, $expected_deleted, $expected) public function test_delete($forum_id, $expected_deleted, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_deleted, $this->set->delete($this->forum_data[$forum_id]));
$this->assertEquals($expected_deleted, $this->set->delete($forum));
$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, forum_parents
FROM phpbb_forums FROM phpbb_forums

9
tests/nestedset/set_forum_get_data_test.php
View file

@ -66,9 +66,7 @@ class phpbb_tests_nestedset_set_forum_get_data_test extends phpbb_tests_nestedse
*/ */
public function test_get_branch_data($forum_id, $type, $order_desc, $include_item, $expected) public function test_get_branch_data($forum_id, $type, $order_desc, $include_item, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected, array_keys($this->set->get_branch_data($this->forum_data[$forum_id], $type, $order_desc, $include_item)));
$this->assertEquals($expected, array_keys($this->set->get_branch_data($forum, $type, $order_desc, $include_item)));
} }
public function get_parent_data_data() public function get_parent_data_data()
@ -88,9 +86,6 @@ class phpbb_tests_nestedset_set_forum_get_data_test extends phpbb_tests_nestedse
*/ */
public function test_get_parent_data($forum_id, $forum_data, $expected) public function test_get_parent_data($forum_id, $forum_data, $expected)
{ {
$data = array_merge($this->forum_data[$forum_id], $forum_data); $this->assertEquals($expected, array_keys($this->set->get_parent_data(array_merge($this->forum_data[$forum_id], $forum_data))));
$forum = new phpbb_nestedset_item_forum($data);
$this->assertEquals($expected, array_keys($this->set->get_parent_data($forum)));
} }
} }

32
tests/nestedset/set_forum_move_test.php
View file

@ -120,9 +120,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_move($explain, $forum_id, $delta, $expected_moved, $expected) public function test_move($explain, $forum_id, $delta, $expected_moved, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_moved, $this->set->move($this->forum_data[$forum_id], $delta));
$this->assertEquals($expected_moved, $this->set->move($forum, $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, forum_parents
FROM phpbb_forums FROM phpbb_forums
@ -169,9 +167,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_move_down($explain, $forum_id, $expected_moved, $expected) public function test_move_down($explain, $forum_id, $expected_moved, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_moved, $this->set->move_down($this->forum_data[$forum_id]));
$this->assertEquals($expected_moved, $this->set->move_down($forum));
$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, forum_parents
FROM phpbb_forums FROM phpbb_forums
@ -218,9 +214,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_move_up($explain, $forum_id, $expected_moved, $expected) public function test_move_up($explain, $forum_id, $expected_moved, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_moved, $this->set->move_up($this->forum_data[$forum_id]));
$this->assertEquals($expected_moved, $this->set->move_up($forum));
$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, forum_parents
FROM phpbb_forums FROM phpbb_forums
@ -386,10 +380,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_move_children($explain, $forum_id, $target_id, $expected_moved, $expected) public function test_move_children($explain, $forum_id, $target_id, $expected_moved, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_moved, $this->set->move_children($this->forum_data[$forum_id], $this->forum_data[$target_id]));
$target = new phpbb_nestedset_item_forum($this->forum_data[$target_id]);
$this->assertEquals($expected_moved, $this->set->move_children($forum, $target));
$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, forum_parents
FROM phpbb_forums FROM phpbb_forums
@ -414,10 +405,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_move_children_throws($explain, $forum_id, $target_id) public function test_move_children_throws($explain, $forum_id, $target_id)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->set->move_children($this->forum_data[$forum_id], $this->forum_data[$target_id]);
$target = new phpbb_nestedset_item_forum($this->forum_data[$target_id]);
$this->set->move_children($forum, $target);
} }
public function set_parent_data() public function set_parent_data()
@ -529,10 +517,7 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_set_parent($explain, $forum_id, $target_id, $expected_moved, $expected) public function test_set_parent($explain, $forum_id, $target_id, $expected_moved, $expected)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->assertEquals($expected_moved, $this->set->set_parent($this->forum_data[$forum_id], $this->forum_data[$target_id]));
$target = new phpbb_nestedset_item_forum($this->forum_data[$target_id]);
$this->assertEquals($expected_moved, $this->set->set_parent($forum, $target));
$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, forum_parents
FROM phpbb_forums FROM phpbb_forums
@ -557,9 +542,6 @@ class phpbb_tests_nestedset_set_forum_move_test extends phpbb_tests_nestedset_se
*/ */
public function test_set_parent_throws($explain, $forum_id, $target_id) public function test_set_parent_throws($explain, $forum_id, $target_id)
{ {
$forum = new phpbb_nestedset_item_forum($this->forum_data[$forum_id]); $this->set->set_parent($this->forum_data[$forum_id], $this->forum_data[$target_id]);
$target = new phpbb_nestedset_item_forum($this->forum_data[$target_id]);
$this->set->set_parent($forum, $target);
} }
} }