mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

update unit tests 

Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
This commit is contained in:
Bjoern Schiessle 2018-07-04 10:39:13 +02:00
parent 5b06a7d773
commit 3942d731d2
No known key found for this signature in database
GPG Key ID: 2378A753E2BF04F6
7 changed files with 120 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
apps/federatedfilesharing/tests/FederatedShareProviderTest.php
View File

@ -33,6 +33,7 @@ use OCA\FederatedFileSharing\AddressHandler;
use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\FederatedFileSharing\FederatedShareProvider;
use OCA\FederatedFileSharing\Notifications; use OCA\FederatedFileSharing\Notifications;
use OCA\FederatedFileSharing\TokenHandler; use OCA\FederatedFileSharing\TokenHandler;
use OCP\Federation\ICloudFederationProviderManager;
use OCP\Federation\ICloudIdManager; use OCP\Federation\ICloudIdManager;
use OCP\Files\File; use OCP\Files\File;
use OCP\Files\IRootFolder; use OCP\Files\IRootFolder;
@ -80,6 +81,8 @@ class FederatedShareProviderTest extends \Test\TestCase {
/** @var ICloudIdManager */ /** @var ICloudIdManager */
private $cloudIdManager; private $cloudIdManager;
/** @var \PHPUnit_Framework_MockObject_MockObject|ICloudFederationProviderManager */
private $cloudFederationProviderManager;
public function setUp() { public function setUp() {
parent::setUp(); parent::setUp();
@ -107,6 +110,8 @@ class FederatedShareProviderTest extends \Test\TestCase {
$this->userManager->expects($this->any())->method('userExists')->willReturn(true); $this->userManager->expects($this->any())->method('userExists')->willReturn(true);
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
$this->provider = new FederatedShareProvider( $this->provider = new FederatedShareProvider(
$this->connection, $this->connection,
$this->addressHandler, $this->addressHandler,
@ -118,7 +123,8 @@ class FederatedShareProviderTest extends \Test\TestCase {
$this->config, $this->config,
$this->userManager, $this->userManager,
$this->cloudIdManager, $this->cloudIdManager,
$this->gsConfig $this->gsConfig,
$this->cloudFederationProviderManager
); );
$this->shareManager = \OC::$server->getShareManager(); $this->shareManager = \OC::$server->getShareManager();
@ -141,6 +147,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->tokenHandler->method('generateToken')->willReturn('token'); $this->tokenHandler->method('generateToken')->willReturn('token');
@ -212,6 +219,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->tokenHandler->method('generateToken')->willReturn('token'); $this->tokenHandler->method('generateToken')->willReturn('token');
@ -268,6 +276,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->tokenHandler->method('generateToken')->willReturn('token'); $this->tokenHandler->method('generateToken')->willReturn('token');
@ -367,6 +376,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->tokenHandler->method('generateToken')->willReturn('token'); $this->tokenHandler->method('generateToken')->willReturn('token');
@ -417,7 +427,8 @@ class FederatedShareProviderTest extends \Test\TestCase {
$this->config, $this->config,
$this->userManager, $this->userManager,
$this->cloudIdManager, $this->cloudIdManager,
$this->gsConfig $this->gsConfig,
$this->cloudFederationProviderManager
] ]
)->setMethods(['sendPermissionUpdate'])->getMock(); )->setMethods(['sendPermissionUpdate'])->getMock();
@ -435,6 +446,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy($sharedBy) ->setSharedBy($sharedBy)
->setShareOwner($owner) ->setShareOwner($owner)
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->tokenHandler->method('generateToken')->willReturn('token'); $this->tokenHandler->method('generateToken')->willReturn('token');
@ -505,6 +517,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share); $this->provider->create($share);
@ -513,6 +526,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy2') ->setSharedBy('sharedBy2')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share2); $this->provider->create($share2);
@ -543,6 +557,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share); $this->provider->create($share);
@ -555,6 +570,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node2); ->setNode($node2);
$this->provider->create($share2); $this->provider->create($share2);
@ -584,6 +600,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('shareOwner') ->setSharedBy('shareOwner')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share); $this->provider->create($share);
@ -592,6 +609,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share2); $this->provider->create($share2);
@ -628,6 +646,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share); $this->provider->create($share);
@ -636,6 +655,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy('sharedBy') ->setSharedBy('sharedBy')
->setShareOwner('shareOwner') ->setShareOwner('shareOwner')
->setPermissions(19) ->setPermissions(19)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($node); ->setNode($node);
$this->provider->create($share2); $this->provider->create($share2);
@ -826,6 +846,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy($u1->getUID()) ->setSharedBy($u1->getUID())
->setShareOwner($u1->getUID()) ->setShareOwner($u1->getUID())
->setPermissions(\OCP\Constants::PERMISSION_READ) ->setPermissions(\OCP\Constants::PERMISSION_READ)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($file1); ->setNode($file1);
$this->provider->create($share1); $this->provider->create($share1);
@ -834,6 +855,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy($u2->getUID()) ->setSharedBy($u2->getUID())
->setShareOwner($u1->getUID()) ->setShareOwner($u1->getUID())
->setPermissions(\OCP\Constants::PERMISSION_READ) ->setPermissions(\OCP\Constants::PERMISSION_READ)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($file2); ->setNode($file2);
$this->provider->create($share2); $this->provider->create($share2);
@ -880,6 +902,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy($u1->getUID()) ->setSharedBy($u1->getUID())
->setShareOwner($u1->getUID()) ->setShareOwner($u1->getUID())
->setPermissions(\OCP\Constants::PERMISSION_READ) ->setPermissions(\OCP\Constants::PERMISSION_READ)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($file1); ->setNode($file1);
$this->provider->create($share1); $this->provider->create($share1);
@ -888,6 +911,7 @@ class FederatedShareProviderTest extends \Test\TestCase {
->setSharedBy($u1->getUID()) ->setSharedBy($u1->getUID())
->setShareOwner($u1->getUID()) ->setShareOwner($u1->getUID())
->setPermissions(\OCP\Constants::PERMISSION_READ) ->setPermissions(\OCP\Constants::PERMISSION_READ)
->setShareType(\OCP\Share::SHARE_TYPE_REMOTE)
->setNode($file1); ->setNode($file1);
$this->provider->create($share2); $this->provider->create($share2);

21
apps/federatedfilesharing/tests/Settings/AdminTest.php
View File

@ -72,6 +72,10 @@ class AdminTest extends TestCase {
->expects($this->once()) ->expects($this->once())
->method('isIncomingServer2serverShareEnabled') ->method('isIncomingServer2serverShareEnabled')
->willReturn($state); ->willReturn($state);
$this->federatedShareProvider
->expects($this->once())
->method('isIncomingServer2serverShareEnabled')
->willReturn($state);
$this->federatedShareProvider $this->federatedShareProvider
->expects($this->once()) ->expects($this->once())
->method('isLookupServerQueriesEnabled') ->method('isLookupServerQueriesEnabled')
@ -80,6 +84,18 @@ class AdminTest extends TestCase {
->expects($this->once()) ->expects($this->once())
->method('isLookupServerUploadEnabled') ->method('isLookupServerUploadEnabled')
->willReturn($state); ->willReturn($state);
$this->federatedShareProvider
->expects($this->once())
->method('isFederatedGroupSharingSupported')
->willReturn($state);
$this->federatedShareProvider
->expects($this->once())
->method('isOutgoingServer2serverGroupShareEnabled')
->willReturn($state);
$this->federatedShareProvider
->expects($this->once())
->method('isIncomingServer2serverGroupShareEnabled')
->willReturn($state);
$this->gsConfig->expects($this->once())->method('onlyInternalFederation') $this->gsConfig->expects($this->once())->method('onlyInternalFederation')
->willReturn($state); ->willReturn($state);
@ -88,7 +104,10 @@ class AdminTest extends TestCase {
'outgoingServer2serverShareEnabled' => $state, 'outgoingServer2serverShareEnabled' => $state,
'incomingServer2serverShareEnabled' => $state, 'incomingServer2serverShareEnabled' => $state,
'lookupServerEnabled' => $state, 'lookupServerEnabled' => $state,
'lookupServerUploadEnabled' => $state 'lookupServerUploadEnabled' => $state,
'federatedGroupSharingSupported' => $state,
'outgoingServer2serverGroupShareEnabled' => $state,
'incomingServer2serverGroupShareEnabled' => $state,
]; ];
$expected = new TemplateResponse('federatedfilesharing', 'settings-admin', $params, ''); $expected = new TemplateResponse('federatedfilesharing', 'settings-admin', $params, '');
$this->assertEquals($expected, $this->admin->getForm()); $this->assertEquals($expected, $this->admin->getForm());

8
apps/files_sharing/lib/Controller/ShareesAPIController.php
View File

@ -223,7 +223,13 @@ class ShareesAPIController extends OCSController {
} }
protected function isRemoteGroupSharingAllowed(string $itemType): bool { protected function isRemoteGroupSharingAllowed(string $itemType): bool {
return true; try {
// FIXME: static foo makes unit testing unnecessarily difficult
$backend = \OC\Share\Share::getBackend($itemType);
return $backend->isShareTypeAllowed(Share::SHARE_TYPE_REMOTE_GROUP);
} catch (\Exception $e) {
return false;
}
} }

8
apps/files_sharing/lib/External/Manager.php vendored
View File

@ -276,15 +276,16 @@ class Manager {
$mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']); $mountPoint = Files::buildNotExistingFileName($shareFolder, $share['name']);
$mountPoint = Filesystem::normalizePath($mountPoint); $mountPoint = Filesystem::normalizePath($mountPoint);
$hash = md5($mountPoint); $hash = md5($mountPoint);
$userShareAccepted = false;
if($share['share_type'] === Share::SHARE_TYPE_USER) { if((int)$share['share_type'] === Share::SHARE_TYPE_USER) {
$acceptShare = $this->connection->prepare(' $acceptShare = $this->connection->prepare('
UPDATE `*PREFIX*share_external` UPDATE `*PREFIX*share_external`
SET `accepted` = ?, SET `accepted` = ?,
`mountpoint` = ?, `mountpoint` = ?,
`mountpoint_hash` = ? `mountpoint_hash` = ?
WHERE `id` = ? AND `user` = ?'); WHERE `id` = ? AND `user` = ?');
$updated = $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid)); $userShareAccepted = $acceptShare->execute(array(1, $mountPoint, $hash, $id, $this->uid));
} else { } else {
$result = $this->writeShareToDb( $result = $this->writeShareToDb(
$share['remote'], $share['remote'],
@ -297,9 +298,8 @@ class Manager {
$share['remote_id'], $share['remote_id'],
$id, $id,
$share['share_type']); $share['share_type']);
// TODO group share, add additional row for the user who accepted it
} }
if ($updated === true) { if ($userShareAccepted === true) {
$this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept'); $this->sendFeedbackToRemote($share['remote'], $share['share_token'], $share['remote_id'], 'accept');
\OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]); \OC_Hook::emit(Share::class, 'federated_share_added', ['server' => $share['remote']]);
$result = true; $result = true;

4
apps/files_sharing/lib/ShareBackend/File.php
View File

@ -195,6 +195,10 @@ class File implements \OCP\Share_Backend_File_Dependent {
return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled(); return $this->federatedShareProvider->isOutgoingServer2serverShareEnabled();
} }
if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE_GROUP) {
return $this->federatedShareProvider->isOutgoingServer2serverGroupShareEnabled();
}
return true; return true;
} }

78
apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
View File

@ -85,120 +85,125 @@ class ShareesAPIControllerTest extends TestCase {
public function dataSearch() { public function dataSearch() {
$noRemote = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_EMAIL]; $noRemote = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_EMAIL];
$allTypes = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE, Share::SHARE_TYPE_EMAIL]; $allTypes = [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE, Share::SHARE_TYPE_REMOTE_GROUP, Share::SHARE_TYPE_EMAIL];
return [ return [
[[], '', 'yes', true, true, $noRemote, false, true, true], [[], '', 'yes', true, true, true, $noRemote, false, true, true],
// Test itemType // Test itemType
[[ [[
'search' => '', 'search' => '',
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true, true, $noRemote, false, true, true],
[[ [[
'search' => 'foobar', 'search' => 'foobar',
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true, true, $noRemote, false, true, true],
[[ [[
'search' => 0, 'search' => 0,
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true, true, $noRemote, false, true, true],
// Test itemType // Test itemType
[[ [[
'itemType' => '', 'itemType' => '',
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true, true, $noRemote, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 0, 'itemType' => 0,
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true , true, $noRemote, false, true, true],
// Test shareType // Test shareType
[[ [[
'itemType' => 'call', 'itemType' => 'call',
], '', 'yes', true, true, $noRemote, false, true, true], ], '', 'yes', true, true, true, $noRemote, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => 0, 'shareType' => 0,
], '', 'yes', true, false, [0], false, true, true], ], '', 'yes', true, true, false, [0], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => '0', 'shareType' => '0',
], '', 'yes', true, false, [0], false, true, true], ], '', 'yes', true, true, false, [0], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => 1, 'shareType' => 1,
], '', 'yes', true, false, [1], false, true, true], ], '', 'yes', true, true, false, [1], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => 12, 'shareType' => 12,
], '', 'yes', true, false, [], false, true, true], ], '', 'yes', true, true, false, [], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => 'foobar', 'shareType' => 'foobar',
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => [0, 1, 2], 'shareType' => [0, 1, 2],
], '', 'yes', false, false, [0, 1], false, true, true], ], '', 'yes', false, false, false, [0, 1], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => [0, 1], 'shareType' => [0, 1],
], '', 'yes', false, false, [0, 1], false, true, true], ], '', 'yes', false, false, false, [0, 1], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => $allTypes, 'shareType' => $allTypes,
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => $allTypes, 'shareType' => $allTypes,
], '', 'yes', false, false, [0, 1], false, true, true], ], '', 'yes', false, false, false, [0, 1], false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => $allTypes, 'shareType' => $allTypes,
], '', 'yes', true, false, [0, 6], false, true, false], ], '', 'yes', true, false, false, [0, 6], false, true, false],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'shareType' => $allTypes, 'shareType' => $allTypes,
], '', 'yes', false, true, [0, 4], false, true, false], ], '', 'yes', false, false, true, [0, 4], false, true, false],
[[
'itemType' => 'folder',
'shareType' => $allTypes,
], '', 'yes', true, true, false, [0, 6, 9], false, true, false],
// Test pagination // Test pagination
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'page' => 1, 'page' => 1,
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'page' => 10, 'page' => 10,
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
// Test perPage // Test perPage
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'perPage' => 1, 'perPage' => 1,
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
'perPage' => 10, 'perPage' => 10,
], '', 'yes', true, true, $allTypes, false, true, true], ], '', 'yes', true, true, true, $allTypes, false, true, true],
// Test $shareWithGroupOnly setting // Test $shareWithGroupOnly setting
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], 'no', 'yes', true, true, $allTypes, false, true, true], ], 'no', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], 'yes', 'yes', true, true, $allTypes, true, true, true], ], 'yes', 'yes', true, true, true, $allTypes, true, true, true],
// Test $shareeEnumeration setting // Test $shareeEnumeration setting
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], 'no', 'yes', true, true, $allTypes, false, true, true], ], 'no', 'yes', true, true, true, $allTypes, false, true, true],
[[ [[
'itemType' => 'folder', 'itemType' => 'folder',
], 'no', 'no', true, true, $allTypes, false, false, true], ], 'no', 'no', true, true, true, $allTypes, false, false, true],
]; ];
} }
@ -209,13 +214,15 @@ class ShareesAPIControllerTest extends TestCase {
* @param string $apiSetting * @param string $apiSetting
* @param string $enumSetting * @param string $enumSetting
* @param bool $remoteSharingEnabled * @param bool $remoteSharingEnabled
* @param bool $isRemoteGroupSharingEnabled
* @param bool $emailSharingEnabled * @param bool $emailSharingEnabled
* @param array $shareTypes * @param array $shareTypes
* @param bool $shareWithGroupOnly * @param bool $shareWithGroupOnly
* @param bool $shareeEnumeration * @param bool $shareeEnumeration
* @param bool $allowGroupSharing * @param bool $allowGroupSharing
* @throws OCSBadRequestException
*/ */
public function testSearch($getData, $apiSetting, $enumSetting, $remoteSharingEnabled, $emailSharingEnabled, $shareTypes, $shareWithGroupOnly, $shareeEnumeration, $allowGroupSharing) { public function testSearch($getData, $apiSetting, $enumSetting, $remoteSharingEnabled, $isRemoteGroupSharingEnabled, $emailSharingEnabled, $shareTypes, $shareWithGroupOnly, $shareeEnumeration, $allowGroupSharing) {
$search = isset($getData['search']) ? $getData['search'] : ''; $search = isset($getData['search']) ? $getData['search'] : '';
$itemType = isset($getData['itemType']) ? $getData['itemType'] : 'irrelevant'; $itemType = isset($getData['itemType']) ? $getData['itemType'] : 'irrelevant';
$page = isset($getData['page']) ? $getData['page'] : 1; $page = isset($getData['page']) ? $getData['page'] : 1;
@ -251,7 +258,7 @@ class ShareesAPIControllerTest extends TestCase {
$this->shareManager, $this->shareManager,
$this->collaboratorSearch $this->collaboratorSearch
]) ])
->setMethods(['isRemoteSharingAllowed', 'shareProviderExists']) ->setMethods(['isRemoteSharingAllowed', 'shareProviderExists', 'isRemoteGroupSharingAllowed'])
->getMock(); ->getMock();
$this->collaboratorSearch->expects($this->once()) $this->collaboratorSearch->expects($this->once())
@ -264,6 +271,13 @@ class ShareesAPIControllerTest extends TestCase {
->with($itemType) ->with($itemType)
->willReturn($remoteSharingEnabled); ->willReturn($remoteSharingEnabled);
$sharees->expects($this->any())
->method('isRemoteGroupSharingAllowed')
->with($itemType)
->willReturn($isRemoteGroupSharingEnabled);
$this->shareManager->expects($this->any()) $this->shareManager->expects($this->any())
->method('shareProviderExists') ->method('shareProviderExists')
->with(\OCP\Share::SHARE_TYPE_EMAIL) ->with(\OCP\Share::SHARE_TYPE_EMAIL)

13
apps/files_sharing/tests/External/ManagerTest.php vendored
View File

@ -35,6 +35,8 @@ use OCA\Files_Sharing\Tests\TestCase;
use OCP\Federation\ICloudFederationFactory; use OCP\Federation\ICloudFederationFactory;
use OCP\Federation\ICloudFederationProviderManager; use OCP\Federation\ICloudFederationProviderManager;
use OCP\Http\Client\IClientService; use OCP\Http\Client\IClientService;
use OCP\IGroupManager;
use OCP\IUserManager;
use Test\Traits\UserTrait; use Test\Traits\UserTrait;
/** /**
@ -62,6 +64,12 @@ class ManagerTest extends TestCase {
/** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */ /** @var ICloudFederationFactory|\PHPUnit_Framework_MockObject_MockObject */
private $cloudFederationFactory; private $cloudFederationFactory;
/** @var \PHPUnit_Framework_MockObject_MockObject|IGroupManager */
private $groupManager;
/** @var \PHPUnit_Framework_MockObject_MockObject|IUserManager */
private $userManager;
private $uid; private $uid;
/** /**
@ -81,6 +89,8 @@ class ManagerTest extends TestCase {
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class); $this->cloudFederationProviderManager = $this->createMock(ICloudFederationProviderManager::class);
$this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class); $this->cloudFederationFactory = $this->createMock(ICloudFederationFactory::class);
$this->groupManager = $this->createMock(IGroupManager::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->manager = $this->getMockBuilder(Manager::class) $this->manager = $this->getMockBuilder(Manager::class)
->setConstructorArgs( ->setConstructorArgs(
@ -93,6 +103,8 @@ class ManagerTest extends TestCase {
\OC::$server->query(\OCP\OCS\IDiscoveryService::class), \OC::$server->query(\OCP\OCS\IDiscoveryService::class),
$this->cloudFederationProviderManager, $this->cloudFederationProviderManager,
$this->cloudFederationFactory, $this->cloudFederationFactory,
$this->groupManager,
$this->userManager,
$this->uid $this->uid
] ]
)->setMethods(['tryOCMEndPoint'])->getMock(); )->setMethods(['tryOCMEndPoint'])->getMock();
@ -117,6 +129,7 @@ class ManagerTest extends TestCase {
'password' => '', 'password' => '',
'name' => '/SharedFolder', 'name' => '/SharedFolder',
'owner' => 'foobar', 'owner' => 'foobar',
'shareType' => \OCP\Share::SHARE_TYPE_USER,
'accepted' => false, 'accepted' => false,
'user' => $this->uid, 'user' => $this->uid,
]; ];