Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status
aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/attachment/delete_test.php19
-rw-r--r--tests/attachment/upload_test.php2
-rw-r--r--tests/content_visibility/delete_post_test.php2
-rw-r--r--tests/functions_user/delete_user_test.php11
-rw-r--r--tests/notification/submit_post_base.php10
-rw-r--r--tests/privmsgs/delete_user_pms_test.php11
6 files changed, 50 insertions, 5 deletions
diff --git a/tests/attachment/delete_test.php b/tests/attachment/delete_test.php
index f5d307c5af..a22b31e1a0 100644
--- a/tests/attachment/delete_test.php
+++ b/tests/attachment/delete_test.php
@@ -55,7 +55,7 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
$this->filesystem->expects($this->any())
->method('exists')
->willReturn(true);
- $adapter = new \phpbb\storage\adapter\local($this->filesystem, $phpbb_root_path);
+ $adapter = new \phpbb\storage\adapter\local($this->filesystem, new \FastImageSize\FastImageSize(), $phpbb_root_path);
$adapter->configure(['path' => 'files']);
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
$adapter_factory_mock->expects($this->any())
@@ -110,6 +110,23 @@ class phpbb_attachment_delete_test extends \phpbb_database_test_case
*/
public function test_attachment_delete_success($remove_success, $exists_success, $expected, $throw_exception = false)
{
+ $this->storage = $this->createMock('\phpbb\storage\storage', array('delete', 'exists'));
+ if ($throw_exception)
+ {
+ $this->storage->expects($this->any())
+ ->method('delete')
+ ->willThrowException(new \phpbb\storage\exception\exception);;
+ }
+ else
+ {
+ $this->storage->expects($this->any())
+ ->method('delete')
+ ->willReturn($remove_success);
+ }
+ $this->storage->expects($this->any())
+ ->method('exists')
+ ->willReturn($exists_success);
+
$this->attachment_delete = new \phpbb\attachment\delete($this->config, $this->db, $this->dispatcher, $this->resync, $this->storage);
$this->assertSame($expected, $this->attachment_delete->unlink_attachment('foobar'));
}
diff --git a/tests/attachment/upload_test.php b/tests/attachment/upload_test.php
index 11f862c277..0cb8fcc450 100644
--- a/tests/attachment/upload_test.php
+++ b/tests/attachment/upload_test.php
@@ -99,7 +99,7 @@ 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, $phpbb_root_path);
+ $adapter = new \phpbb\storage\adapter\local($this->filesystem, new \FastImageSize\FastImageSize(), $phpbb_root_path);
$adapter->configure(['path' => 'files']);
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
$adapter_factory_mock->expects($this->any())
diff --git a/tests/content_visibility/delete_post_test.php b/tests/content_visibility/delete_post_test.php
index 46c2f05aab..054d5d6877 100644
--- a/tests/content_visibility/delete_post_test.php
+++ b/tests/content_visibility/delete_post_test.php
@@ -298,7 +298,7 @@ class phpbb_content_visibility_delete_post_test extends phpbb_database_test_case
$db = $this->new_dbal();
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
- $adapter = new \phpbb\storage\adapter\local(new \phpbb\filesystem\filesystem(), $phpbb_root_path);
+ $adapter = new \phpbb\storage\adapter\local(new \phpbb\filesystem\filesystem(), new \FastImageSize\FastImageSize(), $phpbb_root_path);
$adapter->configure(['path' => 'files']);
$adapter_factory_mock = $this->createMock('\phpbb\storage\adapter_factory');
$adapter_factory_mock->expects($this->any())
diff --git a/tests/functions_user/delete_user_test.php b/tests/functions_user/delete_user_test.php
index 25042d9f1b..3f02bb53a5 100644
--- a/tests/functions_user/delete_user_test.php
+++ b/tests/functions_user/delete_user_test.php
@@ -34,8 +34,17 @@ class phpbb_functions_user_delete_user_test extends phpbb_database_test_case
$phpbb_dispatcher = new phpbb_mock_event_dispatcher();
$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(), $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($adapter_factory_mock, '');
+
// Works as a workaround for tests
- $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path));
+ $phpbb_container->set('attachment.manager', new \phpbb\attachment\delete($config, $db, new \phpbb_mock_event_dispatcher(), new \phpbb\attachment\resync($db), $storage));
$phpbb_container->set(
'auth.provider.db',
new phpbb_mock_auth_provider()
diff --git a/tests/notification/submit_post_base.php b/tests/notification/submit_post_base.php
index baa90f29b1..5a25682b73 100644
--- a/tests/notification/submit_post_base.php
+++ b/tests/notification/submit_post_base.php
@@ -91,6 +91,15 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
// Language
$lang = new \phpbb\language\language(new \phpbb\language\language_file_loader($phpbb_root_path, $phpEx));
+ // Storage
+ $adapter = new \phpbb\storage\adapter\local(new \phpbb\filesystem\filesystem(), new \FastImageSize\FastImageSize(), $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($adapter_factory_mock, '');
+
// User
$user = $this->createMock('\phpbb\user', array(), array(
$lang,
@@ -125,6 +134,7 @@ abstract class phpbb_notification_submit_post_base extends phpbb_database_test_c
$phpbb_container->set('cache', $cache);
$phpbb_container->set('text_formatter.utils', new \phpbb\textformatter\s9e\utils());
$phpbb_container->set('dispatcher', $phpbb_dispatcher);
+ $phpbb_container->set('storage.attachment', $storage);
$phpbb_container->setParameter('core.root_path', $phpbb_root_path);
$phpbb_container->setParameter('core.php_ext', $phpEx);
$phpbb_container->setParameter('tables.notifications', 'phpbb_notifications');
diff --git a/tests/privmsgs/delete_user_pms_test.php b/tests/privmsgs/delete_user_pms_test.php
index 9d6ba7a917..0c3609207c 100644
--- a/tests/privmsgs/delete_user_pms_test.php
+++ b/tests/privmsgs/delete_user_pms_test.php
@@ -91,8 +91,17 @@ class phpbb_privmsgs_delete_user_pms_test extends phpbb_database_test_case
$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(), $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($adapter_factory_mock, '');
+
// 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\filesystem\filesystem(), new \phpbb\attachment\resync($db), $phpbb_root_path));
+ $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));
phpbb_delete_user_pms($delete_user);