From 9345b9e1b53aae6ad376d385ccc0841104a99155 Mon Sep 17 00:00:00 2001 From: Vincent Petry Date: Mon, 25 Jul 2016 11:48:46 +0200 Subject: [PATCH] [stable9] Simplify testPermissionMovedGroupShare (#25573) Reduces significantly the testing time but still cover the permission change --- apps/files_sharing/tests/sharedmount.php | 76 +++++++----------------- 1 file changed, 20 insertions(+), 56 deletions(-) diff --git a/apps/files_sharing/tests/sharedmount.php b/apps/files_sharing/tests/sharedmount.php index e01deeb60f4..553baebaf31 100644 --- a/apps/files_sharing/tests/sharedmount.php +++ b/apps/files_sharing/tests/sharedmount.php @@ -240,63 +240,27 @@ class Test_Files_Sharing_Mount extends OCA\Files_sharing\Tests\TestCase { } function dataPermissionMovedGroupShare() { - $data = []; - - $powerset = function($permissions) { - $results = [\OCP\Constants::PERMISSION_READ]; - - foreach ($permissions as $permission) { - foreach ($results as $combination) { - $results[] = $permission | $combination; - } - } - return $results; - }; - - //Generate file permissions - $permissions = [ - \OCP\Constants::PERMISSION_UPDATE, - \OCP\Constants::PERMISSION_CREATE, - \OCP\Constants::PERMISSION_SHARE, - ]; - - $allPermissions = $powerset($permissions); - - foreach ($allPermissions as $before) { - foreach ($allPermissions as $after) { - if ($before === $after) { continue; } - - $data[] = [ - 'file', - $before, - $after, - ]; - } - } - - //Generate folder permissions - $permissions = [ - \OCP\Constants::PERMISSION_UPDATE, - \OCP\Constants::PERMISSION_CREATE, - \OCP\Constants::PERMISSION_SHARE, - \OCP\Constants::PERMISSION_DELETE, + return [ + [ + 'file', + \OCP\Constants::PERMISSION_READ + | \OCP\Constants::PERMISSION_UPDATE + | \OCP\Constants::PERMISSION_SHARE, + \OCP\Constants::PERMISSION_READ + | \OCP\Constants::PERMISSION_SHARE, + ], + [ + 'folder', + \OCP\Constants::PERMISSION_READ + | \OCP\Constants::PERMISSION_CREATE + | \OCP\Constants::PERMISSION_UPDATE + | \OCP\Constants::PERMISSION_DELETE + | \OCP\Constants::PERMISSION_SHARE, + \OCP\Constants::PERMISSION_READ + | \OCP\Constants::PERMISSION_CREATE + | \OCP\Constants::PERMISSION_UPDATE, + ], ]; - - $allPermissions = $powerset($permissions); - - foreach ($allPermissions as $before) { - foreach ($allPermissions as $after) { - if ($before === $after) { continue; } - - $data[] = [ - 'folder', - $before, - $after, - ]; - } - } - - return $data; } -- 2.39.5