From 7471b7698b479d150cd4fc01f8e0e0112af9a8ef Mon Sep 17 00:00:00 2001 From: Philipp Date: Tue, 5 Oct 2021 19:59:13 +0200 Subject: [PATCH] Adapt filesystem tests --- src/Model/Storage/Filesystem.php | 2 +- tests/src/Core/StorageManagerTest.php | 11 ++++++++ .../Model/Storage/FilesystemStorageTest.php | 27 ++++++++++++++----- 3 files changed, 33 insertions(+), 7 deletions(-) diff --git a/src/Model/Storage/Filesystem.php b/src/Model/Storage/Filesystem.php index 3165565b0b..8b5078f548 100644 --- a/src/Model/Storage/Filesystem.php +++ b/src/Model/Storage/Filesystem.php @@ -54,7 +54,7 @@ class Filesystem implements IWritableStorage $this->basePath = rtrim($path, '/'); if (!is_dir($this->basePath) || !is_writable($this->basePath)) { - throw new StorageException(sprintf('Path %s does not exist or is not writeable', $this->basePath)); + throw new StorageException(sprintf('Path "%s" does not exist or is not writeable.', $this->basePath)); } } diff --git a/tests/src/Core/StorageManagerTest.php b/tests/src/Core/StorageManagerTest.php index b0def99b70..77e4946bdf 100644 --- a/tests/src/Core/StorageManagerTest.php +++ b/tests/src/Core/StorageManagerTest.php @@ -40,6 +40,7 @@ use Friendica\Test\Util\Database\StaticDatabase; use Friendica\Test\Util\VFSTrait; use Friendica\Util\ConfigFileLoader; use Friendica\Util\Profiler; +use org\bovigo\vfs\vfsStream; use Psr\Log\LoggerInterface; use Psr\Log\NullLogger; use Friendica\Test\Util\SampleStorageBackend; @@ -64,6 +65,8 @@ class StorageManagerTest extends DatabaseTest $this->setUpVfsDir(); + vfsStream::newDirectory(Storage\FilesystemConfig::DEFAULT_BASE_FOLDER, 0777)->at($this->root); + $this->logger = new NullLogger(); $profiler = \Mockery::mock(Profiler::class); @@ -81,12 +84,20 @@ class StorageManagerTest extends DatabaseTest $configModel = new Config($this->dba); $this->config = new PreloadConfig($configCache, $configModel); $this->config->set('storage', 'name', 'Database'); + $this->config->set('storage', 'filesystem_path', $this->root->getChild(Storage\FilesystemConfig::DEFAULT_BASE_FOLDER)->url()); $this->l10n = \Mockery::mock(L10n::class); $this->httpRequest = \Mockery::mock(HTTPClient::class); } + protected function tearDown(): void + { + $this->root->removeChild(Storage\FilesystemConfig::DEFAULT_BASE_FOLDER); + + parent::tearDown(); + } + /** * Test plain instancing first */ diff --git a/tests/src/Model/Storage/FilesystemStorageTest.php b/tests/src/Model/Storage/FilesystemStorageTest.php index d3204c6829..837c166819 100644 --- a/tests/src/Model/Storage/FilesystemStorageTest.php +++ b/tests/src/Model/Storage/FilesystemStorageTest.php @@ -22,6 +22,7 @@ namespace Friendica\Test\src\Model\Storage; use Friendica\Model\Storage\Filesystem; +use Friendica\Model\Storage\FilesystemConfig; use Friendica\Model\Storage\StorageException; use Friendica\Test\Util\VFSTrait; use org\bovigo\vfs\vfsStream; @@ -41,20 +42,34 @@ class FilesystemStorageTest extends StorageTest protected function getInstance() { - return new Filesystem($this->root->getChild('storage')->url()); + return new Filesystem($this->root->getChild(FilesystemConfig::DEFAULT_BASE_FOLDER)->url()); } /** - * Test the exception in case of missing directorsy permissions + * Test the exception in case of missing directory permissions during put new files + */ + public function testMissingDirPermissionsDuringPut() + { + $this->expectException(StorageException::class); + $this->expectExceptionMessageMatches("/Filesystem storage failed to create \".*\". Check you write permissions./"); + $this->root->getChild(FilesystemConfig::DEFAULT_BASE_FOLDER)->chmod(0777); + + $instance = $this->getInstance(); + + $this->root->getChild(FilesystemConfig::DEFAULT_BASE_FOLDER)->chmod(0000); + $instance->put('test'); + } + + /** + * Test the exception in case the directory isn't writeable */ public function testMissingDirPermissions() { $this->expectException(StorageException::class); - $this->expectExceptionMessageMatches("/Filesystem storage failed to create \".*\". Check you write permissions./"); - $this->root->getChild('storage')->chmod(000); + $this->expectExceptionMessageMatches("/Path \".*\" does not exist or is not writeable./"); + $this->root->getChild(FilesystemConfig::DEFAULT_BASE_FOLDER)->chmod(0000); - $instance = $this->getInstance(); - $instance->put('test'); + $this->getInstance(); } /**