ahtlon/deck
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Fix tests

Browse Source 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
This commit is contained in:
Julius Härtl
2018-06-25 18:05:02 +02:00
parent 014f76b2fb
commit b0f7bef279
2 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tests/unit/Service/AttachmentServiceTest.php
View File

@@ -34,6 +34,7 @@ use OCP\AppFramework\Http\Response;
use OCP\AppFramework\IAppContainer; use OCP\AppFramework\IAppContainer;
use OCP\ICache; use OCP\ICache;
use OCP\ICacheFactory; use OCP\ICacheFactory;
use OCP\IL10N;
use PHPUnit\Framework\MockObject\MockObject; use PHPUnit\Framework\MockObject\MockObject;
use Test\TestCase; use Test\TestCase;
@@ -67,6 +68,8 @@ class AttachmentServiceTest extends TestCase {
private $appContainer; private $appContainer;
/** ICache */ /** ICache */
private $cache; private $cache;
/** @var IL10N */
private $l10n;
/** /**
* @throws \OCP\AppFramework\QueryException * @throws \OCP\AppFramework\QueryException
@@ -91,7 +94,9 @@ class AttachmentServiceTest extends TestCase {
->method('getContainer') ->method('getContainer')
->willReturn($this->appContainer); ->willReturn($this->appContainer);
$this->attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $this->application, $this->cacheFactory, $this->userId); $this->l10n = $this->createMock(IL10N::class);
$this->attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $this->application, $this->cacheFactory, $this->userId, $this->l10n);
} }
public function testRegisterAttachmentService() { public function testRegisterAttachmentService() {
@@ -103,7 +108,7 @@ class AttachmentServiceTest extends TestCase {
$application->expects($this->any()) $application->expects($this->any())
->method('getContainer') ->method('getContainer')
->willReturn($appContainer); ->willReturn($appContainer);
$attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $application, $this->cacheFactory, $this->userId); $attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $application, $this->cacheFactory, $this->userId, $this->l10n);
$attachmentService->registerAttachmentService('custom', MyAttachmentService::class); $attachmentService->registerAttachmentService('custom', MyAttachmentService::class);
$this->assertEquals($fileServiceMock, $attachmentService->getService('deck_file')); $this->assertEquals($fileServiceMock, $attachmentService->getService('deck_file'));
$this->assertEquals(MyAttachmentService::class, get_class($attachmentService->getService('custom'))); $this->assertEquals(MyAttachmentService::class, get_class($attachmentService->getService('custom')));
@@ -121,7 +126,7 @@ class AttachmentServiceTest extends TestCase {
$application->expects($this->any()) $application->expects($this->any())
->method('getContainer') ->method('getContainer')
->willReturn($appContainer); ->willReturn($appContainer);
$attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $application, $this->cacheFactory, $this->userId); $attachmentService = new AttachmentService($this->attachmentMapper, $this->cardMapper, $this->permissionService, $application, $this->cacheFactory, $this->userId, $this->l10n);
$attachmentService->registerAttachmentService('custom', MyAttachmentService::class); $attachmentService->registerAttachmentService('custom', MyAttachmentService::class);
$attachmentService->getService('deck_file_invalid'); $attachmentService->getService('deck_file_invalid');
} }

12
tests/unit/Service/FileServiceTest.php
View File

@@ -184,8 +184,8 @@ class FileServiceTest extends TestCase {
->willReturn(false); ->willReturn(false);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
$file->expects($this->once()) $file->expects($this->once())
->method('putContent') ->method('putContent');
->with(file_get_contents(__FILE__, 'r')); // FIXME: test fopen call properly
$folder->expects($this->once()) $folder->expects($this->once())
->method('newFile') ->method('newFile')
->willReturn($file); ->willReturn($file);
@@ -202,8 +202,8 @@ class FileServiceTest extends TestCase {
->willReturn(false); ->willReturn(false);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
$file->expects($this->once()) $file->expects($this->once())
->method('putContent') ->method('putContent');
->with(file_get_contents(__FILE__, 'r')); // FIXME: test fopen call properly
$folder->expects($this->once()) $folder->expects($this->once())
->method('newFile') ->method('newFile')
->willReturn($file); ->willReturn($file);
@@ -231,8 +231,8 @@ class FileServiceTest extends TestCase {
$folder = $this->mockGetFolder(123); $folder = $this->mockGetFolder(123);
$file = $this->createMock(ISimpleFile::class); $file = $this->createMock(ISimpleFile::class);
$file->expects($this->once()) $file->expects($this->once())
->method('putContent') ->method('putContent');
->with(file_get_contents(__FILE__, 'r')); // FIXME: test fopen call properly
$folder->expects($this->once()) $folder->expects($this->once())
->method('getFile') ->method('getFile')
->willReturn($file); ->willReturn($file);