diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-04-29 22:41:08 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-04-29 22:41:08 -0500 |
| commit | 78c22248fa35dd01c0e30d1ea896379890cefe66 (patch) | |
| tree | 4049c405de67b3fec9550ddd9240500e329d7035 | |
| parent | 4cd0914f8976913de0ec46cc78c8ac5731415838 (diff) | |
| download | forums-78c22248fa35dd01c0e30d1ea896379890cefe66.tar forums-78c22248fa35dd01c0e30d1ea896379890cefe66.tar.gz forums-78c22248fa35dd01c0e30d1ea896379890cefe66.tar.bz2 forums-78c22248fa35dd01c0e30d1ea896379890cefe66.tar.xz forums-78c22248fa35dd01c0e30d1ea896379890cefe66.zip | |
[ticket/11413] Fix some more tests
PHPBB3-11413
| -rw-r--r-- | tests/notification/submit_post_base.php | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php index 953bedac80..5fbcfc8776 100644 --- a/tests/notification/submit_post_base.php +++ b/tests/notification/submit_post_base.php @@ -119,8 +119,9 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case public function test_submit_post($additional_post_data, $expected_before, $expected_after) { $sql = 'SELECT user_id, item_id, item_parent_id - FROM ' . NOTIFICATIONS_TABLE . " - WHERE item_type = '" . $this->item_type . "' + FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATIONS_TYPES_TABLE . " nt + WHERE nt.notification_type_name = '" . $this->item_type . "' + AND n.notification_type_id = nt.notification_type_id ORDER BY user_id, item_id ASC"; $result = $this->db->sql_query($sql); $this->assertEquals($expected_before, $this->db->sql_fetchrowset($result)); @@ -131,8 +132,9 @@ class phpbb_notification_submit_post_base extends phpbb_database_test_case submit_post('reply', '', 'poster-name', POST_NORMAL, $poll_data, $post_data, false, false); $sql = 'SELECT user_id, item_id, item_parent_id - FROM ' . NOTIFICATIONS_TABLE . " - WHERE item_type = '" . $this->item_type . "' + FROM ' . NOTIFICATIONS_TABLE . ' n, ' . NOTIFICATIONS_TYPES_TABLE . " nt + WHERE nt.notification_type_name = '" . $this->item_type . "' + AND n.notification_type_id = nt.notification_type_id ORDER BY user_id ASC, item_id ASC"; $result = $this->db->sql_query($sql); $this->assertEquals($expected_after, $this->db->sql_fetchrowset($result)); |