mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[ticket/10411] Add return values to add/delete function
PHPBB3-10411
This commit is contained in:
@@ -55,23 +55,31 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case
|
||||
public function add_group_data()
|
||||
{
|
||||
return array(
|
||||
array(1, array(
|
||||
array('group_id' => 1, 'group_legend' => 3),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
)),
|
||||
array(2, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
)),
|
||||
array(
|
||||
1,
|
||||
true,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 3),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
),
|
||||
),
|
||||
array(
|
||||
2,
|
||||
false,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider add_group_data
|
||||
*/
|
||||
public function test_add_group($group_id, $expected)
|
||||
public function test_add_group($group_id, $expected_added, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -81,7 +89,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_legend($db, $user);
|
||||
$test_class->add_group($group_id);
|
||||
$this->assertEquals($expected_added, $test_class->add_group($group_id));
|
||||
|
||||
$result = $db->sql_query('SELECT group_id, group_legend
|
||||
FROM ' . GROUPS_TABLE . '
|
||||
@@ -93,43 +101,73 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case
|
||||
public function delete_group_data()
|
||||
{
|
||||
return array(
|
||||
array(1, false, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' =>2),
|
||||
)),
|
||||
array(2, false, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 0),
|
||||
array('group_id' => 3, 'group_legend' => 1),
|
||||
)),
|
||||
array(3, false, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 0),
|
||||
)),
|
||||
array(1, true, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
)),
|
||||
array(2, true, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 1),
|
||||
)),
|
||||
array(3, true, array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
)),
|
||||
array(
|
||||
1,
|
||||
false,
|
||||
false,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
),
|
||||
),
|
||||
array(
|
||||
2,
|
||||
false,
|
||||
true,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 0),
|
||||
array('group_id' => 3, 'group_legend' => 1),
|
||||
),
|
||||
),
|
||||
array(
|
||||
3,
|
||||
false,
|
||||
true,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 0),
|
||||
),
|
||||
),
|
||||
array(
|
||||
1,
|
||||
true,
|
||||
false,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
),
|
||||
),
|
||||
array(
|
||||
2,
|
||||
true,
|
||||
true,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 1),
|
||||
),
|
||||
),
|
||||
array(
|
||||
3,
|
||||
true,
|
||||
true,
|
||||
array(
|
||||
array('group_id' => 1, 'group_legend' => 0),
|
||||
array('group_id' => 2, 'group_legend' => 1),
|
||||
array('group_id' => 3, 'group_legend' => 2),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider delete_group_data
|
||||
*/
|
||||
public function test_delete_group($group_id, $skip_group, $expected)
|
||||
public function test_delete_group($group_id, $skip_group, $expected_deleted, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -139,7 +177,7 @@ class phpbb_groupposition_legend_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_legend($db, $user);
|
||||
$test_class->delete_group($group_id, $skip_group);
|
||||
$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, $skip_group));
|
||||
|
||||
$result = $db->sql_query('SELECT group_id, group_legend
|
||||
FROM ' . GROUPS_TABLE . '
|
||||
|
@@ -57,55 +57,75 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
public function add_group_teampage_data()
|
||||
{
|
||||
return array(
|
||||
array(1, 2, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(6, 2, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(7, 2, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 7, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(7, 0, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 7, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(
|
||||
1,
|
||||
2,
|
||||
false,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
6,
|
||||
2,
|
||||
false,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
7,
|
||||
2,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 7, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 7, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
7,
|
||||
0,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 7, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider add_group_teampage_data
|
||||
*/
|
||||
public function test_add_group_teampage($group_id, $parent_id, $expected)
|
||||
public function test_add_group_teampage($group_id, $parent_id, $expected_added, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -115,7 +135,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
|
||||
$test_class->add_group_teampage($group_id, $parent_id);
|
||||
$this->assertEquals($expected_added, $test_class->add_group_teampage($group_id, $parent_id));
|
||||
|
||||
$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
|
||||
FROM ' . TEAMPAGE_TABLE . '
|
||||
@@ -127,24 +147,28 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
public function add_category_teampage_data()
|
||||
{
|
||||
return array(
|
||||
array('new', array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'new'),
|
||||
)),
|
||||
array(
|
||||
'new',
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 8, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 9, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'new'),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider add_category_teampage_data
|
||||
*/
|
||||
public function test_add_category_teampage($group_name, $expected)
|
||||
public function test_add_category_teampage($group_name, $expected_added, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -154,7 +178,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
|
||||
$test_class->add_category_teampage($group_name);
|
||||
$this->assertEquals($expected_added, $test_class->add_category_teampage($group_name));
|
||||
|
||||
$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
|
||||
FROM ' . TEAMPAGE_TABLE . '
|
||||
@@ -166,40 +190,52 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
public function delete_group_data()
|
||||
{
|
||||
return array(
|
||||
array(1, array(
|
||||
array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(2, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(6, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
)),
|
||||
array(
|
||||
1,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
2,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
6,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 6, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider delete_group_data
|
||||
*/
|
||||
public function test_delete_group($group_id, $expected)
|
||||
public function test_delete_group($group_id, $expected_deleted, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -209,7 +245,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
|
||||
$test_class->delete_group($group_id, false);
|
||||
$this->assertEquals($expected_deleted, $test_class->delete_group($group_id, false));
|
||||
|
||||
$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
|
||||
FROM ' . TEAMPAGE_TABLE . '
|
||||
@@ -221,29 +257,37 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
public function delete_teampage_data()
|
||||
{
|
||||
return array(
|
||||
array(1, array(
|
||||
array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(2, array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
)),
|
||||
array(
|
||||
1,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category - 2 children'),
|
||||
array('teampage_position' => 2, 'group_id' => 2, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 3, 'group_id' => 3, 'teampage_parent' => 2, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 5, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 6, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 7, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
array(
|
||||
2,
|
||||
true,
|
||||
array(
|
||||
array('teampage_position' => 1, 'group_id' => 1, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
array('teampage_position' => 2, 'group_id' => 0, 'teampage_parent' => 0, 'teampage_name' => 'category2 - 2 children'),
|
||||
array('teampage_position' => 3, 'group_id' => 4, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 4, 'group_id' => 5, 'teampage_parent' => 5, 'teampage_name' => ''),
|
||||
array('teampage_position' => 5, 'group_id' => 6, 'teampage_parent' => 0, 'teampage_name' => ''),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* @dataProvider delete_teampage_data
|
||||
*/
|
||||
public function test_delete_teampage($teampage_id, $expected)
|
||||
public function test_delete_teampage($teampage_id, $expected_deleted, $expected)
|
||||
{
|
||||
global $cache;
|
||||
|
||||
@@ -253,7 +297,7 @@ class phpbb_groupposition_teampage_test extends phpbb_database_test_case
|
||||
$user->lang = array();
|
||||
|
||||
$test_class = new phpbb_groupposition_teampage($db, $user, $cache);
|
||||
$test_class->delete_teampage($teampage_id, false);
|
||||
$this->assertEquals($expected_deleted, $test_class->delete_teampage($teampage_id, false));
|
||||
|
||||
$result = $db->sql_query('SELECT teampage_position, group_id, teampage_parent, teampage_name
|
||||
FROM ' . TEAMPAGE_TABLE . '
|
||||
|
Reference in New Issue
Block a user