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

Merge pull request #6791 from nextcloud/fix-test-warnings 

Fix test warnings
This commit is contained in:
Roeland Jago Douma 2017-10-15 21:40:43 +02:00 committed by GitHub
parent 3438020d66 281f042093
commit a0823540b0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/dav/tests/unit/CalDAV/CalDavBackendTest.php
View File

@ -134,7 +134,7 @@ class CalDavBackendTest extends AbstractCalDavBackend {
->method('userExists') ->method('userExists')
->willReturn(true); ->willReturn(true);
$this->userManager->expects($this->any()) $this->groupManager->expects($this->any())
->method('groupExists') ->method('groupExists')
->willReturn(true); ->willReturn(true);

4
apps/files_trashbin/tests/StorageTest.php
View File

@ -530,7 +530,7 @@ class StorageTest extends \Test\TestCase {
*/ */
public function testShouldMoveToTrash($mountPoint, $path, $userExists, $appDisablesTrash, $expected) { public function testShouldMoveToTrash($mountPoint, $path, $userExists, $appDisablesTrash, $expected) {
$fileID = 1; $fileID = 1;
$cache = $this->getMock(ICache::class); $cache = $this->createMock(ICache::class);
$cache->expects($this->any())->method('getId')->willReturn($fileID); $cache->expects($this->any())->method('getId')->willReturn($fileID);
$tmpStorage = $this->getMockBuilder('\OC\Files\Storage\Temporary') $tmpStorage = $this->getMockBuilder('\OC\Files\Storage\Temporary')
->disableOriginalConstructor()->getMock($cache); ->disableOriginalConstructor()->getMock($cache);
@ -542,7 +542,7 @@ class StorageTest extends \Test\TestCase {
$logger = $this->getMockBuilder(ILogger::class)->getMock(); $logger = $this->getMockBuilder(ILogger::class)->getMock();
$eventDispatcher = $this->getMockBuilder(EventDispatcher::class) $eventDispatcher = $this->getMockBuilder(EventDispatcher::class)
->disableOriginalConstructor()->getMock(); ->disableOriginalConstructor()->getMock();
$rootFolder = $this->getMock(IRootFolder::class); $rootFolder = $this->createMock(IRootFolder::class);
$node = $this->getMockBuilder(Node::class)->disableOriginalConstructor()->getMock(); $node = $this->getMockBuilder(Node::class)->disableOriginalConstructor()->getMock();
$event = $this->getMockBuilder(MoveToTrashEvent::class)->disableOriginalConstructor()->getMock(); $event = $this->getMockBuilder(MoveToTrashEvent::class)->disableOriginalConstructor()->getMock();
$event->expects($this->any())->method('shouldMoveToTrashBin')->willReturn(!$appDisablesTrash); $event->expects($this->any())->method('shouldMoveToTrashBin')->willReturn(!$appDisablesTrash);