From aa38bd2b311a2f702cd1cbb425daed5f3b1555af Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 5 Jun 2014 20:03:32 +0200 Subject: adding PHPDoc --- apps/files_sharing/tests/permissions.php | 36 ++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) (limited to 'apps/files_sharing/tests') diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index 0a222b08512..bff71095185 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -19,13 +19,49 @@ * License along with this library. If not, see . * */ +use OC\Files\Cache\Cache; +use OC\Files\Storage\Storage; +use OC\Files\View; + require_once __DIR__ . '/base.php'; class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base { + /** + * @var Storage + */ private $sharedStorageRestrictedShare; + + /** + * @var Storage + */ private $sharedCacheRestrictedShare; + /** + * @var View + */ + private $secondView; + + /** + * @var Storage + */ + private $ownerStorage; + + /** + * @var Storage + */ + private $sharedStorage; + + /** + * @var Cache + */ + private $sharedCache; + + /** + * @var Cache + */ + private $ownerCache; + function setUp() { parent::setUp(); -- cgit v1.2.3 From 961e4e5c7ce315c29cbae720e41ee50b91331e37 Mon Sep 17 00:00:00 2001 From: Thomas Müller Date: Thu, 5 Jun 2014 20:33:52 +0200 Subject: adjust unit test assert values --- apps/files_sharing/tests/permissions.php | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) (limited to 'apps/files_sharing/tests') diff --git a/apps/files_sharing/tests/permissions.php b/apps/files_sharing/tests/permissions.php index bff71095185..2cbc412d261 100644 --- a/apps/files_sharing/tests/permissions.php +++ b/apps/files_sharing/tests/permissions.php @@ -141,16 +141,14 @@ class Test_Files_Sharing_Permissions extends Test_Files_Sharing_Base { $this->assertEquals('subdir', $contents[0]['name']); $this->assertEquals(31, $contents[0]['permissions']); $this->assertEquals('textfile.txt', $contents[1]['name']); - $this->assertEquals(31, $contents[1]['permissions']); + // 27 is correct because create is reserved to folders only - requires more unit tests overall to ensure this + $this->assertEquals(27, $contents[1]['permissions']); $contents = $this->secondView->getDirectoryContent('files/shareddirrestricted'); $this->assertEquals('subdir', $contents[0]['name']); - $this->assertEquals(7, $contents[0]['permissions']); + $this->assertEquals(7 | \OCP\PERMISSION_DELETE, $contents[0]['permissions']); $this->assertEquals('textfile1.txt', $contents[1]['name']); - $this->assertEquals(7, $contents[1]['permissions']); - - // the share mount point should always have delete permissions to allow the user - // to unmount it - $restrictedShare = $this->secondView->getFileInfo('files/shareddirrestricted'); - $this->assertEquals(7 | \OCP\PERMISSION_DELETE, $restrictedShare['permissions']); + // 3 is correct because create is reserved to folders only + // delete permissions are added since mount points can always be deleted + $this->assertEquals(3 | \OCP\PERMISSION_DELETE, $contents[1]['permissions']); } } -- cgit v1.2.3