From c629761fea1be21be1cef7fdfd8673a45d3244c3 Mon Sep 17 00:00:00 2001
From: Roeland Jago Douma <roeland@famdouma.nl>
Date: Fri, 2 Sep 2016 10:38:39 +0200
Subject: [PATCH] Fix getMock files_sharing
---
apps/files_sharing/tests/MountProviderTest.php | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/apps/files_sharing/tests/MountProviderTest.php b/apps/files_sharing/tests/MountProviderTest.php
index 576f05d565d..0be74a645a9 100644
--- a/apps/files_sharing/tests/MountProviderTest.php
+++ b/apps/files_sharing/tests/MountProviderTest.php
@@ -25,10 +25,12 @@
namespace OCA\Files_Sharing\Tests;
use OCA\Files_Sharing\MountProvider;
+use OCP\Files\IRootFolder;
use OCP\Files\Storage\IStorageFactory;
use OCP\IConfig;
use OCP\ILogger;
use OCP\IUser;
+use OCP\IUserManager;
use OCP\Share\IShare;
use OCP\Share\IManager;
use OCP\Files\Mount\IMountPoint;
@@ -69,7 +71,7 @@ class MountProviderTest extends \Test\TestCase {
}
private function makeMockShare($id, $nodeId, $owner = 'user2', $target = null, $permissions = 31) {
- $share = $this->getMock('\OCP\Share\IShare');
+ $share = $this->createMock(IShare::class);
$share->expects($this->any())
->method('getPermissions')
->will($this->returnValue($permissions));
@@ -100,8 +102,8 @@ class MountProviderTest extends \Test\TestCase {
* - shares with a group in which the owner is already in
*/
public function testExcludeShares() {
- $rootFolder = $this->getMock('\OCP\Files\IRootFolder');
- $userManager = $this->getMock('\OCP\IUserManager');
+ $rootFolder = $this->createMock(IRootFolder::class);
+ $userManager = $this->createMock(IUserManager::class);
$userShares = [
$this->makeMockShare(1, 100, 'user2', '/share2', 0),
$this->makeMockShare(2, 100, 'user2', '/share2', 31),
@@ -277,8 +279,8 @@ class MountProviderTest extends \Test\TestCase {
* @param array $expectedShares array of expected supershare specs
*/
public function testMergeShares($userShares, $groupShares, $expectedShares) {
- $rootFolder = $this->getMock('\OCP\Files\IRootFolder');
- $userManager = $this->getMock('\OCP\IUserManager');
+ $rootFolder = $this->createMock(IRootFolder::class);
+ $userManager = $this->createMock(IUserManager::class);
$userShares = array_map(function($shareSpec) {
return $this->makeMockShare($shareSpec[0], $shareSpec[1], $shareSpec[2], $shareSpec[3], $shareSpec[4]);
--
GitLab