Fix getMock files_sharing

This commit is contained in:
Roeland Jago Douma 2016-09-02 10:38:39 +02:00 committed by Morris Jobke
parent d13ac20bca
commit c629761fea
No known key found for this signature in database
GPG Key ID: 9CE5ED29E7FCD38A
1 changed files with 7 additions and 5 deletions

View File

@ -25,10 +25,12 @@
namespace OCA\Files_Sharing\Tests; namespace OCA\Files_Sharing\Tests;
use OCA\Files_Sharing\MountProvider; use OCA\Files_Sharing\MountProvider;
use OCP\Files\IRootFolder;
use OCP\Files\Storage\IStorageFactory; use OCP\Files\Storage\IStorageFactory;
use OCP\IConfig; use OCP\IConfig;
use OCP\ILogger; use OCP\ILogger;
use OCP\IUser; use OCP\IUser;
use OCP\IUserManager;
use OCP\Share\IShare; use OCP\Share\IShare;
use OCP\Share\IManager; use OCP\Share\IManager;
use OCP\Files\Mount\IMountPoint; 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) { 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()) $share->expects($this->any())
->method('getPermissions') ->method('getPermissions')
->will($this->returnValue($permissions)); ->will($this->returnValue($permissions));
@ -100,8 +102,8 @@ class MountProviderTest extends \Test\TestCase {
* - shares with a group in which the owner is already in * - shares with a group in which the owner is already in
*/ */
public function testExcludeShares() { public function testExcludeShares() {
$rootFolder = $this->getMock('\OCP\Files\IRootFolder'); $rootFolder = $this->createMock(IRootFolder::class);
$userManager = $this->getMock('\OCP\IUserManager'); $userManager = $this->createMock(IUserManager::class);
$userShares = [ $userShares = [
$this->makeMockShare(1, 100, 'user2', '/share2', 0), $this->makeMockShare(1, 100, 'user2', '/share2', 0),
$this->makeMockShare(2, 100, 'user2', '/share2', 31), $this->makeMockShare(2, 100, 'user2', '/share2', 31),
@ -277,8 +279,8 @@ class MountProviderTest extends \Test\TestCase {
* @param array $expectedShares array of expected supershare specs * @param array $expectedShares array of expected supershare specs
*/ */
public function testMergeShares($userShares, $groupShares, $expectedShares) { public function testMergeShares($userShares, $groupShares, $expectedShares) {
$rootFolder = $this->getMock('\OCP\Files\IRootFolder'); $rootFolder = $this->createMock(IRootFolder::class);
$userManager = $this->getMock('\OCP\IUserManager'); $userManager = $this->createMock(IUserManager::class);
$userShares = array_map(function($shareSpec) { $userShares = array_map(function($shareSpec) {
return $this->makeMockShare($shareSpec[0], $shareSpec[1], $shareSpec[2], $shareSpec[3], $shareSpec[4]); return $this->makeMockShare($shareSpec[0], $shareSpec[1], $shareSpec[2], $shareSpec[3], $shareSpec[4]);