1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

[ticket/15342] Fix test

PHPBB3-15342
This commit is contained in:
Rubén Calvo
2018-06-19 18:31:21 +02:00
parent 22b2e95531
commit f9c1901317
9 changed files with 21 additions and 24 deletions

View File

@@ -44,9 +44,10 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
parent::setUp();
$cache = $this->createMock('\phpbb\cache\driver\driver_interface');
$this->config = new \phpbb\config\config(array());
$this->db = $this->new_dbal();
$db = $this->db;
$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())
@@ -61,7 +62,7 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
$adapter_factory_mock->expects($this->any())
->method('get')
->willReturn($adapter);
$this->storage = new \phpbb\storage\storage($db, $adapter_factory_mock, '', '');
$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);
}

View File

@@ -86,7 +86,9 @@ 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();
@@ -109,7 +111,7 @@ class phpbb_attachment_upload_test extends \phpbb_database_test_case
$adapter_factory_mock->expects($this->any())
->method('get')
->willReturn($adapter);
$this->storage = new \phpbb\storage\storage($adapter_factory_mock, '');
$this->storage = new \phpbb\storage\storage($db_mock, $cache_mock, $adapter_factory_mock, '', '');
$factory_mock = $this->getMockBuilder('\phpbb\files\factory')
->disableOriginalConstructor()