summaryrefslogtreecommitdiffstats
path: root/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
diff options
context:
space:
mode:
Diffstat (limited to 'apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php')
-rw-r--r--apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php1597
1 files changed, 52 insertions, 1545 deletions
diff --git a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
index e027d0751cb..2b919f4849d 100644
--- a/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
+++ b/apps/files_sharing/tests/Controller/ShareesAPIControllerTest.php
@@ -25,14 +25,16 @@
namespace OCA\Files_Sharing\Tests\Controller;
-use OC\Federation\CloudIdManager;
use OCA\Files_Sharing\Controller\ShareesAPIController;
use OCA\Files_Sharing\Tests\TestCase;
use OCP\AppFramework\Http;
use OCP\AppFramework\OCS\OCSBadRequestException;
-use OCP\Federation\ICloudIdManager;
-use OCP\Http\Client\IClientService;
+use OCP\Collaboration\Collaborators\ISearch;
+use OCP\IConfig;
+use OCP\IRequest;
+use OCP\IURLGenerator;
use OCP\Share;
+use OCP\Share\IManager;
/**
* Class ShareesTest
@@ -45,1251 +47,39 @@ class ShareesAPIControllerTest extends TestCase {
/** @var ShareesAPIController */
protected $sharees;
- /** @var \OCP\IUserManager|\PHPUnit_Framework_MockObject_MockObject */
- protected $userManager;
-
- /** @var \OCP\IGroupManager|\PHPUnit_Framework_MockObject_MockObject */
- protected $groupManager;
-
- /** @var \OCP\Contacts\IManager|\PHPUnit_Framework_MockObject_MockObject */
- protected $contactsManager;
-
- /** @var \OCP\IUserSession|\PHPUnit_Framework_MockObject_MockObject */
- protected $session;
-
- /** @var \OCP\IRequest|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject */
protected $request;
- /** @var \OCP\Share\IManager|\PHPUnit_Framework_MockObject_MockObject */
+ /** @var IManager|\PHPUnit_Framework_MockObject_MockObject */
protected $shareManager;
- /** @var IClientService|\PHPUnit_Framework_MockObject_MockObject */
- private $clientService;
-
- /** @var ICloudIdManager */
- private $cloudIdManager;
+ /** @var ISearch|\PHPUnit_Framework_MockObject_MockObject */
+ protected $collaboratorSearch;
protected function setUp() {
parent::setUp();
- $this->userManager = $this->getMockBuilder('OCP\IUserManager')
- ->disableOriginalConstructor()
- ->getMock();
+ $this->request = $this->createMock(IRequest::class);
+ $this->shareManager = $this->createMock(IManager::class);
- $this->groupManager = $this->getMockBuilder('OCP\IGroupManager')
- ->disableOriginalConstructor()
- ->getMock();
+ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $configMock */
+ $configMock = $this->createMock(IConfig::class);
- $this->contactsManager = $this->getMockBuilder('OCP\Contacts\IManager')
- ->disableOriginalConstructor()
- ->getMock();
+ /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGeneratorMock */
+ $urlGeneratorMock = $this->createMock(IURLGenerator::class);
- $this->session = $this->getMockBuilder('OCP\IUserSession')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->request = $this->getMockBuilder('OCP\IRequest')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->shareManager = $this->getMockBuilder('OCP\Share\IManager')
- ->disableOriginalConstructor()
- ->getMock();
-
- $this->clientService = $this->createMock(IClientService::class);
-
- $this->cloudIdManager = new CloudIdManager();
+ $this->collaboratorSearch = $this->createMock(ISearch::class);
$this->sharees = new ShareesAPIController(
'files_sharing',
$this->request,
- $this->groupManager,
- $this->userManager,
- $this->contactsManager,
- $this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
- $this->session,
- $this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
- $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+ $configMock,
+ $urlGeneratorMock,
$this->shareManager,
- $this->clientService,
- $this->cloudIdManager
+ $this->collaboratorSearch
);
}
- /**
- * @param string $uid
- * @param string $displayName
- * @return \OCP\IUser|\PHPUnit_Framework_MockObject_MockObject
- */
- protected function getUserMock($uid, $displayName) {
- $user = $this->getMockBuilder('OCP\IUser')
- ->disableOriginalConstructor()
- ->getMock();
-
- $user->expects($this->any())
- ->method('getUID')
- ->willReturn($uid);
-
- $user->expects($this->any())
- ->method('getDisplayName')
- ->willReturn($displayName);
-
- return $user;
- }
-
- /**
- * @param string $gid
- * @return \OCP\IGroup|\PHPUnit_Framework_MockObject_MockObject
- */
- protected function getGroupMock($gid, $displayName = null) {
- $group = $this->getMockBuilder('OCP\IGroup')
- ->disableOriginalConstructor()
- ->getMock();
-
- $group->expects($this->any())
- ->method('getGID')
- ->willReturn($gid);
-
- if (is_null($displayName)) {
- // note: this is how the Group class behaves
- $displayName = $gid;
- }
-
- $group->expects($this->any())
- ->method('getDisplayName')
- ->willReturn($displayName);
-
- return $group;
- }
-
- public function dataGetUsers() {
- return [
- ['test', false, true, [], [], [], [], true, false],
- ['test', false, false, [], [], [], [], true, false],
- ['test', true, true, [], [], [], [], true, false],
- ['test', true, false, [], [], [], [], true, false],
- [
- 'test', false, true, [], [],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test', false, false, [], [],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test', true, true, [], [],
- [], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test', true, false, [], [],
- [], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test', true, true, ['test-group'], [['test-group', 'test', 2, 0, []]],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test', true, false, ['test-group'], [['test-group', 'test', 2, 0, []]],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ], [], true, $this->getUserMock('test', 'Test')
- ],
- [
- 'test',
- false,
- true,
- [],
- [
- $this->getUserMock('test1', 'Test One'),
- ],
- [],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ],
- true,
- false,
- ],
- [
- 'test',
- false,
- false,
- [],
- [
- $this->getUserMock('test1', 'Test One'),
- ],
- [],
- [],
- true,
- false,
- ],
- [
- 'test',
- false,
- true,
- [],
- [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
- ],
- [],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ],
- false,
- false,
- ],
- [
- 'test',
- false,
- false,
- [],
- [
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
- ],
- [],
- [],
- true,
- false,
- ],
- [
- 'test',
- false,
- true,
- [],
- [
- $this->getUserMock('test0', 'Test'),
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
- ],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test0']],
- ],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ],
- false,
- false,
- ],
- [
- 'test',
- false,
- false,
- [],
- [
- $this->getUserMock('test0', 'Test'),
- $this->getUserMock('test1', 'Test One'),
- $this->getUserMock('test2', 'Test Two'),
- ],
- [
- ['label' => 'Test', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test0']],
- ],
- [],
- true,
- false,
- ],
- [
- 'test',
- true,
- true,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, ['test1' => 'Test One']],
- ['xyz', 'test', 2, 0, []],
- ],
- [],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ],
- true,
- false,
- ],
- [
- 'test',
- true,
- false,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, ['test1' => 'Test One']],
- ['xyz', 'test', 2, 0, []],
- ],
- [],
- [],
- true,
- false,
- ],
- [
- 'test',
- true,
- true,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, [
- 'test1' => 'Test One',
- 'test2' => 'Test Two',
- ]],
- ['xyz', 'test', 2, 0, [
- 'test1' => 'Test One',
- 'test2' => 'Test Two',
- ]],
- ],
- [],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ],
- false,
- false,
- ],
- [
- 'test',
- true,
- false,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, [
- 'test1' => 'Test One',
- 'test2' => 'Test Two',
- ]],
- ['xyz', 'test', 2, 0, [
- 'test1' => 'Test One',
- 'test2' => 'Test Two',
- ]],
- ],
- [],
- [],
- true,
- false,
- ],
- [
- 'test',
- true,
- true,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, [
- 'test' => 'Test One',
- ]],
- ['xyz', 'test', 2, 0, [
- 'test2' => 'Test Two',
- ]],
- ],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ],
- [
- ['label' => 'Test Two', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ],
- false,
- false,
- ],
- [
- 'test',
- true,
- false,
- ['abc', 'xyz'],
- [
- ['abc', 'test', 2, 0, [
- 'test' => 'Test One',
- ]],
- ['xyz', 'test', 2, 0, [
- 'test2' => 'Test Two',
- ]],
- ],
- [
- ['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test']],
- ],
- [],
- true,
- false,
- ],
- ];
- }
-
- /**
- * @dataProvider dataGetUsers
- *
- * @param string $searchTerm
- * @param bool $shareWithGroupOnly
- * @param bool $shareeEnumeration
- * @param array $groupResponse
- * @param array $userResponse
- * @param array $exactExpected
- * @param array $expected
- * @param bool $reachedEnd
- * @param mixed $singleUser
- */
- public function testGetUsers($searchTerm, $shareWithGroupOnly, $shareeEnumeration, $groupResponse, $userResponse, $exactExpected, $expected, $reachedEnd, $singleUser) {
- $this->invokePrivate($this->sharees, 'limit', [2]);
- $this->invokePrivate($this->sharees, 'offset', [0]);
- $this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
- $this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
-
- $user = $this->getUserMock('admin', 'Administrator');
- $this->session->expects($this->any())
- ->method('getUser')
- ->willReturn($user);
-
- if (!$shareWithGroupOnly) {
- $this->userManager->expects($this->once())
- ->method('searchDisplayName')
- ->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
- ->willReturn($userResponse);
- } else {
- if ($singleUser !== false) {
- $this->groupManager->expects($this->exactly(2))
- ->method('getUserGroupIds')
- ->withConsecutive(
- $user,
- $singleUser
- )
- ->willReturn($groupResponse);
- } else {
- $this->groupManager->expects($this->once())
- ->method('getUserGroupIds')
- ->with($user)
- ->willReturn($groupResponse);
- }
-
- $this->groupManager->expects($this->exactly(sizeof($groupResponse)))
- ->method('displayNamesInGroup')
- ->with($this->anything(), $searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
- ->willReturnMap($userResponse);
- }
-
- if ($singleUser !== false) {
- $this->userManager->expects($this->once())
- ->method('get')
- ->with($searchTerm)
- ->willReturn($singleUser);
- }
-
- $this->invokePrivate($this->sharees, 'getUsers', [$searchTerm]);
- $result = $this->invokePrivate($this->sharees, 'result');
-
- $this->assertEquals($exactExpected, $result['exact']['users']);
- $this->assertEquals($expected, $result['users']);
- $this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
- }
-
- public function dataGetGroups() {
- return [
- ['test', false, true, [], [], [], [], true, false],
- ['test', false, false, [], [], [], [], true, false],
- // group without display name
- [
- 'test', false, true,
- [$this->getGroupMock('test1')],
- [],
- [],
- [['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- true,
- false,
- ],
- // group with display name, search by id
- [
- 'test', false, true,
- [$this->getGroupMock('test1', 'Test One')],
- [],
- [],
- [['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- true,
- false,
- ],
- // group with display name, search by display name
- [
- 'one', false, true,
- [$this->getGroupMock('test1', 'Test One')],
- [],
- [],
- [['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- true,
- false,
- ],
- // group with display name, search by display name, exact expected
- [
- 'Test One', false, true,
- [$this->getGroupMock('test1', 'Test One')],
- [],
- [['label' => 'Test One', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- [],
- true,
- false,
- ],
- [
- 'test', false, false,
- [$this->getGroupMock('test1')],
- [],
- [],
- [],
- true,
- false,
- ],
- [
- 'test', false, true,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- false,
- false,
- ],
- [
- 'test', false, false,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [],
- true,
- false,
- ],
- [
- 'test', false, true,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [],
- [],
- [
- ['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
- ['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
- ],
- false,
- null,
- ],
- [
- 'test', false, false,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [],
- [],
- [],
- true,
- null,
- ],
- [
- 'test', false, true,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [],
- [
- ['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
- ],
- [
- ['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
- ['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
- ],
- false,
- $this->getGroupMock('test'),
- ],
- [
- 'test', false, false,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [],
- [
- ['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
- ],
- [],
- true,
- $this->getGroupMock('test'),
- ],
- ['test', true, true, [], [], [], [], true, false],
- ['test', true, false, [], [], [], [], true, false],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test1'),
- $this->getGroupMock('test2'),
- ],
- [$this->getGroupMock('test1')],
- [],
- [['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- false,
- false,
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test1'),
- $this->getGroupMock('test2'),
- ],
- [$this->getGroupMock('test1')],
- [],
- [],
- true,
- false,
- ],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test')],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [],
- false,
- false,
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test')],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [],
- true,
- false,
- ],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test1')],
- [],
- [['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- false,
- false,
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test1')],
- [],
- [],
- true,
- false,
- ],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']]],
- false,
- false,
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']]],
- [],
- true,
- false,
- ],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [],
- [
- ['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
- ['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
- ],
- false,
- null,
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [],
- [],
- true,
- null,
- ],
- [
- 'test', true, true,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [
- ['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
- ],
- [
- ['label' => 'test0', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test0']],
- ['label' => 'test1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test1']],
- ],
- false,
- $this->getGroupMock('test'),
- ],
- [
- 'test', true, false,
- [
- $this->getGroupMock('test0'),
- $this->getGroupMock('test1'),
- ],
- [$this->getGroupMock('test'), $this->getGroupMock('test0'), $this->getGroupMock('test1')],
- [
- ['label' => 'test', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'test']],
- ],
- [],
- true,
- $this->getGroupMock('test'),
- ],
- ];
- }
-
- /**
- * @dataProvider dataGetGroups
- *
- * @param string $searchTerm
- * @param bool $shareWithGroupOnly
- * @param bool $shareeEnumeration
- * @param array $groupResponse
- * @param array $userGroupsResponse
- * @param array $exactExpected
- * @param array $expected
- * @param bool $reachedEnd
- * @param mixed $singleGroup
- */
- public function testGetGroups($searchTerm, $shareWithGroupOnly, $shareeEnumeration, $groupResponse, $userGroupsResponse, $exactExpected, $expected, $reachedEnd, $singleGroup) {
- $this->invokePrivate($this->sharees, 'limit', [2]);
- $this->invokePrivate($this->sharees, 'offset', [0]);
- $this->invokePrivate($this->sharees, 'shareWithGroupOnly', [$shareWithGroupOnly]);
- $this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
-
- $this->groupManager->expects($this->once())
- ->method('search')
- ->with($searchTerm, $this->invokePrivate($this->sharees, 'limit'), $this->invokePrivate($this->sharees, 'offset'))
- ->willReturn($groupResponse);
-
- if ($singleGroup !== false) {
- $this->groupManager->expects($this->once())
- ->method('get')
- ->with($searchTerm)
- ->willReturn($singleGroup);
- }
-
- if ($shareWithGroupOnly) {
- $user = $this->getUserMock('admin', 'Administrator');
- $this->session->expects($this->any())
- ->method('getUser')
- ->willReturn($user);
-
- $numGetUserGroupsCalls = empty($groupResponse) ? 0 : 1;
- $this->groupManager->expects($this->exactly($numGetUserGroupsCalls))
- ->method('getUserGroups')
- ->with($user)
- ->willReturn($userGroupsResponse);
- }
-
- $this->invokePrivate($this->sharees, 'getGroups', [$searchTerm]);
- $result = $this->invokePrivate($this->sharees, 'result');
-
- $this->assertEquals($exactExpected, $result['exact']['groups']);
- $this->assertEquals($expected, $result['groups']);
- $this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
- }
-
- /**
- * @dataProvider dataGetRemote
- *
- * @param string $searchTerm
- * @param array $contacts
- * @param bool $shareeEnumeration
- * @param array $expected
- * @param bool $reachedEnd
- */
- public function testGetRemote($searchTerm, $contacts, $shareeEnumeration, $expected, $reachedEnd) {
- $this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
- $this->contactsManager->expects($this->any())
- ->method('search')
- ->with($searchTerm, ['CLOUD', 'FN'])
- ->willReturn($contacts);
-
- $result = $this->invokePrivate($this->sharees, 'getRemote', [$searchTerm]);
-
- $this->assertEquals($expected, $result);
- $this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
- }
-
- public function dataGetRemote() {
- return [
- ['test', [], true, ['results' => [], 'exact' => [], 'exactIdMatch' => false], true],
- ['test', [], false, ['results' => [], 'exact' => [], 'exactIdMatch' => false], true],
- [
- 'test@remote',
- [],
- true,
- ['results' => [], 'exact' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote',
- [],
- false,
- ['results' => [], 'exact' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exact' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'test@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'test@remote']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'username@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [], 'exact' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exactIdMatch' => true],
- true,
- ],
- [
- 'username@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'username@localhost', 'server' => 'localhost']]], 'exactIdMatch' => true],
- true,
- ],
- // contact with space
- [
- 'user name@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User Name @ Localhost',
- 'CLOUD' => [
- 'user name@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user name@localhost', 'server' => 'localhost']]], 'exactIdMatch' => true],
- true,
- ],
- // remote with space, no contact
- [
- 'user space@remote',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'CLOUD' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'CLOUD' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'user space@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'user space@remote']]], 'exactIdMatch' => false],
- true,
- ],
- ];
- }
-
- /**
- * @dataProvider dataGetEmail
- *
- * @param string $searchTerm
- * @param array $contacts
- * @param bool $shareeEnumeration
- * @param array $expected
- * @param bool $reachedEnd
- */
- public function testGetEmail($searchTerm, $contacts, $shareeEnumeration, $expected, $reachedEnd) {
- $this->invokePrivate($this->sharees, 'shareeEnumeration', [$shareeEnumeration]);
- $this->contactsManager->expects($this->any())
- ->method('search')
- ->with($searchTerm, ['EMAIL', 'FN'])
- ->willReturn($contacts);
-
- $result = $this->invokePrivate($this->sharees, 'getEmail', [$searchTerm]);
-
- $this->assertEquals($expected, $result);
- $this->assertCount((int) $reachedEnd, $this->invokePrivate($this->sharees, 'reachedEndFor'));
- }
-
- public function dataGetEmail() {
- return [
- ['test', [], true, ['results' => [], 'exact' => [], 'exactIdMatch' => false], true],
- ['test', [], false, ['results' => [], 'exact' => [], 'exactIdMatch' => false], true],
- [
- 'test@remote.com',
- [],
- true,
- ['results' => [], 'exact' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]], 'exactIdMatch' => false],
- true,
- ],
- [ // no valid email address
- 'test@remote',
- [],
- true,
- ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote.com',
- [],
- false,
- ['results' => [], 'exact' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote.com',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exact' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'test@remote.com',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'test@remote.com', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'test@remote.com']]], 'exactIdMatch' => false],
- true,
- ],
- [
- 'username@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- true,
- ['results' => [], 'exact' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exactIdMatch' => true],
- true,
- ],
- [
- 'username@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'User @ Localhost (username@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'username@localhost']]], 'exactIdMatch' => true],
- true,
- ],
- // contact with space
- [
- 'user name@localhost',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User Name @ Localhost',
- 'EMAIL' => [
- 'user name@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [['label' => 'User Name @ Localhost (user name@localhost)', 'value' => ['shareType' => Share::SHARE_TYPE_EMAIL, 'shareWith' => 'user name@localhost']]], 'exactIdMatch' => true],
- true,
- ],
- // remote with space, no contact
- [
- 'user space@remote.com',
- [
- [
- 'FN' => 'User3 @ Localhost',
- ],
- [
- 'FN' => 'User2 @ Localhost',
- 'EMAIL' => [
- ],
- ],
- [
- 'FN' => 'User @ Localhost',
- 'EMAIL' => [
- 'username@localhost',
- ],
- ],
- ],
- false,
- ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- true,
- ],
- // Local user found by email
- [
- 'test@example.com',
- [
- [
- 'FN' => 'User',
- 'EMAIL' => ['test@example.com'],
- 'CLOUD' => ['test@localhost'],
- 'isLocalSystemBook' => true,
- ]
- ],
- false,
- ['results' => [], 'exact' => [], 'exactIdMatch' => true],
- false,
- ]
- ];
- }
-
public function dataSearch() {
$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];
@@ -1424,14 +214,13 @@ class ShareesAPIControllerTest extends TestCase {
*/
public function testSearch($getData, $apiSetting, $enumSetting, $remoteSharingEnabled, $emailSharingEnabled, $shareTypes, $shareWithGroupOnly, $shareeEnumeration, $allowGroupSharing) {
$search = isset($getData['search']) ? $getData['search'] : '';
- $itemType = isset($getData['itemType']) ? $getData['itemType'] : null;
+ $itemType = isset($getData['itemType']) ? $getData['itemType'] : 'irrelevant';
$page = isset($getData['page']) ? $getData['page'] : 1;
$perPage = isset($getData['perPage']) ? $getData['perPage'] : 200;
$shareType = isset($getData['shareType']) ? $getData['shareType'] : null;
- $config = $this->getMockBuilder('OCP\IConfig')
- ->disableOriginalConstructor()
- ->getMock();
+ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */
+ $config = $this->createMock(IConfig::class);
$config->expects($this->exactly(2))
->method('getAppValue')
->with('core', $this->anything(), $this->anything())
@@ -1444,41 +233,29 @@ class ShareesAPIControllerTest extends TestCase {
->method('allowGroupSharing')
->willReturn($allowGroupSharing);
+ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+ $request = $this->createMock(IRequest::class);
+ /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */
+ $urlGenerator = $this->createMock(IURLGenerator::class);
+
/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
$sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController')
->setConstructorArgs([
'files_sharing',
- $this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
- $this->groupManager,
- $this->userManager,
- $this->contactsManager,
+ $request,
$config,
- $this->session,
- $this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
- $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+ $urlGenerator,
$this->shareManager,
- $this->clientService,
- $this->cloudIdManager
+ $this->collaboratorSearch
])
- ->setMethods(array('searchSharees', 'isRemoteSharingAllowed', 'shareProviderExists'))
+ ->setMethods(['isRemoteSharingAllowed', 'shareProviderExists'])
->getMock();
- $sharees->expects($this->once())
- ->method('searchSharees')
- ->willReturnCallback(function
- ($isearch, $iitemType, $ishareTypes, $ipage, $iperPage)
- use ($search, $itemType, $shareTypes, $page, $perPage) {
- // We are doing strict comparisons here, so we can differ 0/'' and null on shareType/itemType
- $this->assertSame($search, $isearch);
- $this->assertSame($itemType, $iitemType);
- $this->assertSame(count($shareTypes), count($ishareTypes));
- foreach($shareTypes as $expected) {
- $this->assertTrue(in_array($expected, $ishareTypes));
- }
- $this->assertSame($page, $ipage);
- $this->assertSame($perPage, $iperPage);
- return new Http\DataResponse();
- });
+ $this->collaboratorSearch->expects($this->once())
+ ->method('search')
+ ->with($search, $shareTypes, $this->anything(), $perPage, $perPage * ($page -1))
+ ->willReturn([[], false]);
+
$sharees->expects($this->any())
->method('isRemoteSharingAllowed')
->with($itemType)
@@ -1531,35 +308,34 @@ class ShareesAPIControllerTest extends TestCase {
$page = isset($getData['page']) ? $getData['page'] : 1;
$perPage = isset($getData['perPage']) ? $getData['perPage'] : 200;
- $config = $this->getMockBuilder('OCP\IConfig')
- ->disableOriginalConstructor()
- ->getMock();
+ /** @var IConfig|\PHPUnit_Framework_MockObject_MockObject $config */
+ $config = $this->createMock(IConfig::class);
$config->expects($this->never())
->method('getAppValue');
+ /** @var IRequest|\PHPUnit_Framework_MockObject_MockObject $request */
+ $request = $this->createMock(IRequest::class);
+ /** @var IURLGenerator|\PHPUnit_Framework_MockObject_MockObject $urlGenerator */
+ $urlGenerator = $this->createMock(IURLGenerator::class);
+
/** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
$sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController')
->setConstructorArgs([
'files_sharing',
- $this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
- $this->groupManager,
- $this->userManager,
- $this->contactsManager,
+ $request,
$config,
- $this->session,
- $this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
- $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
+ $urlGenerator,
$this->shareManager,
- $this->clientService,
- $this->cloudIdManager
+ $this->collaboratorSearch
])
- ->setMethods(array('searchSharees', 'isRemoteSharingAllowed'))
+ ->setMethods(['isRemoteSharingAllowed'])
->getMock();
$sharees->expects($this->never())
- ->method('searchSharees');
- $sharees->expects($this->never())
->method('isRemoteSharingAllowed');
+ $this->collaboratorSearch->expects($this->never())
+ ->method('search');
+
try {
$sharees->search('', null, $page, $perPage, null);
$this->fail();
@@ -1587,188 +363,12 @@ class ShareesAPIControllerTest extends TestCase {
$this->assertSame($expected, $this->invokePrivate($this->sharees, 'isRemoteSharingAllowed', [$itemType]));
}
- public function dataSearchSharees() {
- return [
- ['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [],
- 'groups' => [],
- 'remotes' => [],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], false],
- ['test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [], [], ['results' => [], 'exact' => [], 'exactIdMatch' => false],
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [],
- 'groups' => [],
- 'remotes' => [],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], false],
- [
- 'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ], [
- ['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
- ], [
- 'results' => [['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']]], 'exact' => [], 'exactIdMatch' => false,
- ],
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ],
- 'groups' => [
- ['label' => 'testgroup1', 'value' => ['shareType' => Share::SHARE_TYPE_GROUP, 'shareWith' => 'testgroup1']],
- ],
- 'remotes' => [
- ['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
- ],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], true,
- ],
- // No groups requested
- [
- 'test', 'folder', [Share::SHARE_TYPE_USER, Share::SHARE_TYPE_REMOTE], 1, 2, false, [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ], null, [
- 'results' => [['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']]], 'exact' => [], 'exactIdMatch' => false
- ],
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ],
- 'groups' => [],
- 'remotes' => [
- ['label' => 'testz@remote', 'value' => ['shareType' => Share::SHARE_TYPE_REMOTE, 'shareWith' => 'testz@remote']],
- ],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], false,
- ],
- // Share type restricted to user - Only one user
- [
- 'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ], null, null,
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [
- ['label' => 'test One', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ],
- 'groups' => [],
- 'remotes' => [],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], false,
- ],
- // Share type restricted to user - Multipage result
- [
- 'test', 'folder', [Share::SHARE_TYPE_USER], 1, 2, false, [
- ['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ], null, null,
- [
- 'exact' => ['users' => [], 'groups' => [], 'remotes' => [], 'circles' => [], 'emails' => []],
- 'users' => [
- ['label' => 'test 1', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test1']],
- ['label' => 'test 2', 'value' => ['shareType' => Share::SHARE_TYPE_USER, 'shareWith' => 'test2']],
- ],
- 'groups' => [],
- 'remotes' => [],
- 'emails' => [],
- 'circles' => [],
- 'lookup' => [],
- ], true,
- ],
- ];
- }
-
- /**
- * @dataProvider dataSearchSharees
- *
- * @param string $searchTerm
- * @param string $itemType
- * @param array $shareTypes
- * @param int $page
- * @param int $perPage
- * @param bool $shareWithGroupOnly
- * @param array $mockedUserResult
- * @param array $mockedGroupsResult
- * @param array $mockedRemotesResult
- * @param array $expected
- * @param bool $nextLink
- */
- public function testSearchSharees($searchTerm, $itemType, array $shareTypes, $page, $perPage, $shareWithGroupOnly,
- $mockedUserResult, $mockedGroupsResult, $mockedRemotesResult, $expected, $nextLink) {
- /** @var \PHPUnit_Framework_MockObject_MockObject|\OCA\Files_Sharing\Controller\ShareesAPIController $sharees */
- $sharees = $this->getMockBuilder('\OCA\Files_Sharing\Controller\ShareesAPIController')
- ->setConstructorArgs([
- 'files_sharing',
- $this->getMockBuilder('OCP\IRequest')->disableOriginalConstructor()->getMock(),
- $this->groupManager,
- $this->userManager,
- $this->contactsManager,
- $this->getMockBuilder('OCP\IConfig')->disableOriginalConstructor()->getMock(),
- $this->session,
- $this->getMockBuilder('OCP\IURLGenerator')->disableOriginalConstructor()->getMock(),
- $this->getMockBuilder('OCP\ILogger')->disableOriginalConstructor()->getMock(),
- $this->shareManager,
- $this->clientService,
- $this->cloudIdManager
- ])
- ->setMethods(array('getShareesForShareIds', 'getUsers', 'getGroups', 'getRemote'))
- ->getMock();
- $sharees->expects(($mockedUserResult === null) ? $this->never() : $this->once())
- ->method('getUsers')
- ->with($searchTerm)
- ->willReturnCallback(function() use ($sharees, $mockedUserResult) {
- $result = $this->invokePrivate($sharees, 'result');
- $result['users'] = $mockedUserResult;
- $this->invokePrivate($sharees, 'result', [$result]);
- });
- $sharees->expects(($mockedGroupsResult === null) ? $this->never() : $this->once())
- ->method('getGroups')
- ->with($searchTerm)
- ->willReturnCallback(function() use ($sharees, $mockedGroupsResult) {
- $result = $this->invokePrivate($sharees, 'result');
- $result['groups'] = $mockedGroupsResult;
- $this->invokePrivate($sharees, 'result', [$result]);
- });
-
- $sharees->expects(($mockedRemotesResult === null) ? $this->never() : $this->once())
- ->method('getRemote')
- ->with($searchTerm)
- ->willReturn($mockedRemotesResult);
-
- $ocs = $this->invokePrivate($sharees, 'searchSharees', [$searchTerm, $itemType, $shareTypes, $page, $perPage, $shareWithGroupOnly]);
- $this->assertInstanceOf('\OCP\AppFramework\Http\DataResponse', $ocs);
- $this->assertEquals($expected, $ocs->getData());
-
- // Check if next link is set
- if ($nextLink) {
- $headers = $ocs->getHeaders();
- $this->assertArrayHasKey('Link', $headers);
- $this->assertStringStartsWith('<', $headers['Link']);
- $this->assertStringEndsWith('>; rel="next"', $headers['Link']);
- }
- }
-
/**
* @expectedException \OCP\AppFramework\OCS\OCSBadRequestException
* @expectedExceptionMessage Missing itemType
*/
- public function testSearchShareesNoItemType() {
- $this->invokePrivate($this->sharees, 'searchSharees', ['', null, [], [], 0, 0, false]);
+ public function testSearchNoItemType() {
+ $this->sharees->search('', null, 1, 10, [], false);
}
public function dataGetPaginationLink() {
@@ -1814,97 +414,4 @@ class ShareesAPIControllerTest extends TestCase {
$this->assertEquals($expected, $this->invokePrivate($this->sharees, 'isV2'));
}
-
- /**
- * @dataProvider dataTestSplitUserRemote
- *
- * @param string $remote
- * @param string $expectedUser
- * @param string $expectedUrl
- */
- public function testSplitUserRemote($remote, $expectedUser, $expectedUrl) {
- list($remoteUser, $remoteUrl) = $this->sharees->splitUserRemote($remote);
- $this->assertSame($expectedUser, $remoteUser);
- $this->assertSame($expectedUrl, $remoteUrl);
- }
-
- public function dataTestSplitUserRemote() {
- $userPrefix = ['user@name', 'username'];
- $protocols = ['', 'http://', 'https://'];
- $remotes = [
- 'localhost',
- 'local.host',
- 'dev.local.host',
- 'dev.local.host/path',
- 'dev.local.host/at@inpath',
- '127.0.0.1',
- '::1',
- '::192.0.2.128',
- '::192.0.2.128/at@inpath',
- ];
-
- $testCases = [];
- foreach ($userPrefix as $user) {
- foreach ($remotes as $remote) {
- foreach ($protocols as $protocol) {
- $baseUrl = $user . '@' . $protocol . $remote;
-
- $testCases[] = [$baseUrl, $user, $protocol . $remote];
- $testCases[] = [$baseUrl . '/', $user, $protocol . $remote];
- $testCases[] = [$baseUrl . '/index.php', $user, $protocol . $remote];
- $testCases[] = [$baseUrl . '/index.php/s/token', $user, $protocol . $remote];
- }
- }
- }
- return $testCases;
- }
-
- public function dataTestSplitUserRemoteError() {
- return array(
- // Invalid path
- array('user@'),
-
- // Invalid user
- array('@server'),
- array('us/er@server'),
- array('us:er@server'),
-
- // Invalid splitting
- array('user'),
- array(''),
- array('us/erserver'),
- array('us:erserver'),
- );
- }
-
- /**
- * @dataProvider dataTestSplitUserRemoteError
- *
- * @param string $id
- * @expectedException \Exception
- */
- public function testSplitUserRemoteError($id) {
- $this->sharees->splitUserRemote($id);
- }
-
- /**
- * @dataProvider dataTestFixRemoteUrl
- *
- * @param string $url
- * @param string $expected
- */
- public function testFixRemoteUrl($url, $expected) {
- $this->assertSame($expected,
- $this->invokePrivate($this->sharees, 'fixRemoteURL', [$url])
- );
- }
-
- public function dataTestFixRemoteUrl() {
- return [
- ['http://localhost', 'http://localhost'],
- ['http://localhost/', 'http://localhost'],
- ['http://localhost/index.php', 'http://localhost'],
- ['http://localhost/index.php/s/AShareToken', 'http://localhost'],
- ];
- }
}
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 17:21:28 +0000