aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-06-30 13:38:49 -0500
committerJoas Schilling <nickvergessen@gmx.de>2012-08-29 17:50:11 +0200
commita80cfafdd91a384ba810a8ee0d43406bba955faa (patch)
tree0c00c9e50e65e8e6af11494c63645d916bd38216 /tests
parent67393751356e9f02f7c1ab0a2f7a3a508403edc3 (diff)
downloadforums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.gz
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.bz2
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.tar.xz
forums-a80cfafdd91a384ba810a8ee0d43406bba955faa.zip
[feature/soft-delete] Rename phpbb_visibility class to phpbb_content_visibility
Rename the class to more accurately reflect what it does. PHPBB3-9657
Diffstat (limited to 'tests')
-rw-r--r--tests/class_visibility/class_visibility_test.php64
1 files changed, 32 insertions, 32 deletions
diff --git a/tests/class_visibility/class_visibility_test.php b/tests/class_visibility/class_visibility_test.php
index edcf5c2e6f..8503867b09 100644
--- a/tests/class_visibility/class_visibility_test.php
+++ b/tests/class_visibility/class_visibility_test.php
@@ -12,7 +12,7 @@ require_once 'test_framework/framework.php';
require_once 'class_visibility/auth_mock.php';
require_once 'class_visibility/user_mock.php';
-require_once '../phpBB/includes/class_visibility.php';
+require_once '../phpBB/includes/class_content_visibility.php';
require_once '../phpBB/includes/db/mysqli.php';
require_once '../phpBB/includes/functions.php';
require_once '../phpBB/includes/constants.php';
@@ -25,30 +25,30 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['auth'] = new phpbb_acl_mock_none;
- $sql1 = phpbb_visibility::get_visibility_sql('topic', 1, '');
+ $sql1 = phpbb_content_visibility::get_visibility_sql('topic', 1, '');
$this->assertEquals('topic_visibility = 1', $sql1);
- $sql2 = phpbb_visibility::get_visibility_sql('post', 1, '');
+ $sql2 = phpbb_content_visibility::get_visibility_sql('post', 1, '');
$this->assertEquals('post_visibility = 1', $sql2);
$GLOBALS['auth'] = new phpbb_acl_mock_founder;
- $sql3 = phpbb_visibility::get_visibility_sql('topic', 1, '');
+ $sql3 = phpbb_content_visibility::get_visibility_sql('topic', 1, '');
$this->assertEquals('topic_visibility IN (1, 0, 2)', $sql3);
- $sql4 = phpbb_visibility::get_visibility_sql('post', 1, '');
+ $sql4 = phpbb_content_visibility::get_visibility_sql('post', 1, '');
$this->assertEquals('post_visibility IN (1, 0, 2)', $sql4);
$GLOBALS['auth'] = new phpbb_acl_mock_user;
$GLOBALS['user'] = new phpbb_user_mock;
$GLOBALS['user']->data['user_id'] = 2;
- $sql1 = phpbb_visibility::get_visibility_sql('topic', 1, '');
+ $sql1 = phpbb_content_visibility::get_visibility_sql('topic', 1, '');
$this->assertEquals('(topic_visibility = 1
OR (topic_visibility = 2
AND topic_poster = 2))', $sql1);
- $sql2 = phpbb_visibility::get_visibility_sql('post', 1, '');
+ $sql2 = phpbb_content_visibility::get_visibility_sql('post', 1, '');
$this->assertEquals('(post_visibility = 1
OR (post_visibility = 2
AND poster_id = 2))', $sql2);
@@ -58,28 +58,28 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
{
$GLOBALS['auth'] = new phpbb_acl_mock_none;
- $sql1 = phpbb_visibility::get_visibility_sql_global('topic', array(), '');
+ $sql1 = phpbb_content_visibility::get_visibility_sql_global('topic', array(), '');
$this->assertEquals('(topic_visibility = 1)', $sql1);
- $sql2 = phpbb_visibility::get_visibility_sql_global('post', array(), '');
+ $sql2 = phpbb_content_visibility::get_visibility_sql_global('post', array(), '');
$this->assertEquals('(post_visibility = 1)', $sql2);
- $sql3 = phpbb_visibility::get_visibility_sql_global('post', range(2, 15), '');
+ $sql3 = phpbb_content_visibility::get_visibility_sql_global('post', range(2, 15), '');
$this->assertEquals('(post_visibility = 1)', $sql3);
$GLOBALS['auth'] = new phpbb_acl_mock_founder;
- $sql1 = phpbb_visibility::get_visibility_sql_global('topic', array(), '');
+ $sql1 = phpbb_content_visibility::get_visibility_sql_global('topic', array(), '');
$this->assertEquals('(topic_visibility = 1 OR (topic_visibility = 0
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)) OR (topic_visibility = 2
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)))', $sql1);
- $sql2 = phpbb_visibility::get_visibility_sql_global('post', array(), '');
+ $sql2 = phpbb_content_visibility::get_visibility_sql_global('post', array(), '');
$this->assertEquals('(post_visibility = 1 OR (post_visibility = 0
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)) OR (post_visibility = 2
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)))', $sql2);
- $sql3 = phpbb_visibility::get_visibility_sql_global('post', range(2, 14), '');
+ $sql3 = phpbb_content_visibility::get_visibility_sql_global('post', range(2, 14), '');
$this->assertEquals('(post_visibility = 1 OR (post_visibility = 0
AND forum_id = 1) OR (post_visibility = 2
AND forum_id = 1))', $sql3);
@@ -88,17 +88,17 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
$GLOBALS['user'] = new phpbb_user_mock;
$GLOBALS['user']->data['user_id'] = 2;
- $sql1 = phpbb_visibility::get_visibility_sql_global('topic', array(), '');
+ $sql1 = phpbb_content_visibility::get_visibility_sql_global('topic', array(), '');
$this->assertEquals('(topic_visibility = 1 OR (topic_poster = 2
AND topic_visibility = 2
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)))', $sql1);
- $sql2 = phpbb_visibility::get_visibility_sql_global('post', array(), '');
+ $sql2 = phpbb_content_visibility::get_visibility_sql_global('post', array(), '');
$this->assertEquals('(post_visibility = 1 OR (poster_id = 2
AND post_visibility = 2
AND forum_id IN (1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14)))', $sql2);
- $sql3 = phpbb_visibility::get_visibility_sql_global('post', range(2, 14), '');
+ $sql3 = phpbb_content_visibility::get_visibility_sql_global('post', range(2, 14), '');
$this->assertEquals('(post_visibility = 1 OR (poster_id = 2
AND post_visibility = 2
AND forum_id = 1))', $sql3);
@@ -110,27 +110,27 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
$GLOBALS['user']->data['user_id'] = 2;
$GLOBALS['auth'] = new phpbb_acl_mock_founder;
- $result = phpbb_visibility::can_soft_delete(1, 4, true);
+ $result = phpbb_content_visibility::can_soft_delete(1, 4, true);
$this->assertEquals(true, $result);
- $result = phpbb_visibility::can_soft_delete(1, 2, false);
+ $result = phpbb_content_visibility::can_soft_delete(1, 2, false);
$this->assertEquals(true, $result);
$GLOBALS['auth'] = new phpbb_acl_mock_none;
- $result = phpbb_visibility::can_soft_delete(1, 4, true);
+ $result = phpbb_content_visibility::can_soft_delete(1, 4, true);
$this->assertEquals(false, $result);
- $result = phpbb_visibility::can_soft_delete(1, 2, false);
+ $result = phpbb_content_visibility::can_soft_delete(1, 2, false);
$this->assertEquals(false, $result);
$GLOBALS['auth'] = new phpbb_acl_mock_user;
- $result = phpbb_visibility::can_soft_delete(1, 4, true);
+ $result = phpbb_content_visibility::can_soft_delete(1, 4, true);
$this->assertEquals(false, $result);
- $result = phpbb_visibility::can_soft_delete(1, 2, false);
+ $result = phpbb_content_visibility::can_soft_delete(1, 2, false);
$this->assertEquals(true, $result);
- $result = phpbb_visibility::can_soft_delete(1, 2, true);
+ $result = phpbb_content_visibility::can_soft_delete(1, 2, true);
$this->assertEquals(false, $result);
}
@@ -140,27 +140,27 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
$GLOBALS['user']->data['user_id'] = 2;
$GLOBALS['auth'] = new phpbb_acl_mock_founder;
- $result = phpbb_visibility::can_restore(1, 4, true);
+ $result = phpbb_content_visibility::can_restore(1, 4, true);
$this->assertEquals(true, $result);
- $result = phpbb_visibility::can_restore(1, 2, false);
+ $result = phpbb_content_visibility::can_restore(1, 2, false);
$this->assertEquals(true, $result);
$GLOBALS['auth'] = new phpbb_acl_mock_none;
- $result = phpbb_visibility::can_restore(1, 4, true);
+ $result = phpbb_content_visibility::can_restore(1, 4, true);
$this->assertEquals(false, $result);
- $result = phpbb_visibility::can_restore(1, 2, false);
+ $result = phpbb_content_visibility::can_restore(1, 2, false);
$this->assertEquals(false, $result);
$GLOBALS['auth'] = new phpbb_acl_mock_user;
- $result = phpbb_visibility::can_restore(1, 4, true);
+ $result = phpbb_content_visibility::can_restore(1, 4, true);
$this->assertEquals(false, $result);
- $result = phpbb_visibility::can_restore(1, 2, false);
+ $result = phpbb_content_visibility::can_restore(1, 2, false);
$this->assertEquals(true, $result);
- $result = phpbb_visibility::can_restore(1, 2, true);
+ $result = phpbb_content_visibility::can_restore(1, 2, true);
$this->assertEquals(false, $result);
}
@@ -170,7 +170,7 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
$topic_row = array('topic_replies' => 3);
$sql_data = array();
- phpbb_visibility::hide_topic(4, 2, $topic_row, $sql_data);
+ phpbb_content_visibility::hide_topic(4, 2, $topic_row, $sql_data);
$this->assertEquals(
array(FORUMS_TABLE => 'forum_topics = forum_topics - 1, forum_posts = forum_posts - 4', USERS_TABLE => 'user_posts = user_posts - 1'),
$sql_data);
@@ -181,7 +181,7 @@ class phpbb_class_visibility_test extends PHPUnit_Framework_TestCase
$GLOBALS['auth'] = new phpbb_acl_mock_founder;
$sql_data = array();
- phpbb_visibility::hide_post(4, 111122211, $sql_data);
+ phpbb_content_visibility::hide_post(4, 111122211, $sql_data);
$this->assertEquals(
array(FORUMS_TABLE => 'forum_posts = forum_posts - 1',
TOPICS_TABLE => 'topic_replies = topic_replies - 1, topic_last_view_time = 111122211',