Julian/phpbb_board3-portal_tlw
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[ticket/690] Make tests compatible with latest version of phpunit & phpBB

Browse Source 
B3P-690
This commit is contained in:
Marc Alexander
2021-08-27 22:20:51 +02:00
parent 7ee3bd1727
commit abf8a7bfcf
16 changed files with 120 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
phpunit.xml.dist
View File

@@ -8,7 +8,6 @@
convertWarningsToExceptions="true"
processIsolation="false"
stopOnFailure="false"
syntaxCheck="false"
verbose="true"
bootstrap="../../../../tests/bootstrap.php">
<testsuites>
@@ -17,7 +16,7 @@
<exclude>./tests/functional</exclude>
</testsuite>
<testsuite name="Extension Functional Tests">
<directory suffix="_test.php" phpVersion="5.3.19" phpVersionOperator=">=">./tests/functional/</directory>
<directory suffix="_test.php">./tests/functional/</directory>
</testsuite>
</testsuites>
<filter>

2
tests/mock/user.php
View File

@@ -9,7 +9,7 @@
namespace board3\portal\tests\mock;
class user extends \PHPUnit_Framework_TestCase
class user extends \PHPUnit\Framework\TestCase
{
public $lang = array();

14
tests/unit/acp/move_module_test.php
View File

@@ -51,10 +51,12 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
$phpbb_container = new \phpbb_mock_container_builder();
// Mock module service collection
$config = new \phpbb\config\config(array());
$auth = $this->getMock('\phpbb\auth\auth', array('acl_get'));
$auth = $this->getMockBuilder('\phpbb\auth\auth')
->setMethods(['acl_get'])
->getMock();
$auth->expects($this->any())
->method('acl_get')
->with($this->anything())
->withAnyParameters()
->will($this->returnValue(true));
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal');
@@ -73,7 +75,9 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
$phpbb_container->setParameter('board3.portal.config.table', $table_prefix . 'portal_config');
$this->portal_columns = new \board3\portal\portal\columns();
$phpbb_container->set('board3.portal.columns', $this->portal_columns);
$cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put', 'sql_load', 'sql_save'));
$cache = $this->getMockBuilder('\phpbb\cache\cache')
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'sql_load', 'sql_save'])
->getMock();
$cache->expects($this->any())
->method('destroy')
->with($this->equalTo('sql'));
@@ -102,7 +106,9 @@ class phpbb_acp_move_module_test extends \board3\portal\tests\testframework\data
));
$this->database_handler = new \board3\portal\portal\modules\database_handler($db);
$this->constraints_handler = new \board3\portal\portal\modules\constraints_handler($this->portal_columns, $user);
$phpbb_dispatcher = $this->getMock('\phpbb\event\dispatcher', array('trigger_event'), array($phpbb_container));
$phpbb_dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher')
->setMethods(['trigger_event'])
->getMock();
$phpbb_dispatcher->expects($this->any())
->method('trigger_event')
->with($this->anything())

13
tests/unit/controller/helper_test.php
View File

@@ -25,8 +25,12 @@ class helper_test extends \board3\portal\tests\testframework\test_case
parent::setUp();
$cache = $this->getMock('\phpbb\cache\driver', array('get', 'put'));
$this->auth = $this->getMock('\phpbb\auth\auth', array('acl_get'));
$cache = $this->getMockBuilder('\phpbb\cache\driver')
->setMethods(['get', 'put'])
->getMock();
$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
->setMethods(['acl_get'])
->getMock();
$this->auth->expects($this->any())
->method('acl_get')
->with($this->anything())
@@ -143,7 +147,10 @@ class helper_test extends \board3\portal\tests\testframework\test_case
$this->assertNull($this->controller_helper->load_module_language($this->modules['\board3\portal\modules\link_us']));
$this->assertEquals('Link to us', $this->user->lang('LINK_US'));
$this->assertFalse(isset($this->user->lang['PORTAL_LEADERS_EXT']));
$module = $this->getMock('\board3\portal\modules\link_us', array('get_language'), array($this->config, new \board3\portal\tests\mock\template($this), new \board3\portal\tests\mock\user));
$module = $this->getMockBuilder('\board3\portal\modules\link_us')
->setMethods(['get_language'])
->setConstructorArgs([$this->config, new \board3\portal\tests\mock\template($this), new \board3\portal\tests\mock\user])
->getMock();
$module->expects($this->any())
->method('get_language')
->willReturn(array(

4
tests/unit/controller/main_test.php
View File

@@ -54,7 +54,9 @@ class main_test extends \board3\portal\tests\testframework\database_test_case
'\board3\portal\modules\clock' => new \board3\portal\modules\clock($this->config, $this->template),
);
$portal_helper = new \board3\portal\includes\helper($modules);
$auth = $this->getMock('\phpbb\auth\auth', array('acl_get'));
$auth = $this->getMockBuilder('\phpbb\auth\auth')
->setMethods(['acl_get'])
->getMock();
$auth->expects($this->any())
->method('acl_get')
->with($this->anything())

49
tests/unit/event/listener_test.php
View File

@@ -36,9 +36,11 @@ class listener_test extends \phpbb_template_template_test_case
public function setup_listener()
{
global $cache, $db, $phpbb_root_path, $phpEx;
global $cache, $db, $phpbb_root_path, $phpEx, $phpbb_admin_path;
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()
@@ -47,14 +49,24 @@ class listener_test extends \phpbb_template_template_test_case
->method('get')
->with($this->anything())
->will($this->returnValue(false));
$db = $this->getMock('\phpbb\db\driver\driver_interface');
$db = $this->getMockBuilder('\phpbb\db\driver\driver_interface')
->getMock();
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$this->user = $this->getMock('\phpbb\user', array(), array($this->language, '\phpbb\datetime'));
$this->user = $this->getMockBuilder('\phpbb\user')
->setConstructorArgs([$this->language, '\phpbb\datetime'])
->getMock();
$this->user->expects($this->any())
->method('lang')
->will($this->returnValue('foo'));
$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
->disableOriginalConstructor()
->getMock();
$this->auth->expects($this->any())
->method('acl_get')
->with($this->anything())
->will($this->returnValue(true));
$manager = new \phpbb_mock_extension_manager(dirname(__FILE__) . '/', array());
$finder = new \phpbb\finder(
@@ -83,7 +95,26 @@ class listener_test extends \phpbb_template_template_test_case
$routes = $router->get_routes();
$symfony_request = new \phpbb\symfony_request($request);
$routing_helper = new \phpbb\routing\helper($this->config, $router, $symfony_request, $request, $filesystem, $phpbb_root_path, 'php');
$this->controller_helper = new mock_controller_helper($this->template, $this->user, $this->config, $symfony_request, $request, $routing_helper);
$cron_manager = $this->getMockBuilder('\phpbb\cron\manager')->disableOriginalConstructor()->getMock();
$dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher')->getMock();
$language = $this->getMockBuilder('\phpbb\language\language')->disableOriginalConstructor()->getMock();
$this->controller_helper = new mock_controller_helper(
$this->auth,
$cache,
$this->config,
$cron_manager,
$db,
$dispatcher,
$language,
$request,
$routing_helper,
$symfony_request,
$this->template,
$this->user,
$phpbb_root_path,
$phpbb_admin_path,
$phpEx
);
$this->path_helper = new \phpbb\path_helper(
new \phpbb\symfony_request(
@@ -95,14 +126,6 @@ class listener_test extends \phpbb_template_template_test_case
$this->php_ext
);
$this->auth = $this->getMockBuilder('\phpbb\auth\auth')
->disableOriginalConstructor()
->getMock();
$this->auth->expects($this->any())
->method('acl_get')
->with($this->anything())
->will($this->returnValue(true));
$this->controller = $this->getMockBuilder('\board3\portal\controller\main')
->disableOriginalConstructor()
->getMock();

14
tests/unit/functions/fetch_news_test.php
View File

@@ -30,7 +30,9 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
$user->add_lang('../../ext/board3/portal/language/en/portal');
$request = new \phpbb_mock_request;
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions', 'sql_load', 'sql_save'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions', 'sql_load', 'sql_save'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()
@@ -66,7 +68,9 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $controller_helper, $request);
$phpbb_container->set('board3.portal.modules_helper', $this->modules_helper);
$phpbb_container->set('board3.portal.fetch_posts', new \board3\portal\portal\fetch_posts($auth, $cache, $this->config, $this->db, $this->modules_helper, $user));
$template = $this->getMock('\phpbb\template', array('set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'));
$template = $this->getMockBuilder('\phpbb\template')
->setMethods(['set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'])
->getMock();
}
public function getDataSet()
@@ -200,7 +204,7 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
if ($expected_exception)
{
$this->setExpectedException($expected_exception);
$this->expectException($expected_exception);
}
$fetch_posts = phpbb_fetch_posts($module_id, $forum_from, $permissions, $number_of_posts, $text_length, $time, $type, $start, $invert);
@@ -241,7 +245,9 @@ class phpbb_functions_fetch_news_test extends \board3\portal\tests\testframework
{
global $cache, $phpbb_container;
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'get', 'sql_exists', 'put'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'get', 'sql_exists', 'put'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()

9
tests/unit/functions/functions_test.php
View File

@@ -25,8 +25,13 @@ class phpbb_unit_functions_functions_test extends \board3\portal\tests\testframe
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$user = $this->getMock('\phpbb\user', array('optionget'), array($this->language, '\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'sql_exists'));
$user = $this->getMockBuilder('\phpbb\user')
->setMethods(['optionget'])
->setConstructorArgs([$this->language, '\phpbb\datetime'])
->getMock();
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'sql_exists'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()

9
tests/unit/functions/get_user_groups_test.php
View File

@@ -22,8 +22,13 @@ class phpbb_unit_functions_get_user_groups_test extends \board3\portal\tests\tes
$this->language_file_loader = new \phpbb\language\language_file_loader($phpbb_root_path, 'php');
$this->language = new \phpbb\language\language($this->language_file_loader);
$user = $this->getMock('\phpbb\user', array('optionget'), array($this->language, '\phpbb\datetime'));
$cache = $this->getMock('\phpbb\cache\cache', array('get', 'put', 'sql_exists'));
$user = $this->getMockBuilder('\phpbb\user')
->setMethods(['optionget'])
->setConstructorArgs([$this->language, '\phpbb\datetime'])
->getMock();
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['get', 'put', 'sql_exists'])
->getMock();
$cache->expects($this->any())
->method('get')
->with($this->anything())

4
tests/unit/includes/modules_helper_test.php
View File

@@ -36,7 +36,9 @@ class board3_includes_modules_helper_test extends \board3\portal\tests\testframe
$controller_helper = new \board3\portal\tests\mock\controller_helper($phpbb_root_path, $phpEx);
$controller_helper->add_route('board3_portal_controller', 'portal');
$phpbb_container = new \phpbb_mock_container_builder();
$phpbb_dispatcher = $this->getMock('\phpbb\event\dispatcher', array('trigger_event'), array($phpbb_container));
$phpbb_dispatcher = $this->getMockBuilder('\phpbb\event\dispatcher')
->setMethods(['trigger_event'])
->getMock();
$phpbb_dispatcher->expects($this->any())
->method('trigger_event')
->with($this->anything())

4
tests/unit/modules/birthday_list_test.php
View File

@@ -45,7 +45,9 @@ class phpbb_unit_modules_birthday_list_test extends \board3\portal\tests\testfra
$this->user->timezone = new \DateTimeZone('UTC');
$this->user->add_lang('common');
$this->birthday_list = new \board3\portal\modules\birthday_list($this->config, $this->template, $this->new_dbal(), $this->user);
$auth = $this->getMock('\phpbb\auth\auth', array('acl_get'));
$auth = $this->getMockBuilder('\phpbb\auth\auth')
->setMethods(['acl_get'])
->getMock();
$auth->expects($this->any())
->method('acl_get')
->with($this->anything())

4
tests/unit/modules/calendar_test.php
View File

@@ -80,7 +80,9 @@ class phpbb_unit_modules_calendar_test extends \board3\portal\tests\testframewor
$this->calendar = new \board3\portal\modules\calendar(self::$config, $modules_helper, $this->template, $db, $this->request, dirname(__FILE__) . '/../../../', 'php', $user, $this->path_helper, $log);
define('PORTAL_MODULES_TABLE', 'phpbb_portal_modules');
define('PORTAL_CONFIG_TABLE', 'phpbb_portal_config');
$cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['destroy', 'sql_exists', 'get', 'put'])
->getMock();
$cache->expects($this->any())
->method('destroy')
->with($this->equalTo('portal_config'));

8
tests/unit/modules/welcome_test.php
View File

@@ -48,7 +48,9 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
$this->language = new \phpbb\language\language($this->language_file_loader);
$this->user = new \phpbb\user($this->language, '\phpbb\datetime');
$user = $this->user;
$cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put', 'sql_load'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'sql_load'])
->getMock();
$cache->expects($this->any())
->method('destroy')
->with($this->equalTo('portal_config'));
@@ -74,12 +76,16 @@ class phpbb_unit_modules_welcome_test extends \board3\portal\tests\testframework
->with($this->anything())
->will($this->returnArgument(1));
$phpbb_container = new \phpbb_mock_container_builder();
$phpbb_log = $this->getMockBuilder('\phpbb\log\log')
->disableOriginalConstructor()
->getMock();
$s9e_factory = new \phpbb\textformatter\s9e\factory(
new \phpbb\textformatter\data_access($this->db, BBCODES_TABLE, SMILIES_TABLE, STYLES_TABLE, WORDS_TABLE, $phpbb_root_path . 'styles/'),
new \phpbb\cache\driver\dummy(),
$phpbb_dispatcher,
$config,
new \phpbb\textformatter\s9e\link_helper(),
$phpbb_log,
$phpbb_root_path . 'cache',
'_text_formatter_parser',
'_text_formatter_renderer'

14
tests/unit/portal/fetch_posts_test.php
View File

@@ -34,7 +34,9 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
$user->add_lang('common');
$user->add_lang('../../ext/board3/portal/language/en/portal');
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions', 'sql_load', 'sql_save'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'get', 'sql_exists', 'put', 'obtain_attach_extensions', 'sql_load', 'sql_save'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()
@@ -67,7 +69,9 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
$controller_helper->add_route('board3_portal_controller', 'portal');
$this->modules_helper = new \board3\portal\includes\modules_helper($auth, $this->config, $controller_helper, new phpbb_mock_request());
$this->user = $user;
$template = $this->getMock('\phpbb\template', array('set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'));
$template = $this->getMockBuilder('\phpbb\template')
->setMethods(['set_filenames', 'destroy_block_vars', 'assign_block_vars', 'assign_display'])
->getMock();
$this->fetch_posts = new \board3\portal\portal\fetch_posts($auth, $cache, $this->config, $this->db, $this->modules_helper, $user);
}
@@ -202,7 +206,7 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
if ($expected_exception)
{
$this->setExpectedException($expected_exception);
$this->expectException($expected_exception);
}
$this->fetch_posts->set_module_id($module_id);
@@ -244,7 +248,9 @@ class phpbb_portal_fetch_posts_test extends \board3\portal\tests\testframework\d
{
global $cache;
$cache = $this->getMock('\phpbb\cache\cache', array('obtain_word_list', 'get', 'sql_exists', 'put'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['obtain_word_list', 'get', 'sql_exists', 'put'])
->getMock();
$cache->expects($this->any())
->method('obtain_word_list')
->with()

8
tests/unit/portal/modules_manager_confirm_box_test.php
View File

@@ -63,7 +63,9 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
));
$this->portal_columns = new \board3\portal\portal\columns();
$this->cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put', 'purge'));
$this->cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'purge'])
->getMock();
$this->cache->expects($this->any())
->method('destroy')
->withConsecutive(array($this->equalTo('config')), array($this->equalTo('portal_config')));
@@ -147,7 +149,9 @@ class modules_manager_confirm_box_test extends \board3\portal\tests\testframewor
public function test_module_delete()
{
$this->cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put', 'purge'));
$this->cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'purge'])
->getMock();
$this->cache->expects($this->any())
->method('destroy')
->with($this->equalTo('sql'));

4
tests/unit/portal/modules_manager_test.php
View File

@@ -55,7 +55,9 @@ class board3_portal_modules_manager_test extends \board3\portal\tests\testframew
));
$this->portal_columns = new \board3\portal\portal\columns();
$cache = $this->getMock('\phpbb\cache\cache', array('destroy', 'sql_exists', 'get', 'put', 'sql_load', 'sql_save'));
$cache = $this->getMockBuilder('\phpbb\cache\driver\dummy')
->setMethods(['destroy', 'sql_exists', 'get', 'put', 'sql_load', 'sql_save'])
->getMock();
$cache->expects($this->any())
->method('destroy')
->with($this->equalTo('portal_modules'));