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 @@
+
+
+
+ topic_id
+ user_id
+
+ 1
+ 2
+
+
+ 1
+ 3
+
+
+ 1
+ 4
+
+
+ 1
+ 5
+
+
+ 1
+ 6
+
+
+ 1
+ 7
+
+
+
+ item_type
+ user_id
+ item_id
+ item_parent_id
+ notification_read
+ notification_data
+
+ bookmark
+ 5
+ 1
+ 1
+ 0
+
+
+
+
+ notification_type
+ notification_type_enabled
+
+ bookmark
+ 1
+
+
+
+ post_id
+ topic_id
+ forum_id
+ post_text
+
+ 1
+ 1
+ 1
+
+
+
+
+ topic_id
+ forum_id
+
+ 1
+ 1
+
+
+
+ user_id
+ username_clean
+ user_permissions
+ user_sig
+ user_occ
+ user_interests
+
+ 2
+ poster
+
+
+
+
+
+
+ 3
+ test
+
+
+
+
+
+
+ 4
+ unauthorized
+
+
+
+
+
+
+ 5
+ notified
+
+
+
+
+
+
+ 6
+ disabled
+
+
+
+
+
+
+ 7
+ default
+
+
+
+
+
+
+
+ item_type
+ item_id
+ user_id
+ method
+ notify
+
+ bookmark
+ 0
+ 2
+
+ 1
+
+
+ bookmark
+ 0
+ 3
+
+ 1
+
+
+ bookmark
+ 0
+ 4
+
+ 1
+
+
+ bookmark
+ 0
+ 5
+
+ 1
+
+
+ bookmark
+ 0
+ 6
+
+ 0
+
+
+
diff --git a/tests/notification/fixtures/submit_post_notification.xml b/tests/notification/fixtures/submit_post_post.xml
similarity index 66%
rename from tests/notification/fixtures/submit_post_notification.xml
rename to 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 @@
-
- topic_id
- user_id
-
- 1
- 2
-
-
- 1
- 3
-
-
- 1
- 4
-
-
- 1
- 5
-
-
- 1
- 6
-
-
- 1
- 7
-
-
forum_id
user_id
@@ -63,22 +35,6 @@
0
-
- quote
- 5
- 1
- 1
- 0
-
-
-
- bookmark
- 5
- 1
- 1
- 0
-
-
post
8
@@ -95,14 +51,6 @@
post
1
-
- quote
- 1
-
-
- bookmark
- 1
-
post_id
@@ -223,20 +171,6 @@
1
-
- quote
- 0
- 2
-
- 1
-
-
- bookmark
- 0
- 2
-
- 1
-
post
0
@@ -244,20 +178,6 @@
1
-
- quote
- 0
- 3
-
- 1
-
-
- bookmark
- 0
- 3
-
- 1
-
post
0
@@ -265,20 +185,6 @@
1
-
- quote
- 0
- 4
-
- 1
-
-
- bookmark
- 0
- 4
-
- 1
-
post
0
@@ -286,20 +192,6 @@
1
-
- quote
- 0
- 5
-
- 1
-
-
- bookmark
- 0
- 5
-
- 1
-
post
0
@@ -307,20 +199,6 @@
1
-
- quote
- 0
- 6
-
- 0
-
-
- bookmark
- 0
- 6
-
- 0
-
post
0
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 @@
+
+
+
+ item_type
+ user_id
+ item_id
+ item_parent_id
+ notification_read
+ notification_data
+
+ quote
+ 5
+ 1
+ 1
+ 0
+
+
+
+
+ notification_type
+ notification_type_enabled
+
+ quote
+ 1
+
+
+
+ post_id
+ topic_id
+ forum_id
+ post_text
+
+ 1
+ 1
+ 1
+
+
+
+
+ topic_id
+ forum_id
+
+ 1
+ 1
+
+
+
+ user_id
+ username_clean
+ user_permissions
+ user_sig
+ user_occ
+ user_interests
+
+ 2
+ poster
+
+
+
+
+
+
+ 3
+ test
+
+
+
+
+
+
+ 4
+ unauthorized
+
+
+
+
+
+
+ 5
+ notified
+
+
+
+
+
+
+ 6
+ disabled
+
+
+
+
+
+
+ 7
+ default
+
+
+
+
+
+
+
+ item_type
+ item_id
+ user_id
+ method
+ notify
+
+ quote
+ 0
+ 2
+
+ 1
+
+
+ quote
+ 0
+ 3
+
+ 1
+
+
+ quote
+ 0
+ 4
+
+ 1
+
+
+ quote
+ 0
+ 5
+
+ 1
+
+
+ quote
+ 0
+ 6
+
+ 0
+
+
+
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()