[ticket/12990] Fix unit tests

PHPBB3-12990

1 files changed, 18 insertions, 17 deletions

diff --git a/tests/notification/base.php b/tests/notification/base.php
index bfa9d2a1a4..c97b7c24e2 100644
--- a/tests/notification/base.php
+++ b/tests/notification/base.php
@@ -21,21 +21,21 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 	{
 		return array(
 			'test',
-			'approve_post',
-			'approve_topic',
-			'bookmark',
-			'disapprove_post',
-			'disapprove_topic',
-			'pm',
-			'post',
-			'post_in_queue',
-			'quote',
-			'report_pm',
-			'report_pm_closed',
-			'report_post',
-			'report_post_closed',
-			'topic',
-			'topic_in_queue',
+			'notification.type.approve_post',
+			'notification.type.approve_topic',
+			'notification.type.bookmark',
+			'notification.type.disapprove_post',
+			'notification.type.disapprove_topic',
+			'notification.type.pm',
+			'notification.type.post',
+			'notification.type.post_in_queue',
+			'notification.type.quote',
+			'notification.type.report_pm',
+			'notification.type.report_pm_closed',
+			'notification.type.report_post',
+			'notification.type.report_post_closed',
+			'notification.type.topic',
+			'notification.type.topic_in_queue',
 		);
 	}
 
@@ -92,10 +92,11 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case
 		$types = array();
 		foreach ($this->get_notification_types() as $type)
 		{
-			$class = $this->build_type('phpbb\notification\type\\' . $type);
+			$type_parts = explode('.', $type);
+			$class = $this->build_type('phpbb\notification\type\\' . array_pop($type_parts));
 
 			$types[$type] = $class;
-			$this->container->set('notification.type.' . $type, $class);
+			$this->container->set($type, $class);
 		}
 
 		$this->notifications->set_var('notification_types', $types);