From a3b5b516d2152d9d27c5c952ba2d0183ebe333a6 Mon Sep 17 00:00:00 2001 From: Daniel Opitz Date: Mon, 16 Apr 2018 22:28:53 +0200 Subject: add getters + setters for feed entity --- tests/Integration/Fixtures/FeedFixture.php | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/Integration/Fixtures/FeedFixture.php b/tests/Integration/Fixtures/FeedFixture.php index 66461adbc..f0de6de2d 100644 --- a/tests/Integration/Fixtures/FeedFixture.php +++ b/tests/Integration/Fixtures/FeedFixture.php @@ -20,9 +20,8 @@ class FeedFixture extends Feed use Fixture; - public function __construct(array $defaults=[]) + public function __construct(array $defaults=[]) { - parent::__construct(); $defaults = array_merge( [ 'userId' => 'test', -- cgit v1.2.3 From 2aabd8fd1f9bdee0060b685e883716287db393c5 Mon Sep 17 00:00:00 2001 From: Daniel Opitz Date: Thu, 30 Aug 2018 00:20:16 +0200 Subject: fixed feed tests --- tests/Unit/Db/FeedTest.php | 4 +++- tests/Unit/Service/FeedServiceTest.php | 27 ++++++++++++++++++++++++--- tests/Unit/Utility/OPMLExporterTest.php | 12 +++++++++--- 3 files changed, 36 insertions(+), 7 deletions(-) (limited to 'tests') diff --git a/tests/Unit/Db/FeedTest.php b/tests/Unit/Db/FeedTest.php index 5e4e2a5a5..6305302f1 100644 --- a/tests/Unit/Db/FeedTest.php +++ b/tests/Unit/Db/FeedTest.php @@ -104,9 +104,11 @@ class FeedTest extends \PHPUnit_Framework_TestCase public function testSetXSSUrl() { + $this->setExpectedException(\TypeError::class); + $feed = new Feed(); $feed->setUrl('javascript:alert()'); - $this->assertEquals('', $feed->getUrl()); + $feed->getUrl(); } diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php index d5c5e0bfa..d56d732a2 100644 --- a/tests/Unit/Service/FeedServiceTest.php +++ b/tests/Unit/Service/FeedServiceTest.php @@ -27,6 +27,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase { private $feedMapper; + /** @var FeedService */ private $feedService; private $user; private $response; @@ -133,8 +134,10 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $createdFeed->setBasicAuthUser('user'); $createdFeed->setBasicAuthPassword('pass'); $item1 = new Item(); + $item1->setFeedId(4); $item1->setGuidHash('hi'); $item2 = new Item(); + $item2->setFeedId(4); $item2->setGuidHash('yo'); $return = [ $createdFeed, @@ -155,7 +158,10 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $this->feedMapper->expects($this->once()) ->method('insert') ->with($this->equalTo($createdFeed)) - ->will($this->returnValue($createdFeed)); + ->will($this->returnCallback(function() use ($createdFeed) { + $createdFeed->setId(4); + return $createdFeed; + })); $this->itemMapper->expects($this->at(0)) ->method('findByGuidHash') ->with( @@ -210,8 +216,10 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $createdFeed->setUrlHash($url); $createdFeed->setLink($url); $item1 = new Item(); + $item1->setFeedId(5); $item1->setGuidHash('hi'); $item2 = new Item(); + $item2->setFeedId(5); $item2->setGuidHash('yo'); $return = [ $createdFeed, @@ -232,7 +240,10 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $this->feedMapper->expects($this->once()) ->method('insert') ->with($this->equalTo($createdFeed)) - ->will($this->returnValue($createdFeed)); + ->will($this->returnCallback(function() use ($createdFeed) { + $createdFeed->setId(5); + return $createdFeed; + })); $this->itemMapper->expects($this->at(0)) ->method('findByGuidHash') ->with( @@ -519,9 +530,12 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase { $feed = new Feed(); $feed->setId(3); + $feed->setUrl('http://example.com'); $feed->setUrlHash('yo'); $existingFeed = new Feed(); + $existingFeed->setId(3); + $existingFeed->setUrl('http://example.com'); $feed->setArticlesPerUpdate(2); $item = new Item(); @@ -552,11 +566,13 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase { $feed = new Feed(); $feed->setId(3); + $feed->setUrl('http://example.com'); $feed->setUpdateErrorCount(0); $feed->setLastUpdateError(''); $exptectedFeed = new Feed(); $exptectedFeed->setId(3); + $exptectedFeed->setUrl('http://example.com'); $exptectedFeed->setUpdateErrorCount(1); $exptectedFeed->setLastUpdateError('hi'); @@ -655,6 +671,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $feed = new Feed(); $feed->setId(3); $feed->setArticlesPerUpdate(1); + $feed->setUrl('http://example.com'); $item = new Item(); $item->setGuidHash(md5('hi')); @@ -733,6 +750,7 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $feed = new Feed(); $feed->setFolderId(16); $feed->setId($feedId); + $feed->setUrl('http://example.com'); $this->feedMapper->expects($this->once()) ->method('find') @@ -909,7 +927,10 @@ class FeedServiceTest extends \PHPUnit_Framework_TestCase $this->feedMapper->expects($this->once()) ->method('insert') ->with($this->equalTo($insertFeed)) - ->will($this->returnValue($insertFeed)); + ->will($this->returnCallback(function() use ($insertFeed) { + $insertFeed->setId(3); + return $insertFeed; + })); $this->itemMapper->expects($this->at(0)) diff --git a/tests/Unit/Utility/OPMLExporterTest.php b/tests/Unit/Utility/OPMLExporterTest.php index 7f2c7dfdf..d62dcbf60 100644 --- a/tests/Unit/Utility/OPMLExporterTest.php +++ b/tests/Unit/Utility/OPMLExporterTest.php @@ -20,10 +20,16 @@ use OCA\News\Utility\OPMLExporter; class OPMLExporterTest extends \PHPUnit_Framework_TestCase { - + /** @var OPMLExporter */ private $exporter; + /** @var Feed */ private $feed1; + /** @var Feed */ private $feed2; + /** @var Folder */ + private $folder1; + /** @var Folder */ + private $folder2; protected function setUp() { @@ -37,11 +43,11 @@ class OPMLExporterTest extends \PHPUnit_Framework_TestCase $this->folder2->setParentId(3); $this->folder2->setName('a ergendwas'); $this->feed1 = new Feed(); - $this->feed1->setUrl('url 1'); + $this->feed1->setUrl('http://url1'); $this->feed1->setTitle('tötel'); $this->feed1->setFolderId(0); $this->feed2 = new Feed(); - $this->feed2->setUrl('url'); + $this->feed2->setUrl('http://url'); $this->feed2->setTitle('ttel df'); $this->feed2->setLink('goooooogel'); $this->feed2->setFolderId(1); -- cgit v1.2.3 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 From 3c3de1756854c95a386e5396cb90424853c4c6ac Mon Sep 17 00:00:00 2001 From: Daniel Opitz Date: Mon, 1 Oct 2018 23:36:13 +0200 Subject: dont call parent constructor for fixture classes, revert php 7 requirement --- tests/Integration/Fixtures/FolderFixture.php | 1 - tests/Integration/Fixtures/ItemFixture.php | 1 - 2 files changed, 2 deletions(-) (limited to 'tests') diff --git a/tests/Integration/Fixtures/FolderFixture.php b/tests/Integration/Fixtures/FolderFixture.php index 2564e8b71..19f19041b 100644 --- a/tests/Integration/Fixtures/FolderFixture.php +++ b/tests/Integration/Fixtures/FolderFixture.php @@ -21,7 +21,6 @@ class FolderFixture extends Folder public function __construct(array $defaults=[]) { - parent::__construct(); $defaults = array_merge( [ 'parentId' => 0, diff --git a/tests/Integration/Fixtures/ItemFixture.php b/tests/Integration/Fixtures/ItemFixture.php index 450b56f82..0d1f3561a 100644 --- a/tests/Integration/Fixtures/ItemFixture.php +++ b/tests/Integration/Fixtures/ItemFixture.php @@ -21,7 +21,6 @@ class ItemFixture extends Item public function __construct(array $defaults=[]) { - parent::__construct(); $defaults = array_merge( [ 'url' => 'http://google.de', -- cgit v1.2.3