mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-28 22:28:51 +00:00
[feature/soft-delete] Add unit tests for get_global_visibility_sql()
PHPBB3-9657
This commit is contained in:
Joas Schilling
parent
4a65940e62
commit
b629b2cd95
4 changed files with 165 additions and 8 deletions
|
|
@ -135,12 +135,20 @@ class phpbb_content_visibility
|
||||||
* @param $table_alias string - Table alias to prefix in SQL queries
|
* @param $table_alias string - Table alias to prefix in SQL queries
|
||||||
* @return string with the appropriate combination SQL logic for topic/post_visibility
|
* @return string with the appropriate combination SQL logic for topic/post_visibility
|
||||||
*/
|
*/
|
||||||
static public function get_visibility_sql_global($mode, $exclude_forum_ids = array(), $table_alias = '')
|
static public function get_global_visibility_sql($mode, $exclude_forum_ids = array(), $table_alias = '')
|
||||||
{
|
{
|
||||||
global $auth, $db, $user;
|
global $auth, $db, $user;
|
||||||
|
|
||||||
// users can always see approved posts
|
// users can always see approved posts
|
||||||
$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
|
if (sizeof($exclude_forum_ids))
|
||||||
|
{
|
||||||
|
$where_sql = '((' . $db->sql_in_set($table_alias . 'forum_id', $exclude_forum_ids, true, true) . "
|
||||||
|
AND $table_alias{$mode}_visibility = " . ITEM_APPROVED . ')';
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
$where_sql = "($table_alias{$mode}_visibility = " . ITEM_APPROVED;
|
||||||
|
}
|
||||||
|
|
||||||
// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
|
// in set notation: {approve_forums} = {m_approve} - {exclude_forums}
|
||||||
$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
|
$approve_forums = array_diff(array_keys($auth->acl_getf('m_approve', true)), $exclude_forum_ids);
|
||||||
|
|
|
||||||
|
|
@ -250,8 +250,8 @@ if ($keywords || $author || $author_id || $search_id || $submit)
|
||||||
$db->sql_freeresult($result);
|
$db->sql_freeresult($result);
|
||||||
|
|
||||||
// find out in which forums the user is allowed to view posts
|
// find out in which forums the user is allowed to view posts
|
||||||
$m_approve_posts_fid_sql = phpbb_content_visibility::get_visibility_sql_global('post', $ex_fid_ary, 'p.');
|
$m_approve_posts_fid_sql = phpbb_content_visibility::get_global_visibility_sql('post', $ex_fid_ary, 'p.');
|
||||||
$m_approve_topics_fid_sql = phpbb_content_visibility::get_visibility_sql_global('topic', $ex_fid_ary, 't.');
|
$m_approve_topics_fid_sql = phpbb_content_visibility::get_global_visibility_sql('topic', $ex_fid_ary, 't.');
|
||||||
|
|
||||||
if ($reset_search_forum)
|
if ($reset_search_forum)
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -43,8 +43,8 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
|
||||||
'phpbb_topics',
|
'phpbb_topics',
|
||||||
'topic', array(1, 2), '',
|
'topic', array(1, 2), '',
|
||||||
array(
|
array(
|
||||||
array('m_approve', true, array(1 => true, 2 => true)),
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
array('m_restore', true, array(1 => true, 2 => true)),
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
array('topic_id' => 1),
|
array('topic_id' => 1),
|
||||||
|
|
@ -93,8 +93,8 @@ class phpbb_content_visibility_get_forums_visibility_sql_test extends phpbb_data
|
||||||
'phpbb_posts',
|
'phpbb_posts',
|
||||||
'post', array(1, 2), '',
|
'post', array(1, 2), '',
|
||||||
array(
|
array(
|
||||||
array('m_approve', true, array(1 => true, 2 => true)),
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
array('m_restore', true, array(1 => true, 2 => true)),
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
array('post_id' => 1),
|
array('post_id' => 1),
|
||||||
|
|
|
||||||
149
tests/content_visibility/get_global_visibility_sql_test.php
Normal file
149
tests/content_visibility/get_global_visibility_sql_test.php
Normal file
|
|
@ -0,0 +1,149 @@
|
||||||
|
<?php
|
||||||
|
/**
|
||||||
|
*
|
||||||
|
* @package testing
|
||||||
|
* @copyright (c) 2012 phpBB Group
|
||||||
|
* @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License v2
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
require_once dirname(__FILE__) . '/../../phpBB/includes/functions.php';
|
||||||
|
require_once dirname(__FILE__) . '/../../phpBB/includes/utf/utf_tools.php';
|
||||||
|
|
||||||
|
class phpbb_content_visibility_get_global_visibility_sql_test extends phpbb_database_test_case
|
||||||
|
{
|
||||||
|
public function getDataSet()
|
||||||
|
{
|
||||||
|
return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/get_forums_visibility_sql.xml');
|
||||||
|
}
|
||||||
|
|
||||||
|
public function get_global_visibility_sql_data()
|
||||||
|
{
|
||||||
|
return array(
|
||||||
|
array(
|
||||||
|
'phpbb_topics',
|
||||||
|
'topic', array(), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('topic_id' => 1),
|
||||||
|
array('topic_id' => 2),
|
||||||
|
array('topic_id' => 3),
|
||||||
|
array('topic_id' => 4),
|
||||||
|
array('topic_id' => 5),
|
||||||
|
array('topic_id' => 6),
|
||||||
|
array('topic_id' => 7),
|
||||||
|
array('topic_id' => 8),
|
||||||
|
array('topic_id' => 9),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'phpbb_topics',
|
||||||
|
'topic', array(3), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('topic_id' => 1),
|
||||||
|
array('topic_id' => 2),
|
||||||
|
array('topic_id' => 3),
|
||||||
|
array('topic_id' => 4),
|
||||||
|
array('topic_id' => 5),
|
||||||
|
array('topic_id' => 6),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'phpbb_topics',
|
||||||
|
'topic', array(), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(2 => true)),
|
||||||
|
array('m_restore', true, array(1 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('topic_id' => 2),
|
||||||
|
array('topic_id' => 3),
|
||||||
|
array('topic_id' => 4),
|
||||||
|
array('topic_id' => 5),
|
||||||
|
array('topic_id' => 8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'phpbb_posts',
|
||||||
|
'post', array(), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('post_id' => 1),
|
||||||
|
array('post_id' => 2),
|
||||||
|
array('post_id' => 3),
|
||||||
|
array('post_id' => 4),
|
||||||
|
array('post_id' => 5),
|
||||||
|
array('post_id' => 6),
|
||||||
|
array('post_id' => 7),
|
||||||
|
array('post_id' => 8),
|
||||||
|
array('post_id' => 9),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'phpbb_posts',
|
||||||
|
'post', array(3), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
array('m_restore', true, array(1 => true, 2 => true, 3 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('post_id' => 1),
|
||||||
|
array('post_id' => 2),
|
||||||
|
array('post_id' => 3),
|
||||||
|
array('post_id' => 4),
|
||||||
|
array('post_id' => 5),
|
||||||
|
array('post_id' => 6),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
'phpbb_posts',
|
||||||
|
'post', array(), '',
|
||||||
|
array(
|
||||||
|
array('m_approve', true, array(2 => true)),
|
||||||
|
array('m_restore', true, array(1 => true)),
|
||||||
|
),
|
||||||
|
array(
|
||||||
|
array('post_id' => 2),
|
||||||
|
array('post_id' => 3),
|
||||||
|
array('post_id' => 4),
|
||||||
|
array('post_id' => 5),
|
||||||
|
array('post_id' => 8),
|
||||||
|
),
|
||||||
|
),
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* @dataProvider get_global_visibility_sql_data
|
||||||
|
*/
|
||||||
|
public function test_get_global_visibility_sql($table, $mode, $forum_ids, $table_alias, $permissions, $expected)
|
||||||
|
{
|
||||||
|
global $db, $auth;
|
||||||
|
|
||||||
|
$db = $this->new_dbal();
|
||||||
|
|
||||||
|
// Create auth mock
|
||||||
|
$auth = $this->getMock('phpbb_auth');
|
||||||
|
$auth->expects($this->any())
|
||||||
|
->method('acl_getf')
|
||||||
|
->with($this->stringContains('_'), $this->anything())
|
||||||
|
->will($this->returnValueMap($permissions));
|
||||||
|
|
||||||
|
$result = $db->sql_query('SELECT ' . $mode . '_id
|
||||||
|
FROM ' . $table . '
|
||||||
|
WHERE ' . phpbb_content_visibility::get_global_visibility_sql($mode, $forum_ids, $table_alias) . '
|
||||||
|
ORDER BY ' . $mode . '_id ASC');
|
||||||
|
|
||||||
|
$this->assertEquals($expected, $db->sql_fetchrowset($result));
|
||||||
|
}
|
||||||
|
}
|
||||||
Loading…
Add table
Reference in a new issue