diff options
author | Sean Molenaar <SMillerDev@users.noreply.github.com> | 2018-10-02 14:45:36 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-10-02 14:45:36 +0200 |
commit | 21e6f5cd6e4d75655872c58d887d6457530b4b04 (patch) | |
tree | 4f80a00c6a3a0447d6a1375ed8d3ef501bf21109 /tests | |
parent | 13fb06e5141e3433ab502565527324ad1e924d00 (diff) | |
parent | 3c3de1756854c95a386e5396cb90424853c4c6ac (diff) |
Merge pull request #283 from danopz/entity-methods
Entity setters + getters
Diffstat (limited to 'tests')
-rw-r--r-- | tests/Integration/Fixtures/FeedFixture.php | 3 | ||||
-rw-r--r-- | tests/Integration/Fixtures/FolderFixture.php | 1 | ||||
-rw-r--r-- | tests/Integration/Fixtures/ItemFixture.php | 1 | ||||
-rw-r--r-- | tests/Unit/Controller/EntityApiSerializerTest.php | 20 | ||||
-rw-r--r-- | tests/Unit/Controller/ExportControllerTest.php | 8 | ||||
-rw-r--r-- | tests/Unit/Controller/ItemApiControllerTest.php | 30 | ||||
-rw-r--r-- | tests/Unit/Db/FeedTest.php | 4 | ||||
-rw-r--r-- | tests/Unit/Db/FolderMapperTest.php | 8 | ||||
-rw-r--r-- | tests/Unit/Service/FeedServiceTest.php | 27 | ||||
-rw-r--r-- | tests/Unit/Utility/OPMLExporterTest.php | 12 |
10 files changed, 90 insertions, 24 deletions
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', 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', diff --git a/tests/Unit/Controller/EntityApiSerializerTest.php b/tests/Unit/Controller/EntityApiSerializerTest.php index 15f11a8b0..8709275e7 100644 --- a/tests/Unit/Controller/EntityApiSerializerTest.php +++ b/tests/Unit/Controller/EntityApiSerializerTest.php @@ -33,6 +33,10 @@ class EntityApiSerializerTest extends 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 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 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 7917eee24..b2b56e8dd 100644 --- a/tests/Unit/Controller/ExportControllerTest.php +++ b/tests/Unit/Controller/ExportControllerTest.php @@ -99,8 +99,10 @@ class ExportControllerTest extends 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); @@ -130,13 +132,13 @@ class ExportControllerTest extends 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 916b85a36..1e6fde59b 100644 --- a/tests/Unit/Controller/ItemApiControllerTest.php +++ b/tests/Unit/Controller/ItemApiControllerTest.php @@ -77,7 +77,11 @@ class ItemApiControllerTest extends 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') @@ -90,13 +94,13 @@ class ItemApiControllerTest extends 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 ); } @@ -104,7 +108,11 @@ class ItemApiControllerTest extends 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') @@ -117,13 +125,13 @@ class ItemApiControllerTest extends 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 ); } @@ -131,7 +139,11 @@ class ItemApiControllerTest extends 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') @@ -142,13 +154,13 @@ class ItemApiControllerTest extends 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/FeedTest.php b/tests/Unit/Db/FeedTest.php index 961e1d9b7..53bfe63f4 100644 --- a/tests/Unit/Db/FeedTest.php +++ b/tests/Unit/Db/FeedTest.php @@ -104,9 +104,11 @@ class FeedTest extends 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/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php index c8230ff0f..f3ee15456 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'; diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php index c7b06040a..fd3dd1805 100644 --- a/tests/Unit/Service/FeedServiceTest.php +++ b/tests/Unit/Service/FeedServiceTest.php @@ -29,6 +29,7 @@ class FeedServiceTest extends TestCase { private $feedMapper; + /** @var FeedService */ private $feedService; private $user; private $response; @@ -135,8 +136,10 @@ class FeedServiceTest extends 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, @@ -157,7 +160,10 @@ class FeedServiceTest extends 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( @@ -212,8 +218,10 @@ class FeedServiceTest extends 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, @@ -234,7 +242,10 @@ class FeedServiceTest extends 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( @@ -521,9 +532,12 @@ class FeedServiceTest extends 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(); @@ -554,11 +568,13 @@ class FeedServiceTest extends 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'); @@ -657,6 +673,7 @@ class FeedServiceTest extends TestCase $feed = new Feed(); $feed->setId(3); $feed->setArticlesPerUpdate(1); + $feed->setUrl('http://example.com'); $item = new Item(); $item->setGuidHash(md5('hi')); @@ -735,6 +752,7 @@ class FeedServiceTest extends TestCase $feed = new Feed(); $feed->setFolderId(16); $feed->setId($feedId); + $feed->setUrl('http://example.com'); $this->feedMapper->expects($this->once()) ->method('find') @@ -911,7 +929,10 @@ class FeedServiceTest extends 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 f02353100..80cbaf950 100644 --- a/tests/Unit/Utility/OPMLExporterTest.php +++ b/tests/Unit/Utility/OPMLExporterTest.php @@ -21,10 +21,16 @@ use PHPUnit\Framework\TestCase; class OPMLExporterTest extends TestCase { - + /** @var OPMLExporter */ private $exporter; + /** @var Feed */ private $feed1; + /** @var Feed */ private $feed2; + /** @var Folder */ + private $folder1; + /** @var Folder */ + private $folder2; protected function setUp() { @@ -38,11 +44,11 @@ class OPMLExporterTest extends 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); |