From ab549970cadc8557f55a32d802c608ddf44238c8 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 15 Dec 2015 13:24:30 +0100
Subject: fix setting mountpoint and auth backend of external storages

---
 .../tests/service/dbconfigservicetest.php          | 28 +++++++++++++++++++++
 .../tests/service/storagesservicetest.php          | 29 ++++++++++++++++++++++
 2 files changed, 57 insertions(+)

(limited to 'apps/files_external/tests')

diff --git a/apps/files_external/tests/service/dbconfigservicetest.php b/apps/files_external/tests/service/dbconfigservicetest.php
index d5b4ff1585d..bfb564c6663 100644
--- a/apps/files_external/tests/service/dbconfigservicetest.php
+++ b/apps/files_external/tests/service/dbconfigservicetest.php
@@ -230,4 +230,32 @@ class DBConfigServiceTest extends TestCase {
 		$this->assertEquals($id1, $mounts[0]['mount_id']);
 		$this->assertEquals([['type' => DBConfigService::APPLICABLE_TYPE_GLOBAL, 'value' => null, 'mount_id' => $id1]], $mounts[0]['applicable']);
 	}
+
+	public function testSetMountPoint() {
+		$id1 = $this->addMount('/test', 'foo', 'bar', 100, DBConfigService::MOUNT_TYPE_ADMIN);
+		$id2 = $this->addMount('/foo', 'foo', 'bar', 100, DBConfigService::MOUNT_TYPE_ADMIN);
+
+		$this->dbConfig->setMountPoint($id1, '/asd');
+
+		$mount = $this->dbConfig->getMountById($id1);
+		$this->assertEquals('/asd', $mount['mount_point']);
+
+		// remains unchanged
+		$mount = $this->dbConfig->getMountById($id2);
+		$this->assertEquals('/foo', $mount['mount_point']);
+	}
+
+	public function testSetAuthBackend() {
+		$id1 = $this->addMount('/test', 'foo', 'bar', 100, DBConfigService::MOUNT_TYPE_ADMIN);
+		$id2 = $this->addMount('/foo', 'foo', 'bar', 100, DBConfigService::MOUNT_TYPE_ADMIN);
+
+		$this->dbConfig->setAuthBackend($id1, 'none');
+
+		$mount = $this->dbConfig->getMountById($id1);
+		$this->assertEquals('none', $mount['auth_backend']);
+
+		// remains unchanged
+		$mount = $this->dbConfig->getMountById($id2);
+		$this->assertEquals('bar', $mount['auth_backend']);
+	}
 }
diff --git a/apps/files_external/tests/service/storagesservicetest.php b/apps/files_external/tests/service/storagesservicetest.php
index 7847bd45d4a..d5430982899 100644
--- a/apps/files_external/tests/service/storagesservicetest.php
+++ b/apps/files_external/tests/service/storagesservicetest.php
@@ -465,4 +465,33 @@ abstract class StoragesServiceTest extends \Test\TestCase {
 			$params[Filesystem::signal_param_users]
 		);
 	}
+
+	public function testUpdateStorageMountPoint() {
+		$backend = $this->backendService->getBackend('identifier:\OCA\Files_External\Lib\Backend\SMB');
+		$authMechanism = $this->backendService->getAuthMechanism('identifier:\Auth\Mechanism');
+
+		$storage = new StorageConfig();
+		$storage->setMountPoint('mountpoint');
+		$storage->setBackend($backend);
+		$storage->setAuthMechanism($authMechanism);
+		$storage->setBackendOptions(['password' => 'testPassword']);
+
+		$savedStorage = $this->service->addStorage($storage);
+
+		$newAuthMechanism = $this->backendService->getAuthMechanism('identifier:\Other\Auth\Mechanism');
+
+		$updatedStorage = new StorageConfig($savedStorage->getId());
+		$updatedStorage->setMountPoint('mountpoint2');
+		$updatedStorage->setBackend($backend);
+		$updatedStorage->setAuthMechanism($newAuthMechanism);
+		$updatedStorage->setBackendOptions(['password' => 'password2']);
+
+		$this->service->updateStorage($updatedStorage);
+
+		$savedStorage = $this->service->getStorage($updatedStorage->getId());
+
+		$this->assertEquals('/mountpoint2', $savedStorage->getMountPoint());
+		$this->assertEquals($newAuthMechanism, $savedStorage->getAuthMechanism());
+		$this->assertEquals('password2', $savedStorage->getBackendOption('password'));
+	}
 }
-- 
cgit v1.2.3


From 8da3c3f125ba6d741b7c83505149e75faa5e2f94 Mon Sep 17 00:00:00 2001
From: Robin Appelman <icewind@owncloud.com>
Date: Tue, 22 Dec 2015 14:22:10 +0100
Subject: update tests

---
 apps/files_external/tests/service/userglobalstoragesservicetest.php | 4 ++++
 apps/files_external/tests/service/userstoragesservicetest.php       | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

(limited to 'apps/files_external/tests')

diff --git a/apps/files_external/tests/service/userglobalstoragesservicetest.php b/apps/files_external/tests/service/userglobalstoragesservicetest.php
index b8379288d43..8057762cb28 100644
--- a/apps/files_external/tests/service/userglobalstoragesservicetest.php
+++ b/apps/files_external/tests/service/userglobalstoragesservicetest.php
@@ -349,4 +349,8 @@ class UserGlobalStoragesServiceTest extends GlobalStoragesServiceTest {
 		$this->assertTrue(true);
 	}
 
+	public function testUpdateStorageMountPoint() {
+		// we don't test this here
+		$this->assertTrue(true);
+	}
 }
diff --git a/apps/files_external/tests/service/userstoragesservicetest.php b/apps/files_external/tests/service/userstoragesservicetest.php
index 5e984c52bfd..6b6e6313e77 100644
--- a/apps/files_external/tests/service/userstoragesservicetest.php
+++ b/apps/files_external/tests/service/userstoragesservicetest.php
@@ -122,8 +122,8 @@ class UserStoragesServiceTest extends StoragesServiceTest {
 		$newStorage = $this->service->updateStorage($newStorage);
 
 		$this->assertEquals('anotherPassword', $newStorage->getBackendOptions()['password']);
+		$this->assertEquals([$this->userId], $newStorage->getApplicableUsers());
 		// these attributes are unused for user storages
-		$this->assertEmpty($newStorage->getApplicableUsers());
 		$this->assertEmpty($newStorage->getApplicableGroups());
 		$this->assertEquals(0, $newStorage->getStatus());
 
-- 
cgit v1.2.3