Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Remove at() matcher in files_sharing tests #32577

Merged
merged 1 commit into from
May 25, 2022
Merged

Remove at() matcher in files_sharing tests #32577

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 5 additions & 9 deletions apps/files_sharing/tests/Command/CleanupRemoteStoragesTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,19 +186,15 @@ public function testCleanup() {
->disableOriginalConstructor()
->getMock();

//

// parent folder, `files`, ´test` and `welcome.txt` => 4 elements

$at = 0;
$output
->expects($this->at($at++))
->method('writeln')
->with('5 remote storage(s) need(s) to be checked');
$output
->expects($this->at($at++))
->expects($this->any())
->method('writeln')
->with('5 remote share(s) exist');
->withConsecutive(
['5 remote storage(s) need(s) to be checked'],
['5 remote share(s) exist'],
);

$this->cloudIdManager
->expects($this->any())
Expand Down
51 changes: 36 additions & 15 deletions apps/files_sharing/tests/Controller/ShareControllerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,17 @@ public function testShowShare() {
$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
$this->session->method('get')->with('public_link_authenticated')->willReturn('42');

$this->urlGenerator->expects($this->at(0))
$this->urlGenerator->expects($this->exactly(3))
->method('linkToRouteAbsolute')
->with('files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename])
->willReturn('downloadURL');
->withConsecutive(
['files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename]],
['files_sharing.sharecontroller.showShare', ['token' => 'token']],
['files_sharing.PublicPreview.getPreview', ['token' => 'token', 'x' => 200, 'y' => 200, 'file' => '/'.$filename]],
)->willReturnOnConsecutiveCalls(
'downloadURL',
'shareUrl',
'previewImage',
);

$this->previewManager->method('isMimeSupported')->with('text/plain')->willReturn(true);

Expand Down Expand Up @@ -343,8 +350,8 @@ public function testShowShare() {
'hideFileList' => false,
'shareOwner' => 'ownerDisplay',
'disclaimer' => 'My disclaimer text',
'shareUrl' => null,
'previewImage' => null,
'shareUrl' => 'shareUrl',
'previewImage' => 'previewImage',
'previewURL' => 'downloadURL',
'note' => $note,
'hideDownload' => false,
Expand Down Expand Up @@ -414,10 +421,17 @@ public function testShowShareWithPrivateName() {
$this->session->method('exists')->with('public_link_authenticated')->willReturn(true);
$this->session->method('get')->with('public_link_authenticated')->willReturn('42');

$this->urlGenerator->expects($this->at(0))
$this->urlGenerator->expects($this->exactly(3))
->method('linkToRouteAbsolute')
->with('files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename])
->willReturn('downloadURL');
->withConsecutive(
['files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename]],
['files_sharing.sharecontroller.showShare', ['token' => 'token']],
['files_sharing.PublicPreview.getPreview', ['token' => 'token', 'x' => 200, 'y' => 200, 'file' => '/'.$filename]],
)->willReturnOnConsecutiveCalls(
'downloadURL',
'shareUrl',
'previewImage',
);

$this->previewManager->method('isMimeSupported')->with('text/plain')->willReturn(true);

Expand Down Expand Up @@ -494,8 +508,8 @@ public function testShowShareWithPrivateName() {
'hideFileList' => false,
'shareOwner' => '',
'disclaimer' => 'My disclaimer text',
'shareUrl' => null,
'previewImage' => null,
'shareUrl' => 'shareUrl',
'previewImage' => 'previewImage',
'previewURL' => 'downloadURL',
'note' => $note,
'hideDownload' => false,
Expand Down Expand Up @@ -569,10 +583,17 @@ public function testShowShareHideDownload() {
// Even if downloads are disabled the "downloadURL" parameter is
// provided to the template, as it is needed to preview audio and GIF
// files.
$this->urlGenerator->expects($this->at(0))
$this->urlGenerator->expects($this->exactly(3))
->method('linkToRouteAbsolute')
->with('files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename])
->willReturn('downloadURL');
->withConsecutive(
['files_sharing.sharecontroller.downloadShare', ['token' => 'token', 'filename' => $filename]],
['files_sharing.sharecontroller.showShare', ['token' => 'token']],
['files_sharing.PublicPreview.getPreview', ['token' => 'token', 'x' => 200, 'y' => 200, 'file' => '/'.$filename]],
)->willReturnOnConsecutiveCalls(
'downloadURL',
'shareUrl',
'previewImage',
);

$this->previewManager->method('isMimeSupported')->with('text/plain')->willReturn(true);

Expand Down Expand Up @@ -645,8 +666,8 @@ public function testShowShareHideDownload() {
'hideFileList' => false,
'shareOwner' => 'ownerDisplay',
'disclaimer' => 'My disclaimer text',
'shareUrl' => null,
'previewImage' => null,
'shareUrl' => 'shareUrl',
'previewImage' => 'previewImage',
'previewURL' => 'downloadURL',
'note' => $note,
'hideDownload' => true,
Expand Down
22 changes: 14 additions & 8 deletions apps/files_sharing/tests/External/ManagerTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,14 @@ public function doTestAddShare($shareData1, $isGroup = false) {
if ($isGroup) {
$this->manager->expects($this->never())->method('tryOCMEndPoint');
} else {
$this->manager->expects($this->at(0))->method('tryOCMEndPoint')->with('http://localhost', 'token1', '2342', 'accept')->willReturn(false);
$this->manager->expects($this->at(1))->method('tryOCMEndPoint')->with('http://localhost', 'token3', '2342', 'decline')->willReturn(false);
$this->manager->expects($this->any())->method('tryOCMEndPoint')
->withConsecutive(
['http://localhost', 'token1', '2342', 'accept'],
['http://localhost', 'token3', '2342', 'decline'],
)->willReturnOnConsecutiveCalls(
false,
false,
);
}

// Add a share for "user"
Expand Down Expand Up @@ -375,12 +381,12 @@ public function doTestAddShare($shareData1, $isGroup = false) {
->disableOriginalConstructor()->getMock();
$client2 = $this->getMockBuilder('OCP\Http\Client\IClient')
->disableOriginalConstructor()->getMock();
$this->clientService->expects($this->at(0))
->method('newClient')
->willReturn($client1);
$this->clientService->expects($this->at(1))
$this->clientService->expects($this->exactly(2))
->method('newClient')
->willReturn($client2);
->willReturnOnConsecutiveCalls(
$client1,
$client2,
);
$response = $this->createMock(IResponse::class);
$response->method('getBody')
->willReturn(json_encode([
Expand Down Expand Up @@ -656,7 +662,7 @@ public function testDeleteUserShares() {
$user2Shares = $manager2->getOpenShares();
$this->assertCount(2, $user2Shares);

$this->manager->expects($this->at(0))->method('tryOCMEndPoint')->with('http://localhost', 'token1', '2342', 'decline')->willReturn([]);
$this->manager->expects($this->once())->method('tryOCMEndPoint')->with('http://localhost', 'token1', '2342', 'decline')->willReturn([]);
$this->manager->removeUserShares($this->uid);

$user1Shares = $this->manager->getOpenShares();
Expand Down
66 changes: 28 additions & 38 deletions apps/files_sharing/tests/MountProviderTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,26 +141,21 @@ public function testExcludeShares() {
$this->user->expects($this->any())
->method('getUID')
->willReturn('user1');
$this->shareManager->expects($this->at(0))
$this->shareManager->expects($this->exactly(5))
->method('getSharedWith')
->with('user1', IShare::TYPE_USER)
->willReturn($userShares);
$this->shareManager->expects($this->at(1))
->method('getSharedWith')
->with('user1', IShare::TYPE_GROUP, null, -1)
->willReturn($groupShares);
$this->shareManager->expects($this->at(2))
->method('getSharedWith')
->with('user1', IShare::TYPE_CIRCLE, null, -1)
->willReturn($circleShares);
$this->shareManager->expects($this->at(3))
->method('getSharedWith')
->with('user1', IShare::TYPE_ROOM, null, -1)
->willReturn($roomShares);
$this->shareManager->expects($this->at(4))
->method('getSharedWith')
->with('user1', IShare::TYPE_DECK, null, -1)
->willReturn($deckShares);
->withConsecutive(
['user1', IShare::TYPE_USER],
['user1', IShare::TYPE_GROUP, null, -1],
['user1', IShare::TYPE_CIRCLE, null, -1],
['user1', IShare::TYPE_ROOM, null, -1],
['user1', IShare::TYPE_DECK, null, -1],
)->willReturnOnConsecutiveCalls(
$userShares,
$groupShares,
$circleShares,
$roomShares,
$deckShares,
);
$this->shareManager->expects($this->any())
->method('newShare')
->willReturnCallback(function () use ($rootFolder, $userManager) {
Expand Down Expand Up @@ -362,26 +357,21 @@ public function testMergeShares($userShares, $groupShares, $expectedShares, $mov
$circleShares = [];
$roomShares = [];
$deckShares = [];
$this->shareManager->expects($this->at(0))
$this->shareManager->expects($this->exactly(5))
->method('getSharedWith')
->with('user1', IShare::TYPE_USER)
->willReturn($userShares);
$this->shareManager->expects($this->at(1))
->method('getSharedWith')
->with('user1', IShare::TYPE_GROUP, null, -1)
->willReturn($groupShares);
$this->shareManager->expects($this->at(2))
->method('getSharedWith')
->with('user1', IShare::TYPE_CIRCLE, null, -1)
->willReturn($circleShares);
$this->shareManager->expects($this->at(3))
->method('getSharedWith')
->with('user1', IShare::TYPE_ROOM, null, -1)
->willReturn($roomShares);
$this->shareManager->expects($this->at(4))
->method('getSharedWith')
->with('user1', IShare::TYPE_DECK, null, -1)
->willReturn($deckShares);
->withConsecutive(
['user1', IShare::TYPE_USER],
['user1', IShare::TYPE_GROUP, null, -1],
['user1', IShare::TYPE_CIRCLE, null, -1],
['user1', IShare::TYPE_ROOM, null, -1],
['user1', IShare::TYPE_DECK, null, -1],
)->willReturnOnConsecutiveCalls(
$userShares,
$groupShares,
$circleShares,
$roomShares,
$deckShares,
);
$this->shareManager->expects($this->any())
->method('newShare')
->willReturnCallback(function () use ($rootFolder, $userManager) {
Expand Down