Subscriptions

From 42d69a95f3276a2d6089ca68f635c4e2f6aa7a23 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Tue, 21 Oct 2014 16:45:36 +0200 Subject: convert tabs indention to indention with 4 spaces because of mixing of both variants in code and better readability on github and websites because you cant set the indention width there and 8 spaces will be used for a tab --- tests/unit/controller/ExportControllerTest.php | 200 +++--- tests/unit/controller/FeedApiControllerTest.php | 576 +++++++-------- tests/unit/controller/FeedControllerTest.php | 778 ++++++++++----------- tests/unit/controller/FolderApiControllerTest.php | 332 ++++----- tests/unit/controller/FolderControllerTest.php | 422 +++++------ tests/unit/controller/ItemApiControllerTest.php | 674 +++++++++--------- tests/unit/controller/ItemControllerTest.php | 620 ++++++++-------- tests/unit/controller/PageControllerTest.php | 234 +++---- tests/unit/controller/UtilityApiControllerTest.php | 84 +-- 9 files changed, 1960 insertions(+), 1960 deletions(-) (limited to 'tests/unit/controller') diff --git a/tests/unit/controller/ExportControllerTest.php b/tests/unit/controller/ExportControllerTest.php index 28d69c6f3..29760e6f4 100644 --- a/tests/unit/controller/ExportControllerTest.php +++ b/tests/unit/controller/ExportControllerTest.php @@ -23,105 +23,105 @@ use \OCA\News\Db\Feed; class ExportControllerTest extends \PHPUnit_Framework_TestCase { - private $appName; - private $request; - private $controller; - private $user; - private $feedService; - private $folderService; - private $itemService; - private $opmlExporter; - - /** - * Gets run before each test - */ - public function setUp(){ - $this->appName = 'news'; - $this->user = 'john'; - $this->itemService = $this->getMockBuilder( - '\OCA\News\Service\ItemService') - ->disableOriginalConstructor() - ->getMock(); - $this->feedService = $this->getMockBuilder( - '\OCA\News\Service\FeedService') - ->disableOriginalConstructor() - ->getMock(); - $this->folderService = $this->getMockBuilder( - '\OCA\News\Service\FolderService') - ->disableOriginalConstructor() - ->getMock(); - $this->request = $this->getMockBuilder('\OCP\IRequest') - ->disableOriginalConstructor() - ->getMock(); - $this->opmlExporter = new OPMLExporter(); - $this->controller = new ExportController($this->appName, $this->request, - $this->folderService, $this->feedService, - $this->itemService, $this->opmlExporter, $this->user); - } - - - public function testOpmlExportNoFeeds(){ - $opml = - "\n" . - "\n" . - " \n" . - " Subscriptions\n" . - " \n" . - " \n" . - "\n"; - - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue([])); - $this->folderService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue([])); - - $return = $this->controller->opml(); - $this->assertTrue($return instanceof TextDownloadResponse); - $this->assertEquals($opml, $return->render()); - } - - - public function testGetAllArticles(){ - $item1 = new Item(); - $item1->setFeedId(3); - $item2 = new Item(); - $item2->setFeedId(5); - - $feed1 = new Feed(); - $feed1->setId(3); - $feed1->setLink('http://goo'); - $feed2 = new Feed(); - $feed2->setId(5); - $feed2->setLink('http://gee'); - $feeds = [$feed1, $feed2]; - - $articles = [$item1, $item2]; - - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($feeds)); - $this->itemService->expects($this->once()) - ->method('getUnreadOrStarred') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($articles)); - - - $return = $this->controller->articles(); - $headers = $return->getHeaders(); - $this->assertEquals('attachment; filename="articles.json"', $headers ['Content-Disposition']); - - $this->assertEquals('[{"guid":null,"url":null,"title":null,' . - '"author":null,"pubDate":null,"body":null,"enclosureMime":null,' . - '"enclosureLink":null,"unread":false,"starred":false,' . - '"feedLink":"http:\/\/goo"},{"guid":null,"url":null,"title":null,' . - '"author":null,"pubDate":null,"body":null,"enclosureMime":null,' . - '"enclosureLink":null,"unread":false,"starred":false,' . - '"feedLink":"http:\/\/gee"}]', $return->render()); - } + private $appName; + private $request; + private $controller; + private $user; + private $feedService; + private $folderService; + private $itemService; + private $opmlExporter; + + /** + * Gets run before each test + */ + public function setUp(){ + $this->appName = 'news'; + $this->user = 'john'; + $this->itemService = $this->getMockBuilder( + '\OCA\News\Service\ItemService') + ->disableOriginalConstructor() + ->getMock(); + $this->feedService = $this->getMockBuilder( + '\OCA\News\Service\FeedService') + ->disableOriginalConstructor() + ->getMock(); + $this->folderService = $this->getMockBuilder( + '\OCA\News\Service\FolderService') + ->disableOriginalConstructor() + ->getMock(); + $this->request = $this->getMockBuilder('\OCP\IRequest') + ->disableOriginalConstructor() + ->getMock(); + $this->opmlExporter = new OPMLExporter(); + $this->controller = new ExportController($this->appName, $this->request, + $this->folderService, $this->feedService, + $this->itemService, $this->opmlExporter, $this->user); + } + + + public function testOpmlExportNoFeeds(){ + $opml = + "\n" . + "\n" . + " \n" . + " Subscriptions\n" . + " \n" . + " \n" . + "\n"; + + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue([])); + $this->folderService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue([])); + + $return = $this->controller->opml(); + $this->assertTrue($return instanceof TextDownloadResponse); + $this->assertEquals($opml, $return->render()); + } + + + public function testGetAllArticles(){ + $item1 = new Item(); + $item1->setFeedId(3); + $item2 = new Item(); + $item2->setFeedId(5); + + $feed1 = new Feed(); + $feed1->setId(3); + $feed1->setLink('http://goo'); + $feed2 = new Feed(); + $feed2->setId(5); + $feed2->setLink('http://gee'); + $feeds = [$feed1, $feed2]; + + $articles = [$item1, $item2]; + + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($feeds)); + $this->itemService->expects($this->once()) + ->method('getUnreadOrStarred') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($articles)); + + + $return = $this->controller->articles(); + $headers = $return->getHeaders(); + $this->assertEquals('attachment; filename="articles.json"', $headers ['Content-Disposition']); + + $this->assertEquals('[{"guid":null,"url":null,"title":null,' . + '"author":null,"pubDate":null,"body":null,"enclosureMime":null,' . + '"enclosureLink":null,"unread":false,"starred":false,' . + '"feedLink":"http:\/\/goo"},{"guid":null,"url":null,"title":null,' . + '"author":null,"pubDate":null,"body":null,"enclosureMime":null,' . + '"enclosureLink":null,"unread":false,"starred":false,' . + '"feedLink":"http:\/\/gee"}]', $return->render()); + } } \ No newline at end of file diff --git a/tests/unit/controller/FeedApiControllerTest.php b/tests/unit/controller/FeedApiControllerTest.php index 8dff56f2e..d14782856 100644 --- a/tests/unit/controller/FeedApiControllerTest.php +++ b/tests/unit/controller/FeedApiControllerTest.php @@ -24,322 +24,322 @@ use \OCA\News\Db\Item; class FeedApiControllerTest extends \PHPUnit_Framework_TestCase { - private $feedService; - private $itemService; - private $feedAPI; - private $appName; - private $user; - private $request; - private $msg; - private $logger; - private $loggerParams; - - protected function setUp() { - $this->user = 'tom'; - $this->loggerParams = ['hi']; - $this->logger = $this->getMockBuilder( - '\OCP\ILogger') - ->disableOriginalConstructor() - ->getMock(); - $this->appName = 'news'; - $this->request = $this->getMockBuilder( - '\OCP\IRequest') - ->disableOriginalConstructor() - ->getMock(); - $this->feedService = $this->getMockBuilder( - '\OCA\News\Service\FeedService') - ->disableOriginalConstructor() - ->getMock(); - $this->itemService = $this->getMockBuilder( - '\OCA\News\Service\ItemService') - ->disableOriginalConstructor() - ->getMock(); - $this->feedAPI = new FeedApiController( - $this->appName, - $this->request, - $this->feedService, - $this->itemService, - $this->logger, - $this->user, - $this->loggerParams - ); - $this->msg = 'hohoho'; - } - - - public function testIndex() { - $feeds = [new Feed()]; - $starredCount = 3; - $newestItemId = 2; - - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($starredCount)); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($newestItemId)); - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($feeds)); - - $response = $this->feedAPI->index(); - - $this->assertEquals([ - 'feeds' => [$feeds[0]->toAPI()], - 'starredCount' => $starredCount, - 'newestItemId' => $newestItemId - ], $response); - } - - - public function testIndexNoNewestItemId() { - $feeds = [new Feed()]; - $starredCount = 3; - - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($starredCount)); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->with($this->equalTo($this->user)) - ->will($this->throwException(new ServiceNotFoundException(''))); - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($feeds)); - - $response = $this->feedAPI->index(); - - $this->assertEquals([ - 'feeds' => [$feeds[0]->toAPI()], - 'starredCount' => $starredCount, - ], $response); - } - - - public function testDelete() { - $this->feedService->expects($this->once()) - ->method('delete') - ->with( - $this->equalTo(2), - $this->equalTo($this->user)); - - $this->feedAPI->delete(2); - } - - - public function testDeleteDoesNotExist() { - $this->feedService->expects($this->once()) - ->method('delete') - ->will($this->throwException(new ServiceNotFoundException($this->msg))); - - $response = $this->feedAPI->delete(2); - - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); - } - - - public function testCreate() { - $feeds = [new Feed()]; - - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->with( - $this->equalTo('url'), - $this->equalTo(3), - $this->equalTo($this->user)) - ->will($this->returnValue($feeds[0])); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->will($this->returnValue(3)); - - $response = $this->feedAPI->create('url', 3); - - $this->assertEquals([ - 'feeds' => [$feeds[0]->toAPI()], - 'newestItemId' => 3 - ], $response); - } - - - public function testCreateNoItems() { - $feeds = [new Feed()]; - - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->with( - $this->equalTo('ho'), - $this->equalTo(3), - $this->equalTo($this->user)) - ->will($this->returnValue($feeds[0])); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->will($this->throwException(new ServiceNotFoundException(''))); - - $response = $this->feedAPI->create('ho', 3); - - $this->assertEquals([ - 'feeds' => [$feeds[0]->toAPI()] - ], $response); - } - - - - public function testCreateExists() { - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceConflictException($this->msg))); - - $response = $this->feedAPI->create('ho', 3); - - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); - } + private $feedService; + private $itemService; + private $feedAPI; + private $appName; + private $user; + private $request; + private $msg; + private $logger; + private $loggerParams; + + protected function setUp() { + $this->user = 'tom'; + $this->loggerParams = ['hi']; + $this->logger = $this->getMockBuilder( + '\OCP\ILogger') + ->disableOriginalConstructor() + ->getMock(); + $this->appName = 'news'; + $this->request = $this->getMockBuilder( + '\OCP\IRequest') + ->disableOriginalConstructor() + ->getMock(); + $this->feedService = $this->getMockBuilder( + '\OCA\News\Service\FeedService') + ->disableOriginalConstructor() + ->getMock(); + $this->itemService = $this->getMockBuilder( + '\OCA\News\Service\ItemService') + ->disableOriginalConstructor() + ->getMock(); + $this->feedAPI = new FeedApiController( + $this->appName, + $this->request, + $this->feedService, + $this->itemService, + $this->logger, + $this->user, + $this->loggerParams + ); + $this->msg = 'hohoho'; + } + + + public function testIndex() { + $feeds = [new Feed()]; + $starredCount = 3; + $newestItemId = 2; + + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($starredCount)); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($newestItemId)); + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($feeds)); + + $response = $this->feedAPI->index(); + + $this->assertEquals([ + 'feeds' => [$feeds[0]->toAPI()], + 'starredCount' => $starredCount, + 'newestItemId' => $newestItemId + ], $response); + } + + + public function testIndexNoNewestItemId() { + $feeds = [new Feed()]; + $starredCount = 3; + + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($starredCount)); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->throwException(new ServiceNotFoundException(''))); + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($feeds)); + + $response = $this->feedAPI->index(); + + $this->assertEquals([ + 'feeds' => [$feeds[0]->toAPI()], + 'starredCount' => $starredCount, + ], $response); + } + + + public function testDelete() { + $this->feedService->expects($this->once()) + ->method('delete') + ->with( + $this->equalTo(2), + $this->equalTo($this->user)); + + $this->feedAPI->delete(2); + } + + + public function testDeleteDoesNotExist() { + $this->feedService->expects($this->once()) + ->method('delete') + ->will($this->throwException(new ServiceNotFoundException($this->msg))); + + $response = $this->feedAPI->delete(2); + + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); + } + + + public function testCreate() { + $feeds = [new Feed()]; + + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->with( + $this->equalTo('url'), + $this->equalTo(3), + $this->equalTo($this->user)) + ->will($this->returnValue($feeds[0])); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->will($this->returnValue(3)); + + $response = $this->feedAPI->create('url', 3); + + $this->assertEquals([ + 'feeds' => [$feeds[0]->toAPI()], + 'newestItemId' => 3 + ], $response); + } + + + public function testCreateNoItems() { + $feeds = [new Feed()]; + + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->with( + $this->equalTo('ho'), + $this->equalTo(3), + $this->equalTo($this->user)) + ->will($this->returnValue($feeds[0])); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->will($this->throwException(new ServiceNotFoundException(''))); + + $response = $this->feedAPI->create('ho', 3); + + $this->assertEquals([ + 'feeds' => [$feeds[0]->toAPI()] + ], $response); + } + + + + public function testCreateExists() { + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->will($this->throwException(new ServiceConflictException($this->msg))); + + $response = $this->feedAPI->create('ho', 3); + + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); + } - public function testCreateError() { - $this->feedService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceNotFoundException($this->msg))); + public function testCreateError() { + $this->feedService->expects($this->once()) + ->method('create') + ->will($this->throwException(new ServiceNotFoundException($this->msg))); - $response = $this->feedAPI->create('ho', 3); + $response = $this->feedAPI->create('ho', 3); - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); + } - public function testRead() { - $this->itemService->expects($this->once()) - ->method('readFeed') - ->with( - $this->equalTo(3), - $this->equalTo(30), - $this->equalTo($this->user)); - - $this->feedAPI->read(3, 30); - } - - - public function testMove() { - $this->feedService->expects($this->once()) - ->method('move') - ->with( - $this->equalTo(3), - $this->equalTo(30), - $this->equalTo($this->user)); - - $this->feedAPI->move(3, 30); - } - - - public function testMoveDoesNotExist() { - $this->feedService->expects($this->once()) - ->method('move') - ->will($this->throwException(new ServiceNotFoundException($this->msg))); + public function testRead() { + $this->itemService->expects($this->once()) + ->method('readFeed') + ->with( + $this->equalTo(3), + $this->equalTo(30), + $this->equalTo($this->user)); + + $this->feedAPI->read(3, 30); + } + + + public function testMove() { + $this->feedService->expects($this->once()) + ->method('move') + ->with( + $this->equalTo(3), + $this->equalTo(30), + $this->equalTo($this->user)); + + $this->feedAPI->move(3, 30); + } + + + public function testMoveDoesNotExist() { + $this->feedService->expects($this->once()) + ->method('move') + ->will($this->throwException(new ServiceNotFoundException($this->msg))); - $response = $this->feedAPI->move(3, 4); + $response = $this->feedAPI->move(3, 4); - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); + } - public function testRename() { - $feedId = 3; - $feedTitle = 'test'; + public function testRename() { + $feedId = 3; + $feedTitle = 'test'; - $this->feedService->expects($this->once()) - ->method('rename') - ->with( - $this->equalTo($feedId), - $this->equalTo($feedTitle), - $this->equalTo($this->user)); + $this->feedService->expects($this->once()) + ->method('rename') + ->with( + $this->equalTo($feedId), + $this->equalTo($feedTitle), + $this->equalTo($this->user)); - $this->feedAPI->rename($feedId, $feedTitle); - } + $this->feedAPI->rename($feedId, $feedTitle); + } - public function testRenameError() { - $feedId = 3; - $feedTitle = 'test'; + public function testRenameError() { + $feedId = 3; + $feedTitle = 'test'; - $this->feedService->expects($this->once()) - ->method('rename') - ->with( - $this->equalTo($feedId), - $this->equalTo($feedTitle), - $this->equalTo($this->user)) - ->will($this->throwException(new ServiceNotFoundException('hi'))); + $this->feedService->expects($this->once()) + ->method('rename') + ->with( + $this->equalTo($feedId), + $this->equalTo($feedTitle), + $this->equalTo($this->user)) + ->will($this->throwException(new ServiceNotFoundException('hi'))); - $result = $this->feedAPI->rename($feedId, $feedTitle); - $data = $result->getData(); - $code = $result->getStatus(); + $result = $this->feedAPI->rename($feedId, $feedTitle); + $data = $result->getData(); + $code = $result->getStatus(); - $this->assertSame(Http::STATUS_NOT_FOUND, $code); - $this->assertSame('hi', $data['message']); - } + $this->assertSame(Http::STATUS_NOT_FOUND, $code); + $this->assertSame('hi', $data['message']); + } - public function testfromAllUsers(){ - $feed = new Feed(); - $feed->setUrl(3); - $feed->setId(1); - $feed->setUserId('john'); - $feeds = [$feed]; - $this->feedService->expects($this->once()) - ->method('findAllFromAllUsers') - ->will($this->returnValue($feeds)); - $response = json_encode($this->feedAPI->fromAllUsers()); - $this->assertEquals('{"feeds":[{"id":1,"userId":"john"}]}', $response); - } + public function testfromAllUsers(){ + $feed = new Feed(); + $feed->setUrl(3); + $feed->setId(1); + $feed->setUserId('john'); + $feeds = [$feed]; + $this->feedService->expects($this->once()) + ->method('findAllFromAllUsers') + ->will($this->returnValue($feeds)); + $response = json_encode($this->feedAPI->fromAllUsers()); + $this->assertEquals('{"feeds":[{"id":1,"userId":"john"}]}', $response); + } - public function testUpdate() { - $feedId = 3; - $userId = 'hi'; + public function testUpdate() { + $feedId = 3; + $userId = 'hi'; - $this->feedService->expects($this->once()) - ->method('update') - ->with($this->equalTo($feedId), $this->equalTo($userId)); + $this->feedService->expects($this->once()) + ->method('update') + ->with($this->equalTo($feedId), $this->equalTo($userId)); - $this->feedAPI->update($userId, $feedId); - } + $this->feedAPI->update($userId, $feedId); + } - public function testUpdateError() { - $feedId = 3; - $userId = 'hi'; - $this->feedService->expects($this->once()) - ->method('update') - ->will($this->throwException(new \Exception($this->msg))); - $this->logger->expects($this->once()) - ->method('debug') - ->with($this->equalTo('Could not update feed ' . $this->msg), - $this->equalTo($this->loggerParams)); + public function testUpdateError() { + $feedId = 3; + $userId = 'hi'; + $this->feedService->expects($this->once()) + ->method('update') + ->will($this->throwException(new \Exception($this->msg))); + $this->logger->expects($this->once()) + ->method('debug') + ->with($this->equalTo('Could not update feed ' . $this->msg), + $this->equalTo($this->loggerParams)); - $this->feedAPI->update($userId, $feedId); + $this->feedAPI->update($userId, $feedId); - } + } } diff --git a/tests/unit/controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php index ed20308ec..34b0a847b 100644 --- a/tests/unit/controller/FeedControllerTest.php +++ b/tests/unit/controller/FeedControllerTest.php @@ -23,483 +23,483 @@ use \OCA\News\Service\ServiceConflictException; class FeedControllerTest extends \PHPUnit_Framework_TestCase { - private $appName; - private $feedService; - private $request; - private $controller; - private $folderService; - private $itemService; - private $settings; - private $exampleResult; - - - /** - * Gets run before each test - */ - public function setUp(){ - $this->appName = 'news'; - $this->user = 'jack'; - $this->settings = $this->getMockBuilder( - '\OCP\IConfig') - ->disableOriginalConstructor() - ->getMock(); - $this->itemService = $this->getMockBuilder('\OCA\News\Service\ItemService') - ->disableOriginalConstructor() - ->getMock(); - $this->feedService = $this->getMockBuilder('\OCA\News\Service\FeedService') - ->disableOriginalConstructor() - ->getMock(); - $this->folderService = $this->getMockBuilder('\OCA\News\Service\FolderService') - ->disableOriginalConstructor() - ->getMock(); - $this->request = $this->getMockBuilder( - '\OCP\IRequest') - ->disableOriginalConstructor() - ->getMock(); - $this->controller = new FeedController($this->appName, $this->request, - $this->folderService, - $this->feedService, - $this->itemService, - $this->settings, - $this->user); - $this->exampleResult = [ - 'activeFeed' => [ - 'id' => 0, - 'type' => FeedType::SUBSCRIPTIONS - ] - ]; - } - - - public function testIndex(){ - $result = [ - 'feeds' => [ - ['a feed'], - ], - 'starred' => 13 - ]; - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($result['feeds'])); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->with($this->equalTo($this->user)) - ->will($this->throwException(new ServiceNotFoundException(''))); - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($result['starred'])); - - $response = $this->controller->index(); - - $this->assertEquals($result, $response); - } - - - public function testIndexHighestItemIdExists(){ - $result = [ - 'feeds' => [ - ['a feed'], - ], - 'starred' => 13, - 'newestItemId' => 5 - ]; - $this->feedService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($result['feeds'])); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($result['newestItemId'])); - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($result['starred'])); - - $response = $this->controller->index(); - - $this->assertEquals($result, $response); - } - - - - private function activeInitMocks($id, $type){ - $this->settings->expects($this->at(0)) - ->method('getUserValue') - ->with($this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('lastViewedFeedId')) - ->will($this->returnValue($id)); - $this->settings->expects($this->at(1)) - ->method('getUserValue') - ->with($this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('lastViewedFeedType')) - ->will($this->returnValue($type)); - } - - - public function testActive(){ - $id = 3; - $type = FeedType::STARRED; - $result = [ - 'activeFeed' => [ - 'id' => $id, - 'type' => $type - ] - ]; - - $this->activeInitMocks($id, $type); - - $response = $this->controller->active(); - - $this->assertEquals($result, $response); - } - - - public function testActiveFeedDoesNotExist(){ - $id = 3; - $type = FeedType::FEED; - $ex = new ServiceNotFoundException('hiu'); - $result = $this->exampleResult; - - $this->feedService->expects($this->once()) - ->method('find') - ->with($this->equalTo($id), $this->equalTo($this->user)) - ->will($this->throwException($ex)); - - $this->activeInitMocks($id, $type); - - $response = $this->controller->active(); - - $this->assertEquals($result, $response); - } - - - public function testActiveFolderDoesNotExist(){ - $id = 3; - $type = FeedType::FOLDER; - $ex = new ServiceNotFoundException('hiu'); - $result = $this->exampleResult; + private $appName; + private $feedService; + private $request; + private $controller; + private $folderService; + private $itemService; + private $settings; + private $exampleResult; + + + /** + * Gets run before each test + */ + public function setUp(){ + $this->appName = 'news'; + $this->user = 'jack'; + $this->settings = $this->getMockBuilder( + '\OCP\IConfig') + ->disableOriginalConstructor() + ->getMock(); + $this->itemService = $this->getMockBuilder('\OCA\News\Service\ItemService') + ->disableOriginalConstructor() + ->getMock(); + $this->feedService = $this->getMockBuilder('\OCA\News\Service\FeedService') + ->disableOriginalConstructor() + ->getMock(); + $this->folderService = $this->getMockBuilder('\OCA\News\Service\FolderService') + ->disableOriginalConstructor() + ->getMock(); + $this->request = $this->getMockBuilder( + '\OCP\IRequest') + ->disableOriginalConstructor() + ->getMock(); + $this->controller = new FeedController($this->appName, $this->request, + $this->folderService, + $this->feedService, + $this->itemService, + $this->settings, + $this->user); + $this->exampleResult = [ + 'activeFeed' => [ + 'id' => 0, + 'type' => FeedType::SUBSCRIPTIONS + ] + ]; + } + + + public function testIndex(){ + $result = [ + 'feeds' => [ + ['a feed'], + ], + 'starred' => 13 + ]; + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($result['feeds'])); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->throwException(new ServiceNotFoundException(''))); + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($result['starred'])); + + $response = $this->controller->index(); + + $this->assertEquals($result, $response); + } + + + public function testIndexHighestItemIdExists(){ + $result = [ + 'feeds' => [ + ['a feed'], + ], + 'starred' => 13, + 'newestItemId' => 5 + ]; + $this->feedService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($result['feeds'])); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($result['newestItemId'])); + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($result['starred'])); + + $response = $this->controller->index(); + + $this->assertEquals($result, $response); + } + + + + private function activeInitMocks($id, $type){ + $this->settings->expects($this->at(0)) + ->method('getUserValue') + ->with($this->equalTo($this->user), + $this->equalTo($this->appName), + $this->equalTo('lastViewedFeedId')) + ->will($this->returnValue($id)); + $this->settings->expects($this->at(1)) + ->method('getUserValue') + ->with($this->equalTo($this->user), + $this->equalTo($this->appName), + $this->equalTo('lastViewedFeedType')) + ->will($this->returnValue($type)); + } + + + public function testActive(){ + $id = 3; + $type = FeedType::STARRED; + $result = [ + 'activeFeed' => [ + 'id' => $id, + 'type' => $type + ] + ]; + + $this->activeInitMocks($id, $type); + + $response = $this->controller->active(); + + $this->assertEquals($result, $response); + } + + + public function testActiveFeedDoesNotExist(){ + $id = 3; + $type = FeedType::FEED; + $ex = new ServiceNotFoundException('hiu'); + $result = $this->exampleResult; + + $this->feedService->expects($this->once()) + ->method('find') + ->with($this->equalTo($id), $this->equalTo($this->user)) + ->will($this->throwException($ex)); + + $this->activeInitMocks($id, $type); + + $response = $this->controller->active(); + + $this->assertEquals($result, $response); + } + + + public function testActiveFolderDoesNotExist(){ + $id = 3; + $type = FeedType::FOLDER; + $ex = new ServiceNotFoundException('hiu'); + $result = $this->exampleResult; - $this->folderService->expects($this->once()) - ->method('find') - ->with($this->equalTo($id), $this->equalTo($this->user)) - ->will($this->throwException($ex)); + $this->folderService->expects($this->once()) + ->method('find') + ->with($this->equalTo($id), $this->equalTo($this->user)) + ->will($this->throwException($ex)); - $this->activeInitMocks($id, $type); + $this->activeInitMocks($id, $type); - $response = $this->controller->active(); + $response = $this->controller->active(); - $this->assertEquals($result, $response); - } + $this->assertEquals($result, $response); + } - public function testActiveActiveIsNull(){ - $id = 3; - $type = null; - $result = $this->exampleResult; + public function testActiveActiveIsNull(){ + $id = 3; + $type = null; + $result = $this->exampleResult; - $this->activeInitMocks($id, $type); + $this->activeInitMocks($id, $type); - $response = $this->controller->active(); + $response = $this->controller->active(); - $this->assertEquals($result, $response); - } + $this->assertEquals($result, $response); + } - public function testCreate(){ - $result = [ - 'feeds' => [new Feed()], - 'newestItemId' => 3 - ]; + public function testCreate(){ + $result = [ + 'feeds' => [new Feed()], + 'newestItemId' => 3 + ]; - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->will($this->returnValue($result['newestItemId'])); - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->with($this->equalTo('hi'), - $this->equalTo(4), - $this->equalTo($this->user), - $this->equalTo('yo')) - ->will($this->returnValue($result['feeds'][0])); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->will($this->returnValue($result['newestItemId'])); + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->with($this->equalTo('hi'), + $this->equalTo(4), + $this->equalTo($this->user), + $this->equalTo('yo')) + ->will($this->returnValue($result['feeds'][0])); - $response = $this->controller->create('hi', 4, 'yo'); + $response = $this->controller->create('hi', 4, 'yo'); - $this->assertEquals($result, $response); - } + $this->assertEquals($result, $response); + } - public function testCreateNoItems(){ - $result = ['feeds' => [new Feed()]]; + public function testCreateNoItems(){ + $result = ['feeds' => [new Feed()]]; - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->itemService->expects($this->once()) - ->method('getNewestItemId') - ->will($this->throwException(new ServiceNotFoundException(''))); + $this->itemService->expects($this->once()) + ->method('getNewestItemId') + ->will($this->throwException(new ServiceNotFoundException(''))); - $this->feedService->expects($this->once()) - ->method('create') - ->with($this->equalTo('hi'), - $this->equalTo(4), - $this->equalTo($this->user), - $this->equalTo('yo')) - ->will($this->returnValue($result['feeds'][0])); + $this->feedService->expects($this->once()) + ->method('create') + ->with($this->equalTo('hi'), + $this->equalTo(4), + $this->equalTo($this->user), + $this->equalTo('yo')) + ->will($this->returnValue($result['feeds'][0])); - $response = $this->controller->create('hi', 4, 'yo'); + $response = $this->controller->create('hi', 4, 'yo'); - $this->assertEquals($result, $response); - } + $this->assertEquals($result, $response); + } - public function testCreateReturnsErrorForInvalidCreate(){ - $msg = 'except'; - $ex = new ServiceNotFoundException($msg); - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->will($this->throwException($ex)); + public function testCreateReturnsErrorForInvalidCreate(){ + $msg = 'except'; + $ex = new ServiceNotFoundException($msg); + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->will($this->throwException($ex)); - $response = $this->controller->create('hi', 4, 'test'); - $params = json_decode($response->render(), true); + $response = $this->controller->create('hi', 4, 'test'); + $params = json_decode($response->render(), true); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_UNPROCESSABLE_ENTITY); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_UNPROCESSABLE_ENTITY); + } - public function testCreateReturnsErrorForDuplicateCreate(){ - $msg = 'except'; - $ex = new ServiceConflictException($msg); - $this->feedService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->feedService->expects($this->once()) - ->method('create') - ->will($this->throwException($ex)); + public function testCreateReturnsErrorForDuplicateCreate(){ + $msg = 'except'; + $ex = new ServiceConflictException($msg); + $this->feedService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->feedService->expects($this->once()) + ->method('create') + ->will($this->throwException($ex)); - $response = $this->controller->create('hi', 4, 'test'); - $params = json_decode($response->render(), true); + $response = $this->controller->create('hi', 4, 'test'); + $params = json_decode($response->render(), true); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_CONFLICT); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_CONFLICT); + } - public function testDelete(){ - $this->feedService->expects($this->once()) - ->method('markDeleted') - ->with($this->equalTo(4)); + public function testDelete(){ + $this->feedService->expects($this->once()) + ->method('markDeleted') + ->with($this->equalTo(4)); - $this->controller->delete(4); - } + $this->controller->delete(4); + } - public function testDeleteDoesNotExist(){ - $msg = 'hehe'; + public function testDeleteDoesNotExist(){ + $msg = 'hehe'; - $this->feedService->expects($this->once()) - ->method('markDeleted') - ->will($this->throwException(new ServiceNotFoundException($msg))); + $this->feedService->expects($this->once()) + ->method('markDeleted') + ->will($this->throwException(new ServiceNotFoundException($msg))); - $response = $this->controller->delete(4); - $params = json_decode($response->render(), true); + $response = $this->controller->delete(4); + $params = json_decode($response->render(), true); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); + } - public function testUpdate(){ - $feed = new Feed(); - $feed->setId(3); - $feed->setUnreadCount(44); - $result = [ - 'feeds' => [ - [ - 'id' => $feed->getId(), - 'unreadCount' => $feed->getUnreadCount() - ] - ] - ]; + public function testUpdate(){ + $feed = new Feed(); + $feed->setId(3); + $feed->setUnreadCount(44); + $result = [ + 'feeds' => [ + [ + 'id' => $feed->getId(), + 'unreadCount' => $feed->getUnreadCount() + ] + ] + ]; - $this->feedService->expects($this->once()) - ->method('update') - ->with($this->equalTo(4), $this->equalTo($this->user)) - ->will($this->returnValue($feed)); + $this->feedService->expects($this->once()) + ->method('update') + ->with($this->equalTo(4), $this->equalTo($this->user)) + ->will($this->returnValue($feed)); - $response = $this->controller->update(4); + $response = $this->controller->update(4); - $this->assertEquals($result, $response); - } + $this->assertEquals($result, $response); + } - public function testUpdateReturnsJSONError(){ - $this->feedService->expects($this->once()) - ->method('update') - ->with($this->equalTo(4), $this->equalTo($this->user)) - ->will($this->throwException(new ServiceNotFoundException('NO!'))); + public function testUpdateReturnsJSONError(){ + $this->feedService->expects($this->once()) + ->method('update') + ->with($this->equalTo(4), $this->equalTo($this->user)) + ->will($this->throwException(new ServiceNotFoundException('NO!'))); - $response = $this->controller->update(4); - $render = $response->render(); + $response = $this->controller->update(4); + $render = $response->render(); - $this->assertEquals('{"message":"NO!"}', $render); - $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); - } + $this->assertEquals('{"message":"NO!"}', $render); + $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); + } - public function testMove(){ - $this->feedService->expects($this->once()) - ->method('move') - ->with($this->equalTo(4), - $this->equalTo(3), - $this->equalTo($this->user)); + public function testMove(){ + $this->feedService->expects($this->once()) + ->method('move') + ->with($this->equalTo(4), + $this->equalTo(3), + $this->equalTo($this->user)); - $this->controller->move(4, 3); + $this->controller->move(4, 3); - } + } - public function testMoveDoesNotExist(){ - $msg = 'john'; + public function testMoveDoesNotExist(){ + $msg = 'john'; - $this->feedService->expects($this->once()) - ->method('move') - ->will($this->throwException(new ServiceNotFoundException($msg))); + $this->feedService->expects($this->once()) + ->method('move') + ->will($this->throwException(new ServiceNotFoundException($msg))); - $response = $this->controller->move(4, 3); - $params = json_decode($response->render(), true); + $response = $this->controller->move(4, 3); + $params = json_decode($response->render(), true); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); + } - public function testRename(){ - $this->feedService->expects($this->once()) - ->method('rename') - ->with($this->equalTo(4), - $this->equalTo('title'), - $this->equalTo($this->user)); + public function testRename(){ + $this->feedService->expects($this->once()) + ->method('rename') + ->with($this->equalTo(4), + $this->equalTo('title'), + $this->equalTo($this->user)); - $this->controller->rename(4, 'title'); - } + $this->controller->rename(4, 'title'); + } - public function testRenameDoesNotExist(){ - $msg = 'hi'; + public function testRenameDoesNotExist(){ + $msg = 'hi'; - $this->feedService->expects($this->once()) - ->method('rename') - ->with($this->equalTo(4), - $this->equalTo('title'), - $this->equalTo($this->user)) - ->will($this->throwException(new ServiceNotFoundException($msg))); + $this->feedService->expects($this->once()) + ->method('rename') + ->with($this->equalTo(4), + $this->equalTo('title'), + $this->equalTo($this->user)) + ->will($this->throwException(new ServiceNotFoundException($msg))); - $response = $this->controller->rename(4, 'title'); + $response = $this->controller->rename(4, 'title'); - $params = $response->getData(); + $params = $response->getData(); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); + } - public function testImport() { - $feed = new Feed(); + public function testImport() { + $feed = new Feed(); - $expected = [ - 'starred' => 3, - 'feeds' => [$feed] - ]; + $expected = [ + 'starred' => 3, + 'feeds' => [$feed] + ]; - $this->feedService->expects($this->once()) - ->method('importArticles') - ->with($this->equalTo(array('json')), - $this->equalTo($this->user)) - ->will($this->returnValue($feed)); + $this->feedService->expects($this->once()) + ->method('importArticles') + ->with($this->equalTo(array('json')), + $this->equalTo($this->user)) + ->will($this->returnValue($feed)); - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue(3)); + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue(3)); - $response = $this->controller->import(array('json')); + $response = $this->controller->import(array('json')); - $this->assertEquals($expected, $response); - } + $this->assertEquals($expected, $response); + } - public function testImportCreatesNoAdditionalFeed() { - $this->feedService->expects($this->once()) - ->method('importArticles') - ->with($this->equalTo(array('json')), - $this->equalTo($this->user)) - ->will($this->returnValue(null)); + public function testImportCreatesNoAdditionalFeed() { + $this->feedService->expects($this->once()) + ->method('importArticles') + ->with($this->equalTo(array('json')), + $this->equalTo($this->user)) + ->will($this->returnValue(null)); - $this->itemService->expects($this->once()) - ->method('starredCount') - ->with($this->equalTo($this->user)) - ->will($this->returnValue(3)); + $this->itemService->expects($this->once()) + ->method('starredCount') + ->with($this->equalTo($this->user)) + ->will($this->returnValue(3)); - $response = $this->controller->import(array('json')); + $response = $this->controller->import(array('json')); - $this->assertEquals(['starred' => 3], $response); - } + $this->assertEquals(['starred' => 3], $response); + } - public function testReadFeed(){ - $expected = [ - 'feeds' => [ - [ - 'id' => 4, - 'unreadCount' => 0 - ] - ] - ]; + public function testReadFeed(){ + $expected = [ + 'feeds' => [ + [ + 'id' => 4, + 'unreadCount' => 0 + ] + ] + ]; - $this->itemService->expects($this->once()) - ->method('readFeed') - ->with($this->equalTo(4), $this->equalTo(5), $this->user); + $this->itemService->expects($this->once()) + ->method('readFeed') + ->with($this->equalTo(4), $this->equalTo(5), $this->user); - $response = $this->controller->read(4, 5); - $this->assertEquals($expected, $response); - } + $response = $this->controller->read(4, 5); + $this->assertEquals($expected, $response); + } - public function testRestore() { - $this->feedService->expects($this->once()) - ->method('unmarkDeleted') - ->with($this->equalTo(4)); + public function testRestore() { + $this->feedService->expects($this->once()) + ->method('unmarkDeleted') + ->with($this->equalTo(4)); - $this->controller->restore(4); - } + $this->controller->restore(4); + } - public function testRestoreDoesNotExist(){ - $msg = 'hehe'; + public function testRestoreDoesNotExist(){ + $msg = 'hehe'; - $this->feedService->expects($this->once()) - ->method('unmarkDeleted') - ->will($this->throwException(new ServiceNotFoundException($msg))); + $this->feedService->expects($this->once()) + ->method('unmarkDeleted') + ->will($this->throwException(new ServiceNotFoundException($msg))); - $response = $this->controller->restore(4); - $params = json_decode($response->render(), true); + $response = $this->controller->restore(4); + $params = json_decode($response->render(), true); - $this->assertEquals($msg, $params['message']); - $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); - } + $this->assertEquals($msg, $params['message']); + $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); + } } diff --git a/tests/unit/controller/FolderApiControllerTest.php b/tests/unit/controller/FolderApiControllerTest.php index 22e038e16..c0371661a 100644 --- a/tests/unit/controller/FolderApiControllerTest.php +++ b/tests/unit/controller/FolderApiControllerTest.php @@ -27,209 +27,209 @@ use \OCA\News\Db\Item; class FolderApiControllerTest extends \PHPUnit_Framework_TestCase { - private $folderService; - private $itemService; - private $folderAPI; - private $appName; - private $user; - private $request; - private $msg; - - protected function setUp() { - $this->appName = 'news'; - $this->user = 'tom'; - $this->request = $this->getMockBuilder( - '\OCP\IRequest') - ->disableOriginalConstructor() - ->getMock(); - $this->folderService = $this->getMockBuilder( - '\OCA\News\Service\FolderService') - ->disableOriginalConstructor() - ->getMock(); - $this->itemService = $this->getMockBuilder( - '\OCA\News\Service\ItemService') - ->disableOriginalConstructor() - ->getMock(); - $this->folderAPI = new FolderApiController( - $this->appName, - $this->request, - $this->folderService, - $this->itemService, - $this->user - ); - $this->msg = 'test'; - } - - - public function testIndex() { - $folders = [new Folder()]; - - $this->folderService->expects($this->once()) - ->method('findAll') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($folders)); - - $response = $this->folderAPI->index(); - - $this->assertEquals([ - 'folders' => [$folders[0]->toAPI()] - ], $response); - } - - - public function testCreate() { - $folderName = 'test'; - $folder = new Folder(); - $folder->setName($folderName); - - $this->folderService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->folderService->expects($this->once()) - ->method('create') - ->with($this->equalTo($folderName), $this->equalTo($this->user)) - ->will($this->returnValue($folder)); - - $response = $this->folderAPI->create($folderName); - - $this->assertEquals([ - 'folders' => [$folder->toAPI()] - ], $response); - } - + private $folderService; + private $itemService; + private $folderAPI; + private $appName; + private $user; + private $request; + private $msg; + + protected function setUp() { + $this->appName = 'news'; + $this->user = 'tom'; + $this->request = $this->getMockBuilder( + '\OCP\IRequest') + ->disableOriginalConstructor() + ->getMock(); + $this->folderService = $this->getMockBuilder( + '\OCA\News\Service\FolderService') + ->disableOriginalConstructor() + ->getMock(); + $this->itemService = $this->getMockBuilder( + '\OCA\News\Service\ItemService') + ->disableOriginalConstructor() + ->getMock(); + $this->folderAPI = new FolderApiController( + $this->appName, + $this->request, + $this->folderService, + $this->itemService, + $this->user + ); + $this->msg = 'test'; + } + + + public function testIndex() { + $folders = [new Folder()]; + + $this->folderService->expects($this->once()) + ->method('findAll') + ->with($this->equalTo($this->user)) + ->will($this->returnValue($folders)); + + $response = $this->folderAPI->index(); + + $this->assertEquals([ + 'folders' => [$folders[0]->toAPI()] + ], $response); + } + + + public function testCreate() { + $folderName = 'test'; + $folder = new Folder(); + $folder->setName($folderName); + + $this->folderService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->folderService->expects($this->once()) + ->method('create') + ->with($this->equalTo($folderName), $this->equalTo($this->user)) + ->will($this->returnValue($folder)); + + $response = $this->folderAPI->create($folderName); + + $this->assertEquals([ + 'folders' => [$folder->toAPI()] + ], $response); + } + - public function testCreateAlreadyExists() { - $msg = 'exists'; - - $this->folderService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->folderService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceConflictException($msg))); + public function testCreateAlreadyExists() { + $msg = 'exists'; + + $this->folderService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->folderService->expects($this->once()) + ->method('create') + ->will($this->throwException(new ServiceConflictException($msg))); - $response = $this->folderAPI->create('hi'); + $response = $this->folderAPI->create('hi'); - $data = $response->getData(); - $this->assertEquals($msg, $data['message']); - $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($msg, $data['message']); + $this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus()); + } - public function testCreateInvalidFolderName() { - $msg = 'exists'; + public function testCreateInvalidFolderName() { + $msg = 'exists'; - $this->folderService->expects($this->once()) - ->method('purgeDeleted') - ->with($this->equalTo($this->user), $this->equalTo(false)); - $this->folderService->expects($this->once()) - ->method('create') - ->will($this->throwException(new ServiceValidationException($msg))); + $this->folderService->expects($this->once()) + ->method('purgeDeleted') + ->with($this->equalTo($this->user), $this->equalTo(false)); + $this->folderService->expects($this->once()) + ->method('create') + ->will($this->throwException(new ServiceValidationException($msg))); - $response = $this->folderAPI->create('hi'); + $response = $this->folderAPI->create('hi'); - $data = $response->getData(); - $this->assertEquals($msg, $data['message']); - $this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($msg, $data['message']); + $this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus()); + } - public function testDelete() { - $folderId = 23; - $this->folderService->expects($this->once()) - ->method('delete') - ->with($this->equalTo($folderId), $this->equalTo($this->user)); + public function testDelete() { + $folderId = 23; + $this->folderService->expects($this->once()) + ->method('delete') + ->with($this->equalTo($folderId), $this->equalTo($this->user)); - $this->folderAPI->delete(23); - } + $this->folderAPI->delete(23); + } - public function testDeleteDoesNotExist() { - $folderId = 23; + public function testDeleteDoesNotExist() { + $folderId = 23; - $this->folderService->expects($this->once()) - ->method('delete') - ->will($this->throwException(new ServiceNotFoundException($this->msg))); + $this->folderService->expects($this->once()) + ->method('delete') + ->will($this->throwException(new ServiceNotFoundException($this->msg))); - $response = $this->folderAPI->delete($folderId); + $response = $this->folderAPI->delete($folderId); - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); + } - public function testUpdate() { - $folderId = 23; - $folderName = 'test'; + public function testUpdate() { + $folderId = 23; + $folderName = 'test'; - $this->folderService->expects($this->once()) - ->method('rename') - ->with($this->equalTo($folderId), - $this->equalTo($folderName), - $this->equalTo($this->user)); + $this->folderService->expects($this->once()) + ->method('rename') + ->with($this->equalTo($folderId), + $this->equalTo($folderName), + $this->equalTo($this->user)); - $this->folderAPI->update($folderId, $folderName); - } + $this->folderAPI->update($folderId, $folderName); + } - public function testUpdateDoesNotExist() { - $folderId = 23; - $folderName = 'test'; + public function testUpdateDoesNotExist() { + $folderId = 23; + $folderName = 'test'; - $this->folderService->expects($this->once()) - ->method('rename') - ->will($this->throwException(new ServiceNotFoundException($this->msg))); + $this->folderService->expects($this->once()) + ->method('rename') + ->will($this->throwException(new ServiceNotFoundException($this->msg))); - $response = $this->folderAPI->update($folderId, $folderName); + $response = $this->folderAPI->update($folderId, $folderName); - $data = $response->getData(); - $this->assertEquals($this->msg, $data['message']); - $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); - } + $data = $response->getData(); + $this->assertEquals($this->msg, $data['message']); + $this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus()); + } - public function testUpdateExists() { - $folderId = 23; - $folderName = 'test'; + public function testUpdateExists() { + $folderId = 23; + $fo