From f77a6eaab5485329a3b13922649fb8902e6e397f Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@gmx.de>
Date: Sat, 10 Nov 2012 11:24:52 +0100
Subject: [feature/soft-delete] Fix the rest of *_approved and the delete_post
 unit test

PHPBB3-9567
---
 tests/content_visibility/delete_post_test.php      | 40 +++++++++++-----------
 tests/content_visibility/fixtures/delete_post.xml  |  8 ++---
 .../fixtures/set_topic_visibility.xml              |  2 +-
 3 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'tests')

diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index b76e27e58e..8b5a26a6fb 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -26,7 +26,7 @@ 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_posts'				=> 3,
+			'topic_posts_approved'		=> 3,
 			'topic_posts_unapproved'	=> 0,
 			'topic_posts_softdeleted'	=> 0,
 			'topic_visibility'		=> ITEM_APPROVED,
@@ -54,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 0,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
 			),
 			array(
@@ -80,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 0,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
 			),
 			array(
@@ -106,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 0,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2),
 				),
 			),
 			array(
@@ -132,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 1,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
 			),
 			array(
@@ -158,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 1,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 3),
 				),
 			),
 			array(
@@ -184,14 +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_posts'				=> 2,
+						'topic_posts_approved'		=> 2,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 1,
 						'topic_delete_reason'	=> '',
 					),
 				),
 				array(
-					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),
+					array('forum_posts_approved' => 2, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 1, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 2),
 				),
 			),
 
@@ -200,7 +200,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					'topic_first_post_id'	=> 4,
 					'topic_last_post_id'	=> 4,
-					'topic_posts'				=> 1,
+					'topic_posts_approved'		=> 1,
 					'topic_posts_unapproved'	=> 0,
 					'topic_posts_softdeleted'	=> 0,
 					'topic_visibility'		=> ITEM_APPROVED,
@@ -216,7 +216,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 				),
 				array(
-					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),
+					array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 0, 'forum_topics_approved' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 0, 'forum_last_post_id' => 0),
 				),
 			),
 
@@ -225,7 +225,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
 				array(
 					'topic_first_post_id'	=> 4,
 					'topic_last_post_id'	=> 4,
-					'topic_posts'				=> 1,
+					'topic_posts_approved'		=> 1,
 					'topic_posts_unapproved'	=> 0,
 					'topic_posts_softdeleted'	=> 0,
 					'topic_visibility'		=> ITEM_APPROVED,
@@ -244,14 +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_posts'				=> 0,
+						'topic_posts_approved'		=> 0,
 						'topic_posts_unapproved'	=> 0,
 						'topic_posts_softdeleted'	=> 1,
 						'topic_delete_reason'	=> 'soft delete',
 					),
 				),
 				array(
-					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),
+					array('forum_posts_approved' => 0, 'forum_posts_unapproved' => 0, 'forum_posts_softdeleted' => 1, 'forum_topics_approved' => 0, 'forum_topics_unapproved' => 0, 'forum_topics_softdeleted' => 1, 'forum_last_post_id' => 0),
 				),
 			),
 		);
@@ -287,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_posts, topic_posts_unapproved, topic_posts_softdeleted, topic_delete_reason
+		$result = $db->sql_query('SELECT topic_visibility, topic_first_post_id, topic_last_post_id, topic_posts_approved, 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_posts_unapproved, forum_posts_softdeleted, forum_topics, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id
+		$result = $db->sql_query('SELECT forum_posts_approved, forum_posts_unapproved, forum_posts_softdeleted, forum_topics_approved, forum_topics_unapproved, forum_topics_softdeleted, forum_last_post_id
 			FROM phpbb_forums
 			WHERE forum_id = ' . $forum_id);
 
diff --git a/tests/content_visibility/fixtures/delete_post.xml b/tests/content_visibility/fixtures/delete_post.xml
index fd18b27ae1..deca9c74b6 100644
--- a/tests/content_visibility/fixtures/delete_post.xml
+++ b/tests/content_visibility/fixtures/delete_post.xml
@@ -2,10 +2,10 @@
 <dataset>
 	<table name="phpbb_forums">
 		<column>forum_id</column>
-		<column>forum_posts</column>
+		<column>forum_posts_approved</column>
 		<column>forum_posts_unapproved</column>
 		<column>forum_posts_softdeleted</column>
-		<column>forum_topics</column>
+		<column>forum_topics_approved</column>
 		<column>forum_topics_unapproved</column>
 		<column>forum_topics_softdeleted</column>
 		<column>forum_last_post_id</column>
@@ -50,7 +50,7 @@
 		<column>topic_delete_user</column>
 		<column>topic_delete_time</column>
 		<column>topic_delete_reason</column>
-		<column>topic_posts</column>
+		<column>topic_posts_approved</column>
 		<column>topic_posts_unapproved</column>
 		<column>topic_posts_softdeleted</column>
 
@@ -155,7 +155,7 @@
 		<column>user_interests</column>
 		<row>
 			<value>1</value>
-			<value>1</value>
+			<value>4</value>
 			<value>user 1</value>
 			<value>user 1</value>
 			<value></value>
diff --git a/tests/content_visibility/fixtures/set_topic_visibility.xml b/tests/content_visibility/fixtures/set_topic_visibility.xml
index 9959433287..a875012d4f 100644
--- a/tests/content_visibility/fixtures/set_topic_visibility.xml
+++ b/tests/content_visibility/fixtures/set_topic_visibility.xml
@@ -124,7 +124,7 @@
 		<column>user_interests</column>
 		<row>
 			<value>1</value>
-			<value>1</value>
+			<value>6</value>
 			<value>user 1</value>
 			<value>user 1</value>
 			<value></value>
-- 
cgit v1.2.1