[Pkg-owncloud-commits] [owncloud] 50/103: Merge the two tests into one
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 5b5bf27653455e63f6926356a0ffdf3eea479cc8
Author: Joas Schilling <nickvergessen at owncloud.com>
Date: Tue Mar 24 17:26:38 2015 +0100
Merge the two tests into one
---
apps/files_sharing/tests/external/manager.php | 151 ----------------------
apps/files_sharing/tests/external/managertest.php | 70 +++++++++-
2 files changed, 67 insertions(+), 154 deletions(-)
diff --git a/apps/files_sharing/tests/external/manager.php b/apps/files_sharing/tests/external/manager.php
deleted file mode 100644
index 3f8ac95..0000000
--- a/apps/files_sharing/tests/external/manager.php
+++ /dev/null
@@ -1,151 +0,0 @@
-<?php
-/**
- * @author Robin Appelman <icewind at owncloud.com>
- *
- * @copyright Copyright (c) 2015, ownCloud, Inc.
- * @license AGPL-3.0
- *
- * This code is free software: you can redistribute it and/or modify
- * it under the terms of the GNU Affero General Public License, version 3,
- * as published by the Free Software Foundation.
- *
- * This program 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, version 3,
- * along with this program. If not, see <http://www.gnu.org/licenses/>
- *
- */
-namespace OCA\Files_sharing\Tests\External;
-
-use OC\Files\Storage\StorageFactory;
-use OCA\Files_Sharing\Tests\TestCase;
-
-class Manager extends TestCase {
- private $uid;
-
- /**
- * @var \OC\Files\Mount\Manager
- */
- private $mountManager;
-
- /**
- * @var \OCA\Files_Sharing\External\Manager
- */
- private $instance;
-
- public function setUp() {
- parent::setUp();
-
- $this->uid = $this->getUniqueID('user');
-
- $this->mountManager = new \OC\Files\Mount\Manager();
- $this->instance = new \OCA\Files_Sharing\External\Manager(
- \OC::$server->getDatabaseConnection(),
- $this->mountManager,
- new StorageFactory(),
- $this->getMockBuilder('\OC\HTTPHelper')->disableOriginalConstructor()->getMock(),
- $this->uid
- );
- }
-
- public function tearDown() {
- $this->instance->removeUserShares($this->uid);
- parent::tearDown();
- }
-
- private function getFullPath($path) {
- return '/' . $this->uid . '/files' . $path;
- }
-
- private function assertMount($mountPoint) {
- $mountPoint = rtrim($mountPoint, '/');
- $mount = $this->mountManager->find($this->getFullPath($mountPoint));
- $this->assertInstanceOf('\OCP\Files\Mount\IMountPoint', $mount);
- $this->assertEquals($this->getFullPath($mountPoint), rtrim($mount->getMountPoint(), '/'));
- $storage = $mount->getStorage();
- $this->assertInstanceOf('\OCA\Files_Sharing\External\Storage', $storage);
- }
-
- private function assertNotMount($mountPoint) {
- $mountPoint = rtrim($mountPoint, '/');
- $mount = $this->mountManager->find($this->getFullPath($mountPoint));
- if ($mount) {
- $this->assertInstanceOf('\OCP\Files\Mount\IMountPoint', $mount);
- $this->assertNotEquals($this->getFullPath($mountPoint), rtrim($mount->getMountPoint(), '/'));
- } else {
- $this->assertNull($mount);
- }
- }
-
- public function testAddBasic() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- }
-
- public function testAddBasicEmptyPassword() {
- $this->instance->addShare('http://example.com', 'foo', '', 'example', 'me', true);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- }
-
- public function testAddNotAcceptedShare() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', false);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertNotMount('/example');
- }
-
- public function testAcceptMount() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', false);
- $open = $this->instance->getOpenShares();
- $this->assertCount(1, $open);
- $this->instance->acceptShare($open[0]['id']);
- $this->assertEquals([], $this->instance->getOpenShares());
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- }
-
- public function testDeclineMount() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', false);
- $open = $this->instance->getOpenShares();
- $this->assertCount(1, $open);
- $this->instance->declineShare($open[0]['id']);
- $this->assertEquals([], $this->instance->getOpenShares());
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertNotMount('/example');
- }
-
- public function testSetMountPoint() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- $this->instance->setMountPoint($this->getFullPath('/example'), $this->getFullPath('/renamed'));
- $this->mountManager->clear();
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/renamed');
- $this->assertNotMount('/example');
- }
-
- public function testRemoveShare() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- $this->instance->removeShare($this->getFullPath('/example'));
- $this->mountManager->clear();
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertNotMount('/example');
- }
-
- public function testRemoveShareForUser() {
- $this->instance->addShare('http://example.com', 'foo', 'bar', 'example', 'me', true);
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertMount('/example');
- $this->instance->removeUserShares($this->uid);
- $this->mountManager->clear();
- \Test_Helper::invokePrivate($this->instance, 'setupMounts');
- $this->assertNotMount('/example');
- }
-}
diff --git a/apps/files_sharing/tests/external/managertest.php b/apps/files_sharing/tests/external/managertest.php
index 0a8c3e5..4158b1b 100644
--- a/apps/files_sharing/tests/external/managertest.php
+++ b/apps/files_sharing/tests/external/managertest.php
@@ -22,6 +22,7 @@
namespace OCA\Files_Sharing\Tests\External;
+use OC\Files\Storage\StorageFactory;
use OCA\Files_Sharing\Tests\TestCase;
class ManagerTest extends TestCase {
@@ -29,16 +30,20 @@ class ManagerTest extends TestCase {
/** @var \OCA\Files_Sharing\External\Manager **/
private $manager;
+ /** @var \OC\Files\Mount\Manager */
+ private $mountManager;
+
private $uid;
protected function setUp() {
parent::setUp();
$this->uid = $this->getUniqueID('user');
+ $this->mountManager = new \OC\Files\Mount\Manager();
$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->mountManager,
+ new StorageFactory(),
$this->getMockBuilder('\OC\HTTPHelper')->disableOriginalConstructor()->getMock(),
$this->uid
);
@@ -46,7 +51,7 @@ class ManagerTest extends TestCase {
public function testAddShare() {
$shareData1 = [
- 'remote' => 'localhost',
+ 'remote' => 'http://localhost',
'token' => 'token1',
'password' => '',
'name' => '/SharedFolder',
@@ -65,6 +70,10 @@ class ManagerTest extends TestCase {
$this->assertCount(1, $openShares);
$this->assertExternalShareEntry($shareData1, $openShares[0], 1, '{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertNotMount('SharedFolder');
+ $this->assertNotMount('{{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();
@@ -73,6 +82,11 @@ class ManagerTest extends TestCase {
// New share falls back to "-1" appendix, because the name is already taken
$this->assertExternalShareEntry($shareData2, $openShares[1], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertNotMount('SharedFolder');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
+
// Accept the first share
$this->manager->acceptShare($openShares[0]['id']);
@@ -86,6 +100,11 @@ class ManagerTest extends TestCase {
$this->assertCount(1, $openShares);
$this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertMount($shareData1['name']);
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['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();
@@ -94,9 +113,19 @@ class ManagerTest extends TestCase {
// 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'] . '}}');
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertMount($shareData1['name']);
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
+
// Decline the third share
$this->manager->declineShare($openShares[1]['id']);
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertMount($shareData1['name']);
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
+
// Check remaining shares - Accepted
$acceptedShares = \Test_Helper::invokePrivate($this->manager, 'getShares', [true]);
$this->assertCount(1, $acceptedShares);
@@ -107,8 +136,19 @@ class ManagerTest extends TestCase {
$this->assertCount(1, $openShares);
$this->assertExternalShareEntry($shareData2, $openShares[0], 2, '{{TemporaryMountPointName#' . $shareData2['name'] . '}}-1');
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertMount($shareData1['name']);
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['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');
+
+ $this->mountManager->clear();
+ \Test_Helper::invokePrivate($this->manager, 'setupMounts');
+ $this->assertNotMount($shareData1['name']);
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}');
+ $this->assertNotMount('{{TemporaryMountPointName#' . $shareData1['name'] . '}}-1');
}
/**
@@ -125,6 +165,30 @@ class ManagerTest extends TestCase {
$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);
+ }
+
+ private function assertMount($mountPoint) {
+ $mountPoint = rtrim($mountPoint, '/');
+ $mount = $this->mountManager->find($this->getFullPath($mountPoint));
+ $this->assertInstanceOf('\OCA\Files_Sharing\External\Mount', $mount);
+ $this->assertInstanceOf('\OCP\Files\Mount\IMountPoint', $mount);
+ $this->assertEquals($this->getFullPath($mountPoint), rtrim($mount->getMountPoint(), '/'));
+ $storage = $mount->getStorage();
+ $this->assertInstanceOf('\OCA\Files_Sharing\External\Storage', $storage);
+ }
+
+ private function assertNotMount($mountPoint) {
+ $mountPoint = rtrim($mountPoint, '/');
+ $mount = $this->mountManager->find($this->getFullPath($mountPoint));
+ if ($mount) {
+ $this->assertInstanceOf('\OCP\Files\Mount\IMountPoint', $mount);
+ $this->assertNotEquals($this->getFullPath($mountPoint), rtrim($mount->getMountPoint(), '/'));
+ } else {
+ $this->assertNull($mount);
+ }
+ }
+ private function getFullPath($path) {
+ return '/' . $this->uid . '/files' . $path;
}
}
--
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