Fix getMock files

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

View File

@ -21,6 +21,7 @@
*/
namespace OCA\Files\Tests\BackgroundJob;
use OCP\IUser;
use Test\TestCase;
use OCP\IConfig;
use OCP\IUserManager;
@ -42,8 +43,8 @@ class ScanFilesTest extends TestCase {
public function setUp() {
parent::setUp();
$this->config = $this->getMock('\OCP\IConfig');
$this->userManager = $this->getMock('\OCP\IUserManager');
$this->config = $this->createMock(IConfig::class);
$this->userManager = $this->createMock(IUserManager::class);
$this->scanFiles = $this->getMockBuilder('\OCA\Files\BackgroundJob\ScanFiles')
->setConstructorArgs([
@ -79,7 +80,7 @@ class ScanFilesTest extends TestCase {
}
public function testRunWithUsers() {
$fakeUser = $this->getMock('\OCP\IUser');
$fakeUser = $this->createMock(IUser::class);
$this->config
->expects($this->at(0))
->method('getAppValue')

View File

@ -30,6 +30,9 @@ use OC\Files\FileInfo;
use OCP\AppFramework\Http;
use OCP\Files\NotFoundException;
use OCP\Files\StorageNotAvailableException;
use OCP\IConfig;
use OCP\IUser;
use OCP\IUserSession;
use Test\TestCase;
use OCP\IRequest;
use OCA\Files\Service\TagService;
@ -66,11 +69,11 @@ class ApiControllerTest extends TestCase {
$this->request = $this->getMockBuilder('\OCP\IRequest')
->disableOriginalConstructor()
->getMock();
$this->user = $this->getMock('\OCP\IUser');
$this->user = $this->createMock(IUser::class);
$this->user->expects($this->any())
->method('getUID')
->will($this->returnValue('user1'));
$userSession = $this->getMock('\OCP\IUserSession');
$userSession = $this->createMock(IUserSession::class);
$userSession->expects($this->any())
->method('getUser')
->will($this->returnValue($this->user));
@ -83,7 +86,7 @@ class ApiControllerTest extends TestCase {
$this->preview = $this->getMockBuilder('\OCP\IPreview')
->disableOriginalConstructor()
->getMock();
$this->config = $this->getMock('\OCP\IConfig');
$this->config = $this->createMock(IConfig::class);
$this->userFolder = $this->getMockBuilder('\OC\Files\Node\Folder')
->disableOriginalConstructor()
->getMock();

View File

@ -25,6 +25,7 @@
namespace OCA\Files\Tests\Service;
use OCA\Files\Service\TagService;
use OCP\IUserSession;
/**
* Class TagServiceTest
@ -66,7 +67,7 @@ class TagServiceTest extends \Test\TestCase {
/**
* @var \OCP\IUserSession
*/
$userSession = $this->getMock('\OCP\IUserSession');
$userSession = $this->createMock(IUserSession::class);
$userSession->expects($this->any())
->method('getUser')
->withAnyParameters()