summaryrefslogtreecommitdiffstats
path: root/apps/files_external/tests/controller/userstoragescontrollertest.php
diff options
context:
space:
mode:
authorRobin McCorkell <rmccorkell@owncloud.com>2015-08-11 18:45:07 +0100
committerRobin McCorkell <rmccorkell@owncloud.com>2015-08-19 10:05:11 +0100
commit37beb58c6f395523d8e2934870c5f52a8c6f6df0 (patch)
treeb14325a790ddaf7236c3f8c1939ce9ef10df58bb /apps/files_external/tests/controller/userstoragescontrollertest.php
parent74237a9c44192fb98944ea7f3c14fa6f22c0814b (diff)
downloadnextcloud-server-37beb58c6f395523d8e2934870c5f52a8c6f6df0.tar.gz
nextcloud-server-37beb58c6f395523d8e2934870c5f52a8c6f6df0.zip
Introduce BackendService for managing external storage backends
Backends are registered to the BackendService through new data structures: Backends are concrete classes, deriving from \OCA\Files_External\Lib\Backend\Backend. During construction, the various configuration parameters of the Backend can be set, in a design similar to Symfony Console. DefinitionParameter stores a parameter configuration for an external storage: name of parameter, human-readable name, type of parameter (text, password, hidden, checkbox), flags (optional or not). Storages in the StoragesController now get their parameters validated server-side (fixes a TODO).
Diffstat (limited to 'apps/files_external/tests/controller/userstoragescontrollertest.php')
-rw-r--r--apps/files_external/tests/controller/userstoragescontrollertest.php51
1 files changed, 17 insertions, 34 deletions
diff --git a/apps/files_external/tests/controller/userstoragescontrollertest.php b/apps/files_external/tests/controller/userstoragescontrollertest.php
index f9b4c5b2681..99825f26394 100644
--- a/apps/files_external/tests/controller/userstoragescontrollertest.php
+++ b/apps/files_external/tests/controller/userstoragescontrollertest.php
@@ -24,6 +24,8 @@ use \OCA\Files_external\Controller\UserStoragesController;
use \OCA\Files_external\Service\UserStoragesService;
use \OCP\AppFramework\Http;
use \OCA\Files_external\NotFoundException;
+use \OCA\Files_External\Lib\StorageConfig;
+use \OCA\Files_External\Service\BackendService;
class UserStoragesControllerTest extends StoragesControllerTest {
@@ -44,41 +46,22 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$this->getMock('\OCP\IL10N'),
$this->service
);
-
- $config = \OC::$server->getConfig();
-
- $this->oldAllowedBackends = $config->getAppValue(
- 'files_external',
- 'user_mounting_backends',
- ''
- );
- $config->setAppValue(
- 'files_external',
- 'user_mounting_backends',
- '\OC\Files\Storage\SMB'
- );
}
- public function tearDown() {
- $config = \OC::$server->getConfig();
- $config->setAppValue(
- 'files_external',
- 'user_mounting_backends',
- $this->oldAllowedBackends
- );
- parent::tearDown();
- }
+ public function testAddOrUpdateStorageDisallowedBackend() {
+ $backend = $this->getBackendMock();
+ $backend->method('isVisibleFor')
+ ->with(BackendService::VISIBILITY_PERSONAL)
+ ->willReturn(false);
- function disallowedBackendClassProvider() {
- return array(
- array('\OC\Files\Storage\Local'),
- array('\OC\Files\Storage\FTP'),
- );
- }
- /**
- * @dataProvider disallowedBackendClassProvider
- */
- public function testAddOrUpdateStorageDisallowedBackend($backendClass) {
+ $storageConfig = new StorageConfig(1);
+ $storageConfig->setMountPoint('mount');
+ $storageConfig->setBackend($backend);
+ $storageConfig->setBackendOptions([]);
+
+ $this->service->expects($this->exactly(2))
+ ->method('createStorage')
+ ->will($this->returnValue($storageConfig));
$this->service->expects($this->never())
->method('addStorage');
$this->service->expects($this->never())
@@ -86,7 +69,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$response = $this->controller->create(
'mount',
- $backendClass,
+ '\OC\Files\Storage\SMB',
array(),
[],
[],
@@ -99,7 +82,7 @@ class UserStoragesControllerTest extends StoragesControllerTest {
$response = $this->controller->update(
1,
'mount',
- $backendClass,
+ '\OC\Files\Storage\SMB',
array(),
[],
[],