mirror of
https://github.com/phpbb/phpbb.git
synced 2025-06-08 04:18:52 +00:00
[ticket/15692] Update tests
PHPBB3-15692
This commit is contained in:
parent
5fbe929a1d
commit
d0b7875b18
5 changed files with 9 additions and 47 deletions
|
@ -21,9 +21,6 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
|
|||
/** @var \phpbb\db\driver\driver_interface */
|
||||
protected $db;
|
||||
|
||||
/** @var \phpbb\filesystem\filesystem */
|
||||
protected $filesystem;
|
||||
|
||||
/** @var \phpbb\attachment\resync */
|
||||
protected $resync;
|
||||
|
||||
|
@ -47,22 +44,11 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
|
|||
$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
|
||||
$this->config = new \phpbb\config\config(array());
|
||||
$this->db = $this->new_dbal();
|
||||
$db_mock = $this->createMock('\phpbb\db\driver\driver_interface');
|
||||
$this->resync = new \phpbb\attachment\resync($this->db);
|
||||
$this->filesystem = $this->createMock('\phpbb\filesystem\filesystem', array('remove', 'exists'));
|
||||
$this->filesystem->expects($this->any())
|
||||
->method('remove')
|
||||
->willReturn(false);
|
||||
$this->filesystem->expects($this->any())
|
||||
$this->storage = $this->createMock('\phpbb\storage\storage');
|
||||
$this->storage->expects($this->any())
|
||||
->method('exists')
|
||||
->willReturn(true);
|
||||
$adapter = new \phpbb\storage\adapter\local($this->filesystem, new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path);
|
||||
$adapter->configure(['path' => 'files']);
|
||||
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
|
||||
$adapter_factory_mock->expects($this->any())
|
||||
->method('get')
|
||||
->willReturn($adapter);
|
||||
$this->storage = new \phpbb\storage\storage($db_mock, $cache, $adapter_factory_mock, '', '');
|
||||
$this->dispatcher = new \phpbb_mock_event_dispatcher();
|
||||
$this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->resync, $this->storage);
|
||||
}
|
||||
|
|
|
@ -86,9 +86,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
|
|||
));
|
||||
$config = $this->config;
|
||||
$this->db = $this->new_dbal();
|
||||
$db_mock = $this->createMock('\phpbb\db\driver\driver_interface');
|
||||
$this->cache = new \phpbb\cache\service(new \phpbb\cache\driver\dummy(), $this->config, $this->db, $phpbb_root_path, $phpEx);
|
||||
$cache_mock = $this->createMock('\phpbb\cache\driver\driver_interface');
|
||||
$this->request = $this->createMock('\phpbb\request\request');
|
||||
|
||||
$this->filesystem = new \phpbb\filesystem\filesystem();
|
||||
|
@ -105,13 +103,10 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
|
|||
$this->mimetype_guesser = new \phpbb\mimetype\guesser($guessers);
|
||||
$this->plupload = new \phpbb\plupload\plupload($phpbb_root_path, $this->config, $this->request, new \phpbb\user($this->language, '\phpbb\datetime'), $this->php_ini, $this->mimetype_guesser);
|
||||
|
||||
$adapter = new \phpbb\storage\adapter\local($this->filesystem, new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path);
|
||||
$adapter->configure(['path' => 'files']);
|
||||
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
|
||||
$adapter_factory_mock->expects($this->any())
|
||||
->method('get')
|
||||
->willReturn($adapter);
|
||||
$this->storage = new \phpbb\storage\storage($db_mock, $cache_mock, $adapter_factory_mock, '', '');
|
||||
$this->storage = $this->createMock('\phpbb\storage\storage');
|
||||
$this->storage->expects($this->any())
|
||||
->method('free_space')
|
||||
->willReturn(1024*1024); // 1gb
|
||||
|
||||
$factory_mock = $this->getMockBuilder('\phpbb\files\factory')
|
||||
->disableOriginalConstructor()
|
||||
|
|
|
@ -30,25 +30,16 @@ class phpbb_avatar_manager_test extends \phpbb_database_test_case
|
|||
global $phpbb_root_path, $phpEx;
|
||||
|
||||
// Mock phpbb_container
|
||||
|
||||
$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
|
||||
$phpbb_container = $this->createMock('Symfony\Component\DependencyInjection\ContainerInterface');
|
||||
$phpbb_container->expects($this->any())
|
||||
->method('get')
|
||||
->will($this->returnArgument(0));
|
||||
|
||||
$filesystem = new \phpbb\filesystem\filesystem();
|
||||
$adapter = new \phpbb\storage\adapter\local($filesystem, new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path);
|
||||
$adapter->configure(['path' => 'images/avatars/upload']);
|
||||
$db = $this->createMock('\phpbb\db\driver\driver_interface');
|
||||
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
|
||||
$adapter_factory_mock->expects($this->any())
|
||||
->method('get')
|
||||
->willReturn($adapter);
|
||||
$storage = new \phpbb\storage\storage($db, $cache, $adapter_factory_mock, '', '');
|
||||
$storage = $this->createMock('\phpbb\storage\storage');
|
||||
|
||||
// Prepare dependencies for avatar manager and driver
|
||||
$this->config = new \phpbb\config\config(array());
|
||||
$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
|
||||
$path_helper = new \phpbb\path_helper(
|
||||
new \phpbb\symfony_request(
|
||||
new phpbb_mock_request()
|
||||
|
|
|
@ -56,7 +56,6 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
|
|||
// Database
|
||||
$this->db = $this->new_dbal();
|
||||
$db = $this->db;
|
||||
$db_mock = $this->createMock('\phpbb\db\driver\driver_interface');
|
||||
|
||||
// Auth
|
||||
$auth = $this->createMock('\phpbb\auth\auth');
|
||||
|
|
|
@ -87,21 +87,12 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
|
|||
{
|
||||
global $db, $phpbb_container, $phpbb_root_path;
|
||||
|
||||
$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
|
||||
|
||||
$db = $this->new_dbal();
|
||||
$db_mock = $this->createMock('\phpbb\db\driver\driver_interface');
|
||||
|
||||
$phpbb_container = new phpbb_mock_container_builder();
|
||||
$phpbb_container->set('notification_manager', new phpbb_mock_notification_manager());
|
||||
|
||||
$adapter = new \phpbb\storage\adapter\local(new \phpbb\filesystem\filesystem(), new \FastImageSize\FastImageSize(), new \phpbb\mimetype\guesser(array(new \phpbb\mimetype\extension_guesser)), $phpbb_root_path);
|
||||
$adapter->configure(['path' => 'files']);
|
||||
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
|
||||
$adapter_factory_mock->expects($this->any())
|
||||
->method('get')
|
||||
->willReturn($adapter);
|
||||
$storage = new \phpbb\storage\storage($db_mock, $cache, $adapter_factory_mock, '', '');
|
||||
$storage = $this->createMock('\phpbb\storage\storage');
|
||||
|
||||
// Works as a workaround for tests
|
||||
$phpbb_container->set('attachment.manager', new \phpbb\attachment\delete(new \phpbb\config\config(array()), $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage));
|
||||
|
|
Loading…
Add table
Reference in a new issue