From 89f2c7cfdba7dcc953a5bff807b7b290294ee516 Mon Sep 17 00:00:00 2001 From: Daniel Opitz Date: Sun, 16 Sep 2018 18:07:40 +0200 Subject: add setters + getters to Folder and Item entities, fixed unit tests, rearranged methods --- tests/Unit/Controller/EntityApiSerializerTest.php | 20 +++++++++++++++ tests/Unit/Controller/ExportControllerTest.php | 8 +++--- tests/Unit/Controller/ItemApiControllerTest.php | 30 ++++++++++++++++------- tests/Unit/Db/FolderMapperTest.php | 8 +++++- 4 files changed, 53 insertions(+), 13 deletions(-) (limited to 'tests') diff --git a/tests/Unit/Controller/EntityApiSerializerTest.php b/tests/Unit/Controller/EntityApiSerializerTest.php index 49b7e0b8d..c491ca4b0 100644 --- a/tests/Unit/Controller/EntityApiSerializerTest.php +++ b/tests/Unit/Controller/EntityApiSerializerTest.php @@ -33,6 +33,10 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setUnread(true); + $item->setId(3); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $serializer = new EntityApiSerializer('items'); $result = $serializer->serialize($item); @@ -45,9 +49,17 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setUnread(true); + $item->setId(3); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $item2 = new Item(); $item2->setUnread(false); + $item2->setId(5); + $item2->setGuid('guid'); + $item2->setGuidHash('guidhash'); + $item2->setFeedId(123); $serializer = new EntityApiSerializer('items'); @@ -73,9 +85,17 @@ class EntityApiSerializerTest extends \PHPUnit_Framework_TestCase { $item = new Item(); $item->setUnread(true); + $item->setId(3); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $item2 = new Item(); $item2->setUnread(false); + $item2->setId(5); + $item2->setGuid('guid'); + $item2->setGuidHash('guidhash'); + $item2->setFeedId(123); $serializer = new EntityApiSerializer('items'); diff --git a/tests/Unit/Controller/ExportControllerTest.php b/tests/Unit/Controller/ExportControllerTest.php index 592582b3a..120a98eee 100644 --- a/tests/Unit/Controller/ExportControllerTest.php +++ b/tests/Unit/Controller/ExportControllerTest.php @@ -98,8 +98,10 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase { $item1 = new Item(); $item1->setFeedId(3); + $item1->setGuid('guid'); $item2 = new Item(); $item2->setFeedId(5); + $item2->setGuid('guid'); $feed1 = new Feed(); $feed1->setId(3); @@ -129,13 +131,13 @@ class ExportControllerTest extends \PHPUnit_Framework_TestCase ); $this->assertEquals( - '[{"guid":null,"url":null,"title":null,' . + '[{"guid":"guid","url":null,"title":null,' . '"author":null,"pubDate":null,"updatedDate":null,"body":null,"enclosureMime":null,' . '"enclosureLink":null,"unread":false,"starred":false,' . - '"feedLink":"http:\/\/goo","rtl":null},{"guid":null,"url":null,' . + '"feedLink":"http:\/\/goo","rtl":false},{"guid":"guid","url":null,' . '"title":null,"author":null,"pubDate":null,"updatedDate":null,"body":null,' . '"enclosureMime":null,"enclosureLink":null,"unread":false,' . - '"starred":false,"feedLink":"http:\/\/gee","rtl":null}]', + '"starred":false,"feedLink":"http:\/\/gee","rtl":false}]', $return->render() ); } diff --git a/tests/Unit/Controller/ItemApiControllerTest.php b/tests/Unit/Controller/ItemApiControllerTest.php index ad2b323e7..e4aed96df 100644 --- a/tests/Unit/Controller/ItemApiControllerTest.php +++ b/tests/Unit/Controller/ItemApiControllerTest.php @@ -75,7 +75,11 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase public function testIndex() { - $items = [new Item()]; + $item = new Item(); + $item->setId(5); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $this->itemService->expects($this->once()) ->method('findAll') @@ -88,13 +92,13 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase $this->equalTo(true), $this->equalTo($this->user->getUID()) ) - ->will($this->returnValue($items)); + ->will($this->returnValue([$item])); $response = $this->itemAPI->index(1, 2, true, 30, 20, true); $this->assertEquals( [ - 'items' => [$items[0]->toApi()] + 'items' => [$item->toApi()] ], $response ); } @@ -102,7 +106,11 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase public function testIndexDefaultBatchSize() { - $items = [new Item()]; + $item = new Item(); + $item->setId(5); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $this->itemService->expects($this->once()) ->method('findAll') @@ -115,13 +123,13 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase $this->equalTo(false), $this->equalTo($this->user->getUID()) ) - ->will($this->returnValue($items)); + ->will($this->returnValue([$item])); $response = $this->itemAPI->index(1, 2, false); $this->assertEquals( [ - 'items' => [$items[0]->toApi()] + 'items' => [$item->toApi()] ], $response ); } @@ -129,7 +137,11 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase public function testUpdated() { - $items = [new Item()]; + $item = new Item(); + $item->setId(5); + $item->setGuid('guid'); + $item->setGuidHash('guidhash'); + $item->setFeedId(123); $this->itemService->expects($this->once()) ->method('findAllNew') @@ -140,13 +152,13 @@ class ItemApiControllerTest extends \PHPUnit_Framework_TestCase $this->equalTo(true), $this->equalTo($this->user->getUID()) ) - ->will($this->returnValue($items)); + ->will($this->returnValue([$item])); $response = $this->itemAPI->updated(1, 2, 30); $this->assertEquals( [ - 'items' => [$items[0]->toApi()] + 'items' => [$item->toApi()] ], $response ); } diff --git a/tests/Unit/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php index bf7b1cae0..9c14756d5 100644 --- a/tests/Unit/Db/FolderMapperTest.php +++ b/tests/Unit/Db/FolderMapperTest.php @@ -19,9 +19,11 @@ use OCA\News\Utility\Time; class FolderMapperTest extends MapperTestUtility { - + /** @var FolderMapper */ private $folderMapper; + /** @var Folder[] */ private $folders; + /** @var string */ private $user; protected function setUp() @@ -32,7 +34,11 @@ class FolderMapperTest extends MapperTestUtility // create mock folders $folder1 = new Folder(); + $folder1->setId(4); + $folder1->resetUpdatedFields(); $folder2 = new Folder(); + $folder2->setId(5); + $folder2->resetUpdatedFields(); $this->folders = [$folder1, $folder2]; $this->user = 'hh'; -- cgit v1.2.3