diff options
| author | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2013-09-16 02:41:03 +0200 |
| commit | 2472271bc0cd7c15c77783c86ccaac643ab1756a (patch) | |
| tree | 0877d20f422411ed20b398c616b26b69ff30fdcd /tests/notification | |
| parent | 21bbb5850349326464204bdb1bea7ecf5a88c10a (diff) | |
| download | forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.gz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.bz2 forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.tar.xz forums-2472271bc0cd7c15c77783c86ccaac643ab1756a.zip | |
[ticket/11700] Fix tests after merging new develop code
PHPBB3-11700
Diffstat (limited to 'tests/notification')
| -rw-r--r-- | tests/notification/base.php | 12 | ||||
| -rw-r--r-- | tests/notification/group_request_test.php | 6 |
2 files changed, 9 insertions, 9 deletions
diff --git a/tests/notification/base.php b/tests/notification/base.php index 8de162a1fb..549545f01b 100644 --- a/tests/notification/base.php +++ b/tests/notification/base.php @@ -46,17 +46,17 @@ abstract class phpbb_tests_notification_base extends phpbb_database_test_case global $db, $config, $user, $auth, $cache, $phpbb_container; $db = $this->db = $this->new_dbal(); - $config = $this->config = new phpbb_config(array( + $config = $this->config = new \phpbb\config\config(array( 'allow_privmsg' => true, 'allow_bookmarks' => true, 'allow_topic_notify' => true, 'allow_forum_notify' => true, )); - $user = $this->user = new phpbb_user(); - $this->user_loader = new phpbb_user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); + $user = $this->user = new \phpbb\user(); + $this->user_loader = new \phpbb\user_loader($this->db, $phpbb_root_path, $phpEx, 'phpbb_users'); $auth = $this->auth = new phpbb_mock_notifications_auth(); - $cache = $this->cache = new phpbb_cache_service( - new phpbb_cache_driver_null(), + $cache = $this->cache = new \phpbb\cache\service( + new \phpbb\cache\driver\null(), $this->config, $this->db, $phpbb_root_path, @@ -87,7 +87,7 @@ 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); + $class = $this->build_type('phpbb\notification\type\\' . $type); $types[$type] = $class; $this->container->set('notification.type.' . $type, $class); diff --git a/tests/notification/group_request_test.php b/tests/notification/group_request_test.php index 368e4ae973..b812fff8f8 100644 --- a/tests/notification/group_request_test.php +++ b/tests/notification/group_request_test.php @@ -37,17 +37,17 @@ class phpbb_notification_group_request_test extends phpbb_tests_notification_bas set_config(false, false, false, $this->config); - $this->container->set('groupposition.legend', new phpbb_groupposition_legend( + $this->container->set('groupposition.legend', new \phpbb\groupposition\legend( $this->db, $this->user )); - $this->container->set('groupposition.teampage', new phpbb_groupposition_teampage( + $this->container->set('groupposition.teampage', new \phpbb\groupposition\teampage( $this->db, $this->user, $this->cache->get_driver() )); $phpbb_dispatcher = new phpbb_mock_event_dispatcher; - $phpbb_log = new phpbb_log_null(); + $phpbb_log = new \phpbb\log\null(); // Now on to the actual test |