[Pkg-owncloud-commits] [owncloud] 48/103: Add a unit test for the naming conflict on the mountpoint name
David Prévot
taffit at moszumanska.debian.org
Sun May 31 12:32:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to annotated tag v8.0.4RC1
in repository owncloud.
commit 739e5f9fd64c9e97521ffbee053128c4739111f6
Author: Joas Schilling <nickvergessen at owncloud.com>
Date: Tue Mar 17 16:51:07 2015 +0100
Add a unit test for the naming conflict on the mountpoint name
---
apps/files_sharing/lib/external/manager.php | 31 +++++-
apps/files_sharing/tests/external/managertest.php | 130 ++++++++++++++++++++++
2 files changed, 155 insertions(+), 6 deletions(-)
diff --git a/apps/files_sharing/lib/external/manager.php b/apps/files_sharing/lib/external/manager.php
index 592cfc4..5234684 100644
--- a/apps/files_sharing/lib/external/manager.php
+++ b/apps/files_sharing/lib/external/manager.php
@@ -30,7 +30,7 @@ class Manager {
private $mountManager;
/**
- * @var \OC\Files\Storage\StorageFactory
+ * @var \OCP\Files\Storage\IStorageFactory
*/
private $storageLoader;
@@ -42,12 +42,12 @@ class Manager {
/**
* @param \OCP\IDBConnection $connection
* @param \OC\Files\Mount\Manager $mountManager
- * @param \OC\Files\Storage\StorageFactory $storageLoader
+ * @param \OCP\Files\Storage\IStorageFactory $storageLoader
* @param \OC\HTTPHelper $httpHelper
* @param string $uid
*/
public function __construct(\OCP\IDBConnection $connection, \OC\Files\Mount\Manager $mountManager,
- \OC\Files\Storage\StorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) {
+ \OCP\Files\Storage\IStorageFactory $storageLoader, \OC\HTTPHelper $httpHelper, $uid) {
$this->connection = $connection;
$this->mountManager = $mountManager;
$this->storageLoader = $storageLoader;
@@ -353,10 +353,29 @@ class Manager {
* @return array list of open server-to-server shares
*/
public function getOpenShares() {
- $openShares = $this->connection->prepare('SELECT * FROM `*PREFIX*share_external` WHERE `accepted` = ? AND `user` = ?');
- $result = $openShares->execute(array(0, $this->uid));
+ return $this->getShares(false);
+ }
+
+ /**
+ * return a list of shares for the user
+ *
+ * @param bool|null $accepted True for accepted only,
+ * false for not accepted,
+ * null for all shares of the user
+ * @return array list of open server-to-server shares
+ */
+ private function getShares($accepted) {
+ $query = 'SELECT * FROM `*PREFIX*share_external` WHERE `user` = ?';
+ $parameters = [$this->uid];
+ if (!is_null($accepted)) {
+ $query .= 'AND `accepted` = ?';
+ $parameters[] = (int) $accepted;
+ }
+ $query .= ' ORDER BY `id` ASC';
- return $result ? $openShares->fetchAll() : array();
+ $shares = $this->connection->prepare($query);
+ $result = $shares->execute($parameters);
+ return $result ? $shares->fetchAll() : [];
}
}
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
new file mode 100644
index 0000000..0a8c3e5
--- /dev/null
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -0,0 +1,130 @@
+<?php
+/**
+ * ownCloud
+ *
+ * @author Joas Schilling
+ * @copyright 2015 Joas Schilling <nickvergessen at owncloud.com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public
+ * License along with this library. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+
+namespace OCA\Files_Sharing\Tests\External;
+
+use OCA\Files_Sharing\Tests\TestCase;
+
+class ManagerTest extends TestCase {
+
+ /** @var \OCA\Files_Sharing\External\Manager **/
+ private $manager;
+
+ private $uid;
+
+ protected function setUp() {
+ parent::setUp();
+
+ $this->uid = $this->getUniqueID('user');
+ $this->manager = new \OCA\Files_Sharing\External\Manager(
+ \OC::$server->getDatabaseConnection(),
+ $this->getMockBuilder('\OC\Files\Mount\Manager')->disableOriginalConstructor()->getMock(),
+ $this->getMockBuilder('\OCP\Files\Storage\IStorageFactory')->disableOriginalConstructor()->getMock(),
+ $this->getMockBuilder('\OC\HTTPHelper')->disableOriginalConstructor()->getMock(),
+ $this->uid
+ );
+ }
+
+ public function testAddShare() {
+ $shareData1 = [
+ 'remote' => 'localhost',
+ 'token' => 'token1',
+ 'password' => '',
+ 'name' => '/SharedFolder',
+ 'owner' => 'foobar',
+ 'accepted' => false,
+ 'user' => $this->uid,
+ ];
+ $shareData2 = $shareData1;
+ $shareData2['token'] = 'token2';
+ $shareData3 = $shareData1;
+ $shareData3['token'] = 'token3';
+
+ // Add a share for "user"
+ $this->assertSame(null, call_user_func_array([$this->manager, 'addShare'], $shareData1));
+ $openShares = $this->manager->getOpenShares();
+ $this->assertCount(1, $openShares);
+ $this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+
+ // Add a second share for "user" with the same name
+ $this->assertSame(null, call_user_func_array([$this->manager, 'addShare'], $shareData2));
+ $openShares = $this->manager->getOpenShares();
+ $this->assertCount(2, $openShares);
+ $this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ // New share falls back to "-1" appendix, because the name is already taken
+ $this->assertExternalShareEntry($shareData2, $openShares[1], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+
+ // Accept the first share
+ $this->manager->acceptShare($openShares[0]['id']);
+
+ // Check remaining shares - Accepted
+ $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]);
+ $this->assertCount(1, $acceptedShares);
+ $shareData1['accepted'] = true;
+ $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']);
+ // Check remaining shares - Open
+ $openShares = $this->manager->getOpenShares();
+ $this->assertCount(1, $openShares);
+ $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+
+ // Add another share for "user" with the same name
+ $this->assertSame(null, call_user_func_array([$this->manager, 'addShare'], $shareData3));
+ $openShares = $this->manager->getOpenShares();
+ $this->assertCount(2, $openShares);
+ $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+ // New share falls back to the original name (no "-\d", because the name is not taken)
+ $this->assertExternalShareEntry($shareData3, $openShares[1], 3, '{{TemporaryMountPointName#' . $shareData3['name'] . '}}');
+
+ // Decline the third share
+ $this->manager->declineShare($openShares[1]['id']);
+
+ // Check remaining shares - Accepted
+ $acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]);
+ $this->assertCount(1, $acceptedShares);
+ $shareData1['accepted'] = true;
+ $this->assertExternalShareEntry($shareData1, $acceptedShares[0], 1, $shareData1['name']);
+ // Check remaining shares - Open
+ $openShares = $this->manager->getOpenShares();
+ $this->assertCount(1, $openShares);
+ $this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+
+ $this->manager->removeUserShares($this->uid);
+ $this->assertEmpty(\Test_Helper::invokePrivate($this->manager, 'getShares', [null]), 'Asserting all shares for the user have been deleted');
+ }
+
+ /**
+ * @param array $expected
+ * @param array $actual
+ * @param int $share
+ * @param string $mountPoint
+ */
+ protected function assertExternalShareEntry($expected, $actual, $share, $mountPoint) {
+ $this->assertEquals($expected['remote'], $actual['remote'], 'Asserting remote of a share #' . $share);
+ $this->assertEquals($expected['token'], $actual['share_token'], 'Asserting token of a share #' . $share);
+ $this->assertEquals($expected['name'], $actual['name'], 'Asserting name of a share #' . $share);
+ $this->assertEquals($expected['owner'], $actual['owner'], 'Asserting owner of a share #' . $share);
+ $this->assertEquals($expected['accepted'], (int) $actual['accepted'], 'Asserting accept of a share #' . $share);
+ $this->assertEquals($expected['user'], $actual['user'], 'Asserting user of a share #' . $share);
+ $this->assertEquals($mountPoint, $actual['mountpoint'], 'Asserting mountpoint of a share #' . $share);
+
+ }
+}
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud.git
More information about the Pkg-owncloud-commits
mailing list