[ticket/11405] Use different fixtures so it's not a total mess

PHPBB3-11405

4 files changed, 319 insertions, 123 deletions

diff --git a/tests/notification/fixtures/submit_post_bookmark.xml b/tests/notification/fixtures/submit_post_bookmark.xml
new file mode 100644
index 0000000000..b669d4c1b6
--- /dev/null
+++ b/tests/notification/fixtures/submit_post_bookmark.xml
@@ -0,0 +1,173 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_bookmarks">
+		<column>topic_id</column>
+		<column>user_id</column>
+		<row>
+			<value>1</value>
+			<value>2</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>3</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>4</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>5</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>6</value>
+		</row>
+		<row>
+			<value>1</value>
+			<value>7</value>
+		</row>
+	</table>
+	<table name="phpbb_notifications">
+		<column>item_type</column>
+		<column>user_id</column>
+		<column>item_id</column>
+		<column>item_parent_id</column>
+		<column>notification_read</column>
+		<column>notification_data</column>
+		<row>
+			<value>bookmark</value>
+			<value>5</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_notification_types">
+		<column>notification_type</column>
+		<column>notification_type_enabled</column>
+		<row>
+			<value>bookmark</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_posts">
+		<column>post_id</column>
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<column>post_text</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_topics">
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>2</value>
+			<value>poster</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>test</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>unauthorized</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>notified</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>disabled</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>default</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_notifications">
+		<column>item_type</column>
+		<column>item_id</column>
+		<column>user_id</column>
+		<column>method</column>
+		<column>notify</column>
+		<row>
+			<value>bookmark</value>
+			<value>0</value>
+			<value>2</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>bookmark</value>
+			<value>0</value>
+			<value>3</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>bookmark</value>
+			<value>0</value>
+			<value>4</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>bookmark</value>
+			<value>0</value>
+			<value>5</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>bookmark</value>
+			<value>0</value>
+			<value>6</value>
+			<value></value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/notification/fixtures/submit_post_notification.xml b/tests/notification/fixtures/submit_post_post.xml
index 3f46bc2962..cead4f7c26 100644
--- a/tests/notification/fixtures/submit_post_notification.xml
+++ b/tests/notification/fixtures/submit_post_post.xml
@@ -1,33 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <dataset>
-	<table name="phpbb_bookmarks">
-		<column>topic_id</column>
-		<column>user_id</column>
-		<row>
-			<value>1</value>
-			<value>2</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>3</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>4</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>5</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>6</value>
-		</row>
-		<row>
-			<value>1</value>
-			<value>7</value>
-		</row>
-	</table>
 	<table name="phpbb_forums_watch">
 		<column>forum_id</column>
 		<column>user_id</column>
@@ -64,22 +36,6 @@
 			<value></value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>5</value>
-			<value>1</value>
-			<value>1</value>
-			<value>0</value>
-			<value></value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>5</value>
-			<value>1</value>
-			<value>1</value>
-			<value>0</value>
-			<value></value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>8</value>
 			<value>1</value>
@@ -95,14 +51,6 @@
 			<value>post</value>
 			<value>1</value>
 		</row>
-		<row>
-			<value>quote</value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>1</value>
-		</row>
 	</table>
 	<table name="phpbb_posts">
 		<column>post_id</column>
@@ -224,20 +172,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>0</value>
-			<value>2</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>0</value>
-			<value>2</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>0</value>
 			<value>3</value>
@@ -245,20 +179,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>0</value>
-			<value>3</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>0</value>
-			<value>3</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>0</value>
 			<value>4</value>
@@ -266,20 +186,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>0</value>
-			<value>4</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>0</value>
-			<value>4</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>0</value>
 			<value>5</value>
@@ -287,20 +193,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>0</value>
-			<value>5</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>0</value>
-			<value>5</value>
-			<value></value>
-			<value>1</value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>0</value>
 			<value>6</value>
@@ -308,20 +200,6 @@
 			<value>1</value>
 		</row>
 		<row>
-			<value>quote</value>
-			<value>0</value>
-			<value>6</value>
-			<value></value>
-			<value>0</value>
-		</row>
-		<row>
-			<value>bookmark</value>
-			<value>0</value>
-			<value>6</value>
-			<value></value>
-			<value>0</value>
-		</row>
-		<row>
 			<value>post</value>
 			<value>0</value>
 			<value>7</value>
diff --git a/tests/notification/fixtures/submit_post_quote.xml b/tests/notification/fixtures/submit_post_quote.xml
new file mode 100644
index 0000000000..884a84af4a
--- /dev/null
+++ b/tests/notification/fixtures/submit_post_quote.xml
@@ -0,0 +1,145 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<dataset>
+	<table name="phpbb_notifications">
+		<column>item_type</column>
+		<column>user_id</column>
+		<column>item_id</column>
+		<column>item_parent_id</column>
+		<column>notification_read</column>
+		<column>notification_data</column>
+		<row>
+			<value>quote</value>
+			<value>5</value>
+			<value>1</value>
+			<value>1</value>
+			<value>0</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_notification_types">
+		<column>notification_type</column>
+		<column>notification_type_enabled</column>
+		<row>
+			<value>quote</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_posts">
+		<column>post_id</column>
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<column>post_text</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+			<value>1</value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_topics">
+		<column>topic_id</column>
+		<column>forum_id</column>
+		<row>
+			<value>1</value>
+			<value>1</value>
+		</row>
+	</table>
+	<table name="phpbb_users">
+		<column>user_id</column>
+		<column>username_clean</column>
+		<column>user_permissions</column>
+		<column>user_sig</column>
+		<column>user_occ</column>
+		<column>user_interests</column>
+		<row>
+			<value>2</value>
+			<value>poster</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>3</value>
+			<value>test</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>4</value>
+			<value>unauthorized</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>5</value>
+			<value>notified</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>6</value>
+			<value>disabled</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+		<row>
+			<value>7</value>
+			<value>default</value>
+			<value></value>
+			<value></value>
+			<value></value>
+			<value></value>
+		</row>
+	</table>
+	<table name="phpbb_user_notifications">
+		<column>item_type</column>
+		<column>item_id</column>
+		<column>user_id</column>
+		<column>method</column>
+		<column>notify</column>
+		<row>
+			<value>quote</value>
+			<value>0</value>
+			<value>2</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>quote</value>
+			<value>0</value>
+			<value>3</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>quote</value>
+			<value>0</value>
+			<value>4</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>quote</value>
+			<value>0</value>
+			<value>5</value>
+			<value></value>
+			<value>1</value>
+		</row>
+		<row>
+			<value>quote</value>
+			<value>0</value>
+			<value>6</value>
+			<value></value>
+			<value>0</value>
+		</row>
+	</table>
+</dataset>
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index f458a4896a..d306e3f381 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -39,7 +39,7 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case
 
 	public function getDataSet()
 	{
-		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_notification.xml');
+		return $this->createXMLDataSet(dirname(__FILE__) . '/fixtures/submit_post_' . $this->item_type . '.xml');
 	}
 
 	public function setUp()