makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17029] Add tests for deleting of last post with different visibility

Browse source 
PHPBB3-17029
This commit is contained in:
Marc Alexander 2023-10-01 11:12:14 +02:00
parent d76c571ad1
commit 4bf78d139b
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 141 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

92
tests/content_visibility/delete_post_test.php
View file

@ -45,6 +45,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 2, 'post_time' => 2,
)), )),
false, 'harddelete', false, 'harddelete',
3, // expected next post id
array( array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
//array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), //array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@ -74,6 +75,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 1, 'post_time' => 1,
)), )),
false, 'harddelete', false, 'harddelete',
2, // expected next post id
array( array(
//array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), //array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@ -103,6 +105,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 3, 'post_time' => 3,
)), )),
false, 'harddelete', false, 'harddelete',
2, // expected next post id
array( array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@ -132,6 +135,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 2, 'post_time' => 2,
)), )),
true, 'soft delete', true, 'soft delete',
3, // expected next post id
array( array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'), array('post_id' => 2, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'),
@ -161,6 +165,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 1, 'post_time' => 1,
)), )),
true, 'soft delete', true, 'soft delete',
2, // expected next post id
array( array(
array('post_id' => 1, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'), array('post_id' => 1, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => 'soft delete'),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@ -190,6 +195,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_time' => 3, 'post_time' => 3,
)), )),
true, 'soft delete', true, 'soft delete',
3, // expected next post id
array( array(
array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 1, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''), array('post_id' => 2, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
@ -230,6 +236,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_reported' => false, 'post_reported' => false,
), ),
false, 'harddelete', false, 'harddelete',
false, // expected next post id
array( array(
), ),
array( array(
@ -258,6 +265,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
'post_reported' => false, 'post_reported' => false,
), ),
true, 'soft delete', true, 'soft delete',
false, // expected next post id
array( array(
array('post_id' => 4, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''), array('post_id' => 4, 'post_visibility' => ITEM_DELETED, 'post_delete_reason' => ''),
), ),
@ -279,13 +287,93 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
array('user_posts' => 3), array('user_posts' => 3),
), ),
), ),
// Delete actual last post that is unapproved
array(
3, 3, 6,
array(
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_visibility' => ITEM_APPROVED,
'post_time' => 4,
'post_visibility' => ITEM_UNAPPROVED,
'post_postcount' => true,
'poster_id' => 1,
'post_reported' => false,
),
false, 'harddelete',
5, // expected next post id
array(
array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
// array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''),
),
array(
array(
'topic_visibility' => ITEM_APPROVED,
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 0,
'topic_posts_softdeleted' => 0,
'topic_delete_reason' => '',
),
),
array(
array('forum_posts_approved' => 1, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5),
),
array(
array('user_posts' => 4),
),
),
// Hard delete last approved post
array(
3, 3, 5,
array(
'topic_first_post_id' => 5,
'topic_last_post_id' => 5,
'topic_posts_approved' => 1,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_visibility' => ITEM_APPROVED,
'post_time' => 4,
'post_visibility' => ITEM_APPROVED,
'post_postcount' => true,
'poster_id' => 1,
'post_reported' => false,
),
false, 'harddelete',
6, // expected next post id
array(
//array('post_id' => 5, 'post_visibility' => ITEM_APPROVED, 'post_delete_reason' => ''),
array('post_id' => 6, 'post_visibility' => ITEM_UNAPPROVED, 'post_delete_reason' => ''),
),
array(
array(
'topic_visibility' => ITEM_APPROVED,
'topic_first_post_id' => 6,
'topic_last_post_id' => 5, // can't be updated with no valid data
'topic_posts_approved' => 0,
'topic_posts_unapproved' => 1,
'topic_posts_softdeleted' => 0,
'topic_delete_reason' => '',
),
),
array(
array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 1, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 5),
),
array(
array('user_posts' => 3),
),
),
); );
} }
/** /**
* @dataProvider delete_post_data * @dataProvider delete_post_data
*/ */
public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_posts, $expected_topic, $expected_forum, $expected_user) public function test_delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason, $expected_next_post_id, $expected_posts, $expected_topic, $expected_forum, $expected_user)
{ {
global $auth, $cache, $config, $db, $user, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx; global $auth, $cache, $config, $db, $user, $phpbb_container, $phpbb_dispatcher, $phpbb_root_path, $phpEx;
@ -321,7 +409,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
// Works as a workaround for tests // Works as a workaround for tests
$phpbb_container->set('attachment.manager', $attachment_delete); $phpbb_container->set('attachment.manager', $attachment_delete);
delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason); $this->assertSame($expected_next_post_id, delete_post($forum_id, $topic_id, $post_id, $data, $is_soft, $reason));
$result = $db->sql_query('SELECT post_id, post_visibility, post_delete_reason $result = $db->sql_query('SELECT post_id, post_visibility, post_delete_reason
FROM phpbb_posts FROM phpbb_posts

52
tests/content_visibility/fixtures/delete_post.xml
View file

@ -39,6 +39,19 @@
<value></value> <value></value>
<value></value> <value></value>
</row> </row>
<row>
<value>3</value>
<value>1</value>
<value>1</value>
<value>0</value>
<value>1</value>
<value>0</value>
<value>0</value>
<value>5</value>
<value></value>
<value></value>
<value></value>
</row>
</table> </table>
<table name="phpbb_topics"> <table name="phpbb_topics">
<column>topic_id</column> <column>topic_id</column>
@ -82,6 +95,20 @@
<value>0</value> <value>0</value>
<value>0</value> <value>0</value>
</row> </row>
<row>
<value>3</value>
<value>3</value>
<value>1</value>
<value>Approved</value>
<value>5</value>
<value>5</value>
<value>0</value>
<value>0</value>
<value></value>
<value>1</value>
<value>1</value>
<value>0</value>
</row>
</table> </table>
<table name="phpbb_posts"> <table name="phpbb_posts">
<column>post_id</column> <column>post_id</column>
@ -130,7 +157,6 @@
<value>0</value> <value>0</value>
<value></value> <value></value>
</row> </row>
<row> <row>
<value>4</value> <value>4</value>
<value>1</value> <value>1</value>
@ -143,6 +169,30 @@
<value>0</value> <value>0</value>
<value></value> <value></value>
</row> </row>
<row>
<value>5</value>
<value>1</value>
<value>3</value>
<value>3</value>
<value>1</value>
<value>4</value>
<value>Approved</value>
<value>0</value>
<value>0</value>
<value></value>
</row>
<row>
<value>6</value>
<value>1</value>
<value>3</value>
<value>3</value>
<value>0</value>
<value>4</value>
<value>Unpproved</value>
<value>0</value>
<value>0</value>
<value></value>
</row>
</table> </table>
<table name="phpbb_users"> <table name="phpbb_users">
<column>user_id</column> <column>user_id</column>