From 04b0807a12c51cda98e05cdf480bfdc8f700f72c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 12 Jun 2018 17:24:00 +0200 Subject: [PATCH] Adapt existing unit tests MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- tests/unit/Cron/DeleteCronTest.php | 10 +++++++++- tests/unit/Db/CardTest.php | 3 +++ tests/unit/Service/CardServiceTest.php | 3 ++- tests/unit/Service/StackServiceTest.php | 6 +++++- 4 files changed, 19 insertions(+), 3 deletions(-) diff --git a/tests/unit/Cron/DeleteCronTest.php b/tests/unit/Cron/DeleteCronTest.php index ff3aba488..ce0ea796c 100644 --- a/tests/unit/Cron/DeleteCronTest.php +++ b/tests/unit/Cron/DeleteCronTest.php @@ -23,20 +23,28 @@ namespace OCA\Deck\Cron; +use OCA\Deck\Db\AttachmentMapper; use OCA\Deck\Db\Board; use OCA\Deck\Db\BoardMapper; +use OCA\Deck\Service\AttachmentService; class DeleteCronTest extends \Test\TestCase { /** @var BoardMapper|\PHPUnit_Framework_MockObject_MockObject */ protected $boardMapper; + /** @var AttachmentService|\PHPUnit_Framework_MockObject_MockObject */ + private $attachmentService; + /** @var AttachmentMapper|\PHPUnit_Framework_MockObject_MockObject */ + private $attachmentMapper; /** @var DeleteCron */ protected $deleteCron; public function setUp() { parent::setUp(); $this->boardMapper = $this->createMock(BoardMapper::class); - $this->deleteCron = new DeleteCron($this->boardMapper); + $this->attachmentService = $this->createMock(AttachmentService::class); + $this->attachmentMapper = $this->createMock(AttachmentMapper::class); + $this->deleteCron = new DeleteCron($this->boardMapper, $this->attachmentService, $this->attachmentMapper); } protected function getBoard($id) { diff --git a/tests/unit/Db/CardTest.php b/tests/unit/Db/CardTest.php index d9de6427f..7c22bc12d 100644 --- a/tests/unit/Db/CardTest.php +++ b/tests/unit/Db/CardTest.php @@ -77,6 +77,7 @@ class CardTest extends \PHPUnit_Framework_TestCase { 'duedate' => null, 'overdue' => 0, 'archived' => false, + 'attachments' => null, 'assignedUsers' => null, ], $card->jsonSerialize()); } @@ -97,6 +98,7 @@ class CardTest extends \PHPUnit_Framework_TestCase { 'duedate' => null, 'overdue' => 0, 'archived' => false, + 'attachments' => null, 'assignedUsers' => null, ], $card->jsonSerialize()); } @@ -127,6 +129,7 @@ class CardTest extends \PHPUnit_Framework_TestCase { 'duedate' => null, 'overdue' => 0, 'archived' => false, + 'attachments' => null, 'assignedUsers' => ['user1'], ], $card->jsonSerialize()); } diff --git a/tests/unit/Service/CardServiceTest.php b/tests/unit/Service/CardServiceTest.php index 69a66889e..1c8f711c1 100644 --- a/tests/unit/Service/CardServiceTest.php +++ b/tests/unit/Service/CardServiceTest.php @@ -55,7 +55,8 @@ class CardServiceTest extends TestCase { $this->permissionService = $this->createMock(PermissionService::class); $this->boardService = $this->createMock(BoardService::class); $this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); - $this->cardService = new CardService($this->cardMapper, $this->stackMapper, $this->permissionService, $this->boardService, $this->assignedUsersMapper); + $this->attachmentService = $this->createMock(AttachmentService::class); + $this->cardService = new CardService($this->cardMapper, $this->stackMapper, $this->permissionService, $this->boardService, $this->assignedUsersMapper, $this->attachmentService); } public function testFind() { diff --git a/tests/unit/Service/StackServiceTest.php b/tests/unit/Service/StackServiceTest.php index c7178b02f..03d6203da 100644 --- a/tests/unit/Service/StackServiceTest.php +++ b/tests/unit/Service/StackServiceTest.php @@ -54,6 +54,8 @@ class StackServiceTest extends TestCase { private $permissionService; /** @var AssignedUsersMapper|\PHPUnit_Framework_MockObject_MockObject */ private $assignedUsersMapper; + /** @var AttachmentService|\PHPUnit_Framework_MockObject_MockObject */ + private $attachmentService; /** @var BoardService|\PHPUnit_Framework_MockObject_MockObject */ private $boardService; @@ -65,6 +67,7 @@ class StackServiceTest extends TestCase { $this->permissionService = $this->createMock(PermissionService::class); $this->boardService = $this->createMock(BoardService::class); $this->assignedUsersMapper = $this->createMock(AssignedUsersMapper::class); + $this->attachmentService = $this->createMock(AttachmentService::class); $this->stackService = new StackService( $this->stackMapper, @@ -72,7 +75,8 @@ class StackServiceTest extends TestCase { $this->labelMapper, $this->permissionService, $this->boardService, - $this->assignedUsersMapper + $this->assignedUsersMapper, + $this->attachmentService ); }