diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2012-10-23 23:35:50 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2012-10-23 23:35:50 +0200 |
| commit | 3236229188d9b36105633223f4b2df6c6b3eb0ad (patch) | |
| tree | 26a4ce8655c6c56d6ba2bb59320514a3b72aa08b /tests/content_visibility/delete_post_test.php | |
| parent | 727759c4d8bda3f1534b1e3366ce0eeeb27c887f (diff) | |
| download | forums-3236229188d9b36105633223f4b2df6c6b3eb0ad.tar forums-3236229188d9b36105633223f4b2df6c6b3eb0ad.tar.gz forums-3236229188d9b36105633223f4b2df6c6b3eb0ad.tar.bz2 forums-3236229188d9b36105633223f4b2df6c6b3eb0ad.tar.xz forums-3236229188d9b36105633223f4b2df6c6b3eb0ad.zip | |
[feature/soft-delete] Update unit tests to new table structure
PHPBB3-9567
Diffstat (limited to 'tests/content_visibility/delete_post_test.php')
| -rw-r--r-- | tests/content_visibility/delete_post_test.php | 67 |
1 files changed, 40 insertions, 27 deletions
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php index 0bb7870521..b76e27e58e 100644 --- a/tests/content_visibility/delete_post_test.php +++ b/tests/content_visibility/delete_post_test.php @@ -26,7 +26,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case $info_data = array( 'topic_first_post_id' => 1, 'topic_last_post_id' => 3, - 'topic_replies_real' => 3, + 'topic_posts' => 3, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_visibility' => ITEM_APPROVED, 'post_time' => 2, 'post_visibility' => ITEM_APPROVED, @@ -52,13 +54,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 1, 'topic_last_post_id' => 3, - 'topic_replies' => 1, - 'topic_replies_real' => 1, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 3), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3), ), ), array( @@ -77,13 +80,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 2, 'topic_last_post_id' => 3, - 'topic_replies' => 1, - 'topic_replies_real' => 1, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 3), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3), ), ), array( @@ -102,13 +106,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 1, 'topic_last_post_id' => 2, - 'topic_replies' => 1, - 'topic_replies_real' => 1, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 2), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2), ), ), array( @@ -127,13 +132,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 1, 'topic_last_post_id' => 3, - 'topic_replies' => 1, - 'topic_replies_real' => 2, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 1, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 3), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3), ), ), array( @@ -152,13 +158,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 2, 'topic_last_post_id' => 3, - 'topic_replies' => 1, - 'topic_replies_real' => 2, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 1, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 3), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3), ), ), array( @@ -177,13 +184,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_APPROVED, 'topic_first_post_id' => 1, 'topic_last_post_id' => 2, - 'topic_replies' => 1, - 'topic_replies_real' => 2, + 'topic_posts' => 2, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 1, 'topic_delete_reason' => '', ), ), array( - array('forum_posts' => 2, 'forum_topics' => 1, 'forum_topics_real' => 1, 'forum_last_post_id' => 2), + array('forum_posts' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2), ), ), @@ -192,7 +200,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case array( 'topic_first_post_id' => 4, 'topic_last_post_id' => 4, - 'topic_replies_real' => 0, + 'topic_posts' => 1, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_visibility' => ITEM_APPROVED, 'post_time' => 4, 'post_visibility' => ITEM_APPROVED, @@ -206,7 +216,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case array( ), array( - array('forum_posts' => 0, 'forum_topics' => 0, 'forum_topics_real' => 0, 'forum_last_post_id' => 0), + array('forum_posts' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 0), ), ), @@ -215,7 +225,9 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case array( 'topic_first_post_id' => 4, 'topic_last_post_id' => 4, - 'topic_replies_real' => 0, + 'topic_posts' => 1, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 0, 'topic_visibility' => ITEM_APPROVED, 'post_time' => 4, 'post_visibility' => ITEM_APPROVED, @@ -232,13 +244,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case 'topic_visibility' => ITEM_DELETED, 'topic_first_post_id' => 4, 'topic_last_post_id' => 4, - 'topic_replies' => 0, - 'topic_replies_real' => 0, + 'topic_posts' => 0, + 'topic_posts_unapproved' => 0, + 'topic_posts_softdeleted' => 1, 'topic_delete_reason' => 'soft delete', ), ), array( - array('forum_posts' => 0, 'forum_topics' => 0, 'forum_topics_real' => 1, 'forum_last_post_id' => 0), + array('forum_posts' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 1, 'forum_last_post_id' => 0), ), ), ); @@ -274,14 +287,14 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case $this->assertEquals($expected_posts, $db->sql_fetchrowset($result)); $db->sql_freeresult($result); - $result = $db->sql_query('SELECT topic_visibility, topic_first_post_id, topic_last_post_id, topic_replies, topic_replies_real, topic_delete_reason + $result = $db->sql_query('SELECT topic_visibility, topic_first_post_id, topic_last_post_id, topic_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_delete_reason FROM phpbb_topics WHERE topic_id = ' . $topic_id); $this->assertEquals($expected_topic, $db->sql_fetchrowset($result)); $db->sql_freeresult($result); - $result = $db->sql_query('SELECT forum_posts, forum_topics, forum_topics_real, forum_last_post_id + $result = $db->sql_query('SELECT forum_posts, forum_posts_unapproved, forum_posts_softdeleted, forum_topics, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id FROM phpbb_forums WHERE forum_id = ' . $forum_id); |