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

Adjust tests to only return group IDs 

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
This commit is contained in:
Morris Jobke 2020-05-08 08:10:38 +02:00
parent e3a2d069ae
commit 16f4b43d94
No known key found for this signature in database
GPG Key ID: FE03C3A163FEDE68
1 changed files with 15 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
tests/lib/Share20/DefaultShareProviderTest.php
View File

@ -165,7 +165,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
public function testGetShareByIdNotExist() { public function testGetShareByIdNotExist() {
$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
@ -856,7 +856,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertSame(null, $share->getSharedWith()); $this->assertSame(null, $share->getSharedWith());
} }
public function testGetShareByTokenNotFound() { public function testGetShareByTokenNotFound() {
$this->expectException(\OCP\Share\Exceptions\ShareNotFound::class); $this->expectException(\OCP\Share\Exceptions\ShareNotFound::class);
@ -986,14 +986,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
$groups = []; $groups = [];
foreach (range(0, 100) as $i) { foreach (range(0, 100) as $i) {
$group = $this->createMock(IGroup::class); $groups[] = 'group'.$i;
$group->method('getGID')->willReturn('group'.$i);
$groups[] = $group;
} }
$group = $this->createMock(IGroup::class); $groups[] = 'sharedWith';
$group->method('getGID')->willReturn('sharedWith');
$groups[] = $group;
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('sharedWith'); $user->method('getUID')->willReturn('sharedWith');
@ -1007,8 +1003,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
['shareOwner', $owner], ['shareOwner', $owner],
['sharedBy', $initiator], ['sharedBy', $initiator],
]); ]);
$this->groupManager->method('getUserGroups')->with($user)->willReturn($groups); $this->groupManager->method('getUserGroupIds')->with($user)->willReturn($groups);
$this->groupManager->method('get')->with('sharedWith')->willReturn($group);
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf(); $this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf();
@ -1082,9 +1077,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
]); ]);
$this->assertEquals(1, $qb->execute()); $this->assertEquals(1, $qb->execute());
$group = $this->createMock(IGroup::class); $groups = ['sharedWith'];
$group->method('getGID')->willReturn('sharedWith');
$groups = [$group];
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('user'); $user->method('getUID')->willReturn('user');
@ -1098,8 +1091,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
['shareOwner', $owner], ['shareOwner', $owner],
['sharedBy', $initiator], ['sharedBy', $initiator],
]); ]);
$this->groupManager->method('getUserGroups')->with($user)->willReturn($groups); $this->groupManager->method('getUserGroupIds')->with($user)->willReturn($groups);
$this->groupManager->method('get')->with('sharedWith')->willReturn($group);
$file = $this->createMock(File::class); $file = $this->createMock(File::class);
$this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf(); $this->rootFolder->method('getUserFolder')->with('shareOwner')->willReturnSelf();
@ -1182,11 +1174,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
['user1', $user1], ['user1', $user1],
]); ]);
$group0 = $this->createMock(IGroup::class); $this->groupManager->method('getUserGroupIds')->with($user0)->willReturn(['group0']);
$group0->method('getGID')->willReturn('group0');
$this->groupManager->method('get')->with('group0')->willReturn($group0);
$this->groupManager->method('getUserGroups')->with($user0)->willReturn([$group0]);
$node = $this->createMock(Folder::class); $node = $this->createMock(Folder::class);
$node->method('getId')->willReturn($fileId2); $node->method('getId')->willReturn($fileId2);
@ -1246,14 +1234,10 @@ class DefaultShareProviderTest extends \Test\TestCase {
$groups = []; $groups = [];
foreach (range(0, 100) as $i) { foreach (range(0, 100) as $i) {
$group = $this->createMock(IGroup::class); $groups[] = 'group'.$i;
$group->method('getGID')->willReturn('group'.$i);
$groups[] = $group;
} }
$group = $this->createMock(IGroup::class); $groups[] = 'sharedWith';
$group->method('getGID')->willReturn('sharedWith');
$groups[] = $group;
$user = $this->createMock(IUser::class); $user = $this->createMock(IUser::class);
$user->method('getUID')->willReturn('sharedWith'); $user->method('getUID')->willReturn('sharedWith');
@ -1267,8 +1251,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
['shareOwner', $owner], ['shareOwner', $owner],
['sharedBy', $initiator], ['sharedBy', $initiator],
]); ]);
$this->groupManager->method('getUserGroups')->with($user)->willReturn($groups); $this->groupManager->method('getUserGroupIds')->with($user)->willReturn($groups);
$this->groupManager->method('get')->with('sharedWith')->willReturn($group);
$share = $this->provider->getSharedWith('sharedWith', $shareType, null, 1 , 0); $share = $this->provider->getSharedWith('sharedWith', $shareType, null, 1 , 0);
$this->assertCount(0, $share); $this->assertCount(0, $share);
@ -1559,7 +1542,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertEquals('user2', $share2['share_with']); $this->assertEquals('user2', $share2['share_with']);
} }
public function testDeleteFromSelfGroupUserNotInGroup() { public function testDeleteFromSelfGroupUserNotInGroup() {
$this->expectException(\OC\Share20\Exception\ProviderException::class); $this->expectException(\OC\Share20\Exception\ProviderException::class);
$this->expectExceptionMessage('Recipient not in receiving group'); $this->expectExceptionMessage('Recipient not in receiving group');
@ -1604,7 +1587,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->provider->deleteFromSelf($share, 'user2'); $this->provider->deleteFromSelf($share, 'user2');
} }
public function testDeleteFromSelfGroupDoesNotExist() { public function testDeleteFromSelfGroupDoesNotExist() {
$this->expectException(\OC\Share20\Exception\ProviderException::class); $this->expectException(\OC\Share20\Exception\ProviderException::class);
$this->expectExceptionMessage('Group "group" does not exist'); $this->expectExceptionMessage('Group "group" does not exist');
@ -1695,7 +1678,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->assertCount(0, $shares); $this->assertCount(0, $shares);
} }
public function testDeleteFromSelfUserNotRecipient() { public function testDeleteFromSelfUserNotRecipient() {
$this->expectException(\OC\Share20\Exception\ProviderException::class); $this->expectException(\OC\Share20\Exception\ProviderException::class);
$this->expectExceptionMessage('Recipient does not match'); $this->expectExceptionMessage('Recipient does not match');
@ -1738,7 +1721,7 @@ class DefaultShareProviderTest extends \Test\TestCase {
$this->provider->deleteFromSelf($share, $user3); $this->provider->deleteFromSelf($share, $user3);
} }
public function testDeleteFromSelfLink() { public function testDeleteFromSelfLink() {
$this->expectException(\OC\Share20\Exception\ProviderException::class); $this->expectException(\OC\Share20\Exception\ProviderException::class);
$this->expectExceptionMessage('Invalid shareType'); $this->expectExceptionMessage('Invalid shareType');