[ticket/11413] Fix notification tests

Send types/methods the cache service, not the driver (not sure why the
driver was sent before)

PHPBB3-11413

1 files changed, 35 insertions, 12 deletions

diff --git a/tests/notification/notification_test.php b/tests/notification/notification_test.php
index beccf55371..5746d0090e 100644
--- a/tests/notification/notification_test.php
+++ b/tests/notification/notification_test.php
@@ -7,6 +7,8 @@
 *
 */
 
+require_once dirname(__FILE__) . '/manager_helper.php';
+
 class phpbb_notification_test extends phpbb_database_test_case
 {
 	protected $notifications, $db, $container, $user, $config, $auth, $cache;
@@ -34,16 +36,23 @@ class phpbb_notification_test extends phpbb_database_test_case
 		$this->user = new phpbb_mock_user();
 		$this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users');
 		$this->auth = new phpbb_mock_notifications_auth();
-		$this->cache = new phpbb_mock_cache();
+		$this->cache = new phpbb_cache_service(
+			new phpbb_cache_driver_null(),
+			$this->config,
+			$this->db,
+			$phpbb_root_path,
+			$phpEx
+		);
 
 		$this->container = new phpbb_mock_container_builder();
 
-		$this->notifications = new phpbb_mock_notifications_notification_manager(
+		$this->notifications = new phpbb_notification_manager_helper(
 			array(),
 			array(),
 			$this->container,
 			$this->user_loader,
 			$this->db,
+			$this->cache,
 			$this->user,
 			$phpbb_root_path,
 			$phpEx,
@@ -121,6 +130,20 @@ class phpbb_notification_test extends phpbb_database_test_case
 
 	public function test_notifications()
 	{
+		$this->db->sql_query('DELETE FROM phpbb_notification_types');
+
+		$types = array('quote', 'bookmark', 'post', 'test');
+		foreach ($types as $id => $type)
+		{
+			$this->db->sql_query('INSERT INTO phpbb_notification_types ' .
+				$this->db->sql_build_array('INSERT', array(
+					'notification_type_id'		=> ($id + 1),
+					'notification_type_name'	=> $type,
+					'notification_type_enabled'	=> 1,
+				))
+			);
+		}
+
 		// Used to test post notifications later
 		$this->db->sql_query('INSERT INTO ' . TOPICS_WATCH_TABLE . ' ' . $this->db->sql_build_array('INSERT', array(
 			'topic_id'			=> 2,
@@ -195,7 +218,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 
 		$expected = array(
 			1 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 1,
 				'item_parent_id'	=> 1,
 				'user_id'	   		=> 0,
@@ -204,7 +227,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'			   	=> array(),
 			),
 			2 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 2,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -213,7 +236,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'				=> array(),
 			),
 			3 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 3,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -222,7 +245,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'			   	=> array(),
 			),
 			4 => array(
-				'item_type'			=> 'post',
+				'notification_type_id'	=> 3,
 				'item_id'			=> 4,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -238,7 +261,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				),
 			),
 			5 => array(
-				'item_type'			=> 'bookmark',
+				'notification_type_id'	=> 2,
 				'item_id'			=> 5,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -301,7 +324,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 
 		$expected = array(
 			1 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 1,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -310,7 +333,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'	=> array(),
 			),
 			2 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 2,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -319,7 +342,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'	=> array(),
 			),
 			3 => array(
-				'item_type'			=> 'test',
+				'notification_type_id'	=> 4,
 				'item_id'			=> 3,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -328,7 +351,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				'notification_data'	=> array(),
 			),
 			4 => array(
-				'item_type'			=> 'post',
+				'notification_type_id'	=> 3,
 				'item_id'			=> 4,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,
@@ -344,7 +367,7 @@ class phpbb_notification_test extends phpbb_database_test_case
 				),
 			),
 			5 => array(
-				'item_type'			=> 'bookmark',
+				'notification_type_id'	=> 2,
 				'item_id'			=> 5,
 				'item_parent_id'	=> 2,
 				'user_id'	   		=> 0,