- - t('Maximum feed page size')); ?> - -
- - t( - 'Maximum feed size in bytes. If the RSS/Atom page is ' . - 'bigger than this value, the update will be aborted.' - )); ?> - -
diff --git a/tests/Integration/Db/FeedMapperTest.php b/tests/Integration/Db/FeedMapperTest.php index 3d1ea71f4f..626b8f9a99 100644 --- a/tests/Integration/Db/FeedMapperTest.php +++ b/tests/Integration/Db/FeedMapperTest.php @@ -20,7 +20,7 @@ class FeedMapperTest extends IntegrationTest { - public function testFind() + public function testFind() { $feed = new FeedFixture(); $feed = $this->feedMapper->insert($feed); @@ -31,16 +31,14 @@ public function testFind() $this->assertEquals($feed->getLink(), $fetched->getLink()); } - /** - * @expectedException OCP\AppFramework\Db\DoesNotExistException - */ - public function testFindNotExisting() + public function testFindNotExisting() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->feedMapper->find(0, $this->user); } - public function testFindAll() + public function testFindAll() { $feeds = [ [ @@ -56,23 +54,23 @@ public function testFindAll() $fetched = $this->feedMapper->findAll(); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(2, $fetched); $this->assertContainsOnlyInstancesOf(Feed::class, $fetched); $this->tearDownUser('john'); } - public function testFindAllEmpty() + public function testFindAllEmpty() { $feeds = $this->feedMapper->findAll(); - $this->assertInternalType('array', $feeds); + $this->assertIsArray($feeds); $this->assertCount(0, $feeds); } - public function testFindAllFromUser() + public function testFindAllFromUser() { $feeds = [ [ @@ -88,7 +86,7 @@ public function testFindAllFromUser() $fetched = $this->feedMapper->findAllFromUser($this->user); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(1, $fetched); $this->assertContainsOnlyInstancesOf(Feed::class, $fetched); @@ -96,16 +94,16 @@ public function testFindAllFromUser() } - public function testFindAllFromUserNotExisting() + public function testFindAllFromUserNotExisting() { $fetched = $this->feedMapper->findAllFromUser('notexistinguser'); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(0, $fetched); } - public function testFindByUrlHash() + public function testFindByUrlHash() { $feed = new FeedFixture( [ @@ -124,8 +122,9 @@ public function testFindByUrlHash() /** * @expectedException OCP\AppFramework\Db\MultipleObjectsReturnedException */ - public function testFindByUrlHashMoreThanOneResult() + public function testFindByUrlHashMoreThanOneResult() { + $this->expectException('OCP\AppFramework\Db\MultipleObjectsReturnedException'); $feed1 = $this->feedMapper->insert( new FeedFixture( [ @@ -148,13 +147,14 @@ public function testFindByUrlHashMoreThanOneResult() /** * @expectedException OCP\AppFramework\Db\DoesNotExistException */ - public function testFindByUrlHashNotExisting() + public function testFindByUrlHashNotExisting() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->feedMapper->findByUrlHash('some random hash', $this->user); } - public function testDelete() + public function testDelete() { $this->loadFixtures('default'); @@ -178,7 +178,7 @@ public function testDelete() $this->assertCount(0, $items); } - public function testGetToDelete() + public function testGetToDelete() { $this->loadFeedFixtures( [ @@ -191,14 +191,14 @@ public function testGetToDelete() $fetched = $this->feedMapper->getToDelete(); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(3, $fetched); $this->assertContainsOnlyInstancesOf(Feed::class, $fetched); $this->tearDownUser('john'); } - public function testGetToDeleteOlderThan() + public function testGetToDeleteOlderThan() { $this->loadFeedFixtures( [ @@ -211,14 +211,14 @@ public function testGetToDeleteOlderThan() $fetched = $this->feedMapper->getToDelete(1000); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(2, $fetched); $this->assertContainsOnlyInstancesOf(Feed::class, $fetched); $this->tearDownUser('john'); } - public function testGetToDeleteUser() + public function testGetToDeleteUser() { $this->loadFeedFixtures( [ @@ -231,22 +231,22 @@ public function testGetToDeleteUser() $fetched = $this->feedMapper->getToDelete(2000, $this->user); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(2, $fetched); $this->assertContainsOnlyInstancesOf(Feed::class, $fetched); $this->tearDownUser('john'); } - public function testGetToDeleteEmpty() + public function testGetToDeleteEmpty() { $fetched = $this->feedMapper->getToDelete(); - $this->assertInternalType('array', $fetched); + $this->assertIsArray($fetched); $this->assertCount(0, $fetched); } - public function testDeleteUser() + public function testDeleteUser() { $this->loadFixtures('default'); @@ -263,7 +263,10 @@ public function testDeleteUser() $this->assertCount(0, $items); } - public function testDeleteUserNotExisting() + /** + * @coversNothing + */ + public function testDeleteUserNotExisting() { $this->feedMapper->deleteUser('notexistinguser'); } diff --git a/tests/Integration/Db/FolderMapperTest.php b/tests/Integration/Db/FolderMapperTest.php deleted file mode 100644 index 889ac3e7c1..0000000000 --- a/tests/Integration/Db/FolderMapperTest.php +++ /dev/null @@ -1,53 +0,0 @@ - - * @copyright Bernhard Posselt 2015 - */ - -namespace OCA\News\Tests\Integration\Db; - -use OCA\News\Tests\Integration\IntegrationTest; - -class FolderMapperTest extends IntegrationTest -{ - - - public function testFind() - { - - } - - - /* TBD - public function testFindByName () { - - } - - - public function testFindAllFromUser () { - - } - - - public function testDelete () { - - } - - - public function testGetToDelete () { - - } - - - public function testDeleteUser () { - - }*/ - - - -} diff --git a/tests/Integration/Db/ItemMapperTest.php b/tests/Integration/Db/ItemMapperTest.php index e510aab964..026834e6b1 100644 --- a/tests/Integration/Db/ItemMapperTest.php +++ b/tests/Integration/Db/ItemMapperTest.php @@ -18,7 +18,7 @@ class ItemMapperTest extends IntegrationTest { - public function testFind() + public function testFind() { $feed = new FeedFixture(); $feed = $this->feedMapper->insert($feed); @@ -38,7 +38,7 @@ public function testFind() * @param $title * @return mixed */ - private function whereTitleId($title) + private function whereTitleId($title) { return $this->findItemByTitle($title)->getId(); } @@ -46,8 +46,9 @@ private function whereTitleId($title) /** * @expectedException OCP\AppFramework\Db\DoesNotExistException */ - public function testFindNotFoundWhenDeletedFeed() + public function testFindNotFoundWhenDeletedFeed() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->loadFixtures('default'); $id = $this->whereTitleId('not found feed'); @@ -58,8 +59,9 @@ public function testFindNotFoundWhenDeletedFeed() /** * @expectedException OCP\AppFramework\Db\DoesNotExistException */ - public function testFindNotFoundWhenDeletedFolder() + public function testFindNotFoundWhenDeletedFolder() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->loadFixtures('default'); @@ -68,7 +70,7 @@ public function testFindNotFoundWhenDeletedFolder() } - private function deleteReadOlderThanThreshold() + private function deleteReadOlderThanThreshold() { $this->loadFixtures('default'); @@ -84,8 +86,9 @@ private function deleteReadOlderThanThreshold() /** * @expectedException OCP\AppFramework\Db\DoesNotExistException */ - public function testDeleteOlderThanThresholdOne() + public function testDeleteOlderThanThresholdOne() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->loadFixtures('default'); $id = $this->whereTitleId('del1'); @@ -97,8 +100,9 @@ public function testDeleteOlderThanThresholdOne() /** * @expectedException OCP\AppFramework\Db\DoesNotExistException */ - public function testDeleteOlderThanThresholdTwo() + public function testDeleteOlderThanThresholdTwo() { + $this->expectException('OCP\AppFramework\Db\DoesNotExistException'); $this->loadFixtures('default'); $id = $this->whereTitleId('del2'); @@ -108,7 +112,7 @@ public function testDeleteOlderThanThresholdTwo() } - public function testStarredCount() + public function testStarredCount() { $this->loadFixtures('default'); @@ -117,7 +121,7 @@ public function testStarredCount() } - public function testReadAll() + public function testReadAll() { $this->loadFixtures('default'); @@ -146,7 +150,7 @@ public function testReadAll() } - public function testReadFolder() + public function testReadFolder() { $this->loadFixtures('default'); @@ -178,7 +182,7 @@ public function testReadFolder() } - public function testReadFeed() + public function testReadFeed() { $this->loadFixtures('default'); @@ -209,7 +213,7 @@ public function testReadFeed() } - public function testDeleteUser() + public function testDeleteUser() { $this->loadFixtures('default'); @@ -219,7 +223,7 @@ public function testDeleteUser() $this->assertEquals(0, $id); } - public function testGetNewestItemId() + public function testGetNewestItemId() { $this->loadFixtures('default'); @@ -229,7 +233,7 @@ public function testGetNewestItemId() $this->assertEquals($itemId, $id); } - public function testFindAllUnreadOrStarred() + public function testFindAllUnreadOrStarred() { $this->loadFixtures('default'); @@ -238,7 +242,7 @@ public function testFindAllUnreadOrStarred() } - public function testReadItem() + public function testReadItem() { $this->loadFixtures('readitem'); // assert that all items are unread @@ -277,7 +281,7 @@ public function testReadItem() } } - public function testUnreadItem() + public function testUnreadItem() { $this->loadFixtures('readitem'); // unread an item diff --git a/tests/Unit/Config/ConfigTest.php b/tests/Unit/Config/ConfigTest.php deleted file mode 100644 index 60a292afc3..0000000000 --- a/tests/Unit/Config/ConfigTest.php +++ /dev/null @@ -1,261 +0,0 @@ - - * @author Bernhard Posselt - * @copyright 2012 Alessandro Cosentino - * @copyright 2012-2014 Bernhard Posselt - */ - -namespace OCA\News\Tests\Unit\Config; - -use OCA\News\Config\Config; -use OCP\Files\File; -use OCP\Files\Folder; -use OCP\ILogger; -use PHPUnit\Framework\TestCase; - -class ConfigTest extends TestCase -{ - - private $fileSystem; - private $config; - private $configPath; - private $loggerParams; - - public function setUp() - { - $this->logger = $this->getMockBuilder('OCA\News\Utility\PsrLogger') - ->disableOriginalConstructor() - ->getMock(); - $this->fileSystem = $this->getMockBuilder(Folder::class)->getMock(); - $this->loggerParams = ['hi']; - $this->config = new Config( - $this->fileSystem, - $this->logger, - $this->loggerParams - ); - $this->configPath = 'config.json'; - } - - - public function testDefaults() - { - $this->assertEquals(60, $this->config->getAutoPurgeMinimumInterval()); - $this->assertEquals(200, $this->config->getAutoPurgeCount()); - $this->assertEquals(10, $this->config->getMaxRedirects()); - $this->assertEquals(60, $this->config->getFeedFetcherTimeout()); - $this->assertEquals(3600, $this->config->getUpdateInterval()); - $this->assertEquals(true, $this->config->getUseCronUpdates()); - $this->assertEquals('', $this->config->getExploreUrl()); - $this->assertEquals(1024*1024*100, $this->config->getMaxSize()); - } - - - public function testRead() - { - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('getContent') - ->will( - $this->returnValue( - 'autoPurgeCount = 3' . "\n" . 'useCronUpdates = true' - ) - ); - - - $this->config->read($this->configPath); - - $this->assertSame(3, $this->config->getAutoPurgeCount()); - $this->assertSame(true, $this->config->getUseCronUpdates()); - } - - - public function testReadIgnoresVeryLowPurgeInterval() - { - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('getContent') - ->will($this->returnValue('autoPurgeMinimumInterval = 59')); - - $this->config->read($this->configPath); - - $this->assertSame(60, $this->config->getAutoPurgeMinimumInterval()); - } - - - - public function testReadBool() - { - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('getContent') - ->will( - $this->returnValue( - 'autoPurgeCount = 3' . "\n" . 'useCronUpdates = false' - ) - ); - - $this->config->read($this->configPath); - - $this->assertSame(3, $this->config->getAutoPurgeCount()); - $this->assertSame(false, $this->config->getUseCronUpdates()); - } - - - public function testReadLogsInvalidValue() - { - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('getContent') - ->will($this->returnValue('autoPurgeCounts = 3')); - $this->logger->expects($this->once()) - ->method('warning') - ->with( - $this->equalTo( - 'Configuration value "autoPurgeCounts" ' . - 'does not exist. Ignored value.' - ), - $this->equalTo($this->loggerParams) - ); - - $this->config->read($this->configPath); - } - - - public function testReadLogsInvalidINI() - { - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('getContent') - ->will($this->returnValue('')); - $this->logger->expects($this->once()) - ->method('warning') - ->with( - $this->equalTo('Configuration invalid. Ignoring values.'), - $this->equalTo($this->loggerParams) - ); - - $this->config->read($this->configPath); - } - - - public function testWrite() - { - $json = 'autoPurgeMinimumInterval = 60' . "\n" . - 'autoPurgeCount = 3' . "\n" . - 'maxRedirects = 10' . "\n" . - 'maxSize = 399' . "\n" . - 'exploreUrl = http://google.de' . "\n" . - 'feedFetcherTimeout = 60' . "\n" . - 'updateInterval = 3600' . "\n" . - 'useCronUpdates = true'; - $this->config->setAutoPurgeCount(3); - $this->config->setMaxSize(399); - $this->config->setExploreUrl('http://google.de'); - - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('putContent') - ->with($this->equalTo($json)); - - $this->config->write($this->configPath); - } - - - - public function testReadingNonExistentConfigWillWriteDefaults() - { - $this->fileSystem->expects($this->once()) - ->method('nodeExists') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue(false)); - - $this->config->setUseCronUpdates(false); - - $json = 'autoPurgeMinimumInterval = 60' . "\n" . - 'autoPurgeCount = 200' . "\n" . - 'maxRedirects = 10' . "\n" . - 'maxSize = 104857600' . "\n" . - 'exploreUrl = ' . "\n" . - 'feedFetcherTimeout = 60' . "\n" . - 'updateInterval = 3600' . "\n" . - 'useCronUpdates = false'; - - $this->fileSystem->expects($this->once()) - ->method('newFile') - ->with($this->equalTo($this->configPath)); - $file = $this->getMockBuilder(File::class)->getMock(); - $this->fileSystem->expects($this->once()) - ->method('get') - ->with($this->equalTo($this->configPath)) - ->will($this->returnValue($file)); - $file->expects($this->once()) - ->method('putContent') - ->with($this->equalTo($json)); - - $this->config->read($this->configPath, true); - } - - - public function testNoLowMinimumAutoPurgeInterval() - { - $this->config->setAutoPurgeMinimumInterval(59); - $interval = $this->config->getAutoPurgeMinimumInterval(); - - $this->assertSame(60, $interval); - } - - - public function testMinimumAutoPurgeInterval() - { - $this->config->setAutoPurgeMinimumInterval(61); - $interval = $this->config->getAutoPurgeMinimumInterval(); - - $this->assertSame(61, $interval); - } - - public function testMaxRedirects() - { - $this->config->setMaxRedirects(21); - $redirects = $this->config->getMaxRedirects(); - - $this->assertSame(21, $redirects); - } - - public function testFeedFetcherTimeout() - { - $this->config->setFeedFetcherTimeout(2); - $timout = $this->config->getFeedFetcherTimeout(); - - $this->assertSame(2, $timout); - } -} diff --git a/tests/Unit/Controller/AdminControllerTest.php b/tests/Unit/Controller/AdminControllerTest.php index b0b5510068..81490bb6fa 100644 --- a/tests/Unit/Controller/AdminControllerTest.php +++ b/tests/Unit/Controller/AdminControllerTest.php @@ -13,82 +13,84 @@ namespace OCA\News\Tests\Unit\Controller; -use OCA\News\Config\Config; use OCA\News\Controller\AdminController; use OCA\News\Service\ItemService; +use OCP\IConfig; use OCP\IRequest; use PHPUnit\Framework\TestCase; class AdminControllerTest extends TestCase { - + /** + * @var string + */ private $appName; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IRequest + */ private $request; + + /** + * @var AdminController + */ private $controller; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IConfig + */ private $config; - private $configPath; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|ItemService + */ private $itemService; /** * Gets run before each test */ - public function setUp() + public function setUp(): void { $this->appName = 'news'; $this->request = $this->getMockBuilder(IRequest::class) ->disableOriginalConstructor() ->getMock(); - $this->config = $this->getMockBuilder(Config::class) + $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); $this->itemService = $this->getMockBuilder(ItemService::class) ->disableOriginalConstructor() ->getMock(); - $this->configPath = 'my.ini'; - $this->controller = new AdminController( - $this->appName, $this->request, - $this->config, $this->itemService, $this->configPath - ); + $this->controller = new AdminController($this->appName, $this->request, $this->config, $this->itemService); } - - public function testIndex() + /** + * Test \OCA\News\Controller\AdminController::index + */ + public function testIndex() { $expected = [ 'autoPurgeMinimumInterval' => 1, 'autoPurgeCount' => 2, 'maxRedirects' => 3, 'feedFetcherTimeout' => 4, - 'useCronUpdates' => 5, - 'maxSize' => 7, + 'useCronUpdates' => false, 'exploreUrl' => 'test', - 'updateInterval' => 3600 + 'updateInterval' => 3601 ]; - $this->config->expects($this->once()) - ->method('getAutoPurgeMinimumInterval') - ->will($this->returnValue($expected['autoPurgeMinimumInterval'])); - $this->config->expects($this->once()) - ->method('getAutoPurgeCount') - ->will($this->returnValue($expected['autoPurgeCount'])); - $this->config->expects($this->once()) - ->method('getMaxRedirects') - ->will($this->returnValue($expected['maxRedirects'])); - $this->config->expects($this->once()) - ->method('getFeedFetcherTimeout') - ->will($this->returnValue($expected['feedFetcherTimeout'])); - $this->config->expects($this->once()) - ->method('getUseCronUpdates') - ->will($this->returnValue($expected['useCronUpdates'])); - $this->config->expects($this->once()) - ->method('getMaxSize') - ->will($this->returnValue($expected['maxSize'])); - $this->config->expects($this->once()) - ->method('getExploreUrl') - ->will($this->returnValue($expected['exploreUrl'])); - $this->config->expects($this->once()) - ->method('getUpdateInterval') - ->will($this->returnValue($expected['updateInterval'])); + $map = [ + ['news','autoPurgeMinimumInterval', 60, 1], + ['news','autoPurgeCount', 200, 2], + ['news','maxRedirects', 10, 3], + ['news','feedFetcherTimeout', 60, 4], + ['news','useCronUpdates', true, false,], + ['news','exploreUrl', '', 'test'], + ['news','updateInterval', 3600, 3601] + ]; + $this->config->expects($this->exactly(count($map))) + ->method('getAppValue') + ->will($this->returnValueMap($map)); $response = $this->controller->index(); $data = $response->getParams(); @@ -101,75 +103,48 @@ public function testIndex() } - public function testUpdate() + public function testUpdate() { $expected = [ 'autoPurgeMinimumInterval' => 1, 'autoPurgeCount' => 2, 'maxRedirects' => 3, 'feedFetcherTimeout' => 4, - 'useCronUpdates' => 5, - 'maxSize' => 7, + 'useCronUpdates' => false, 'exploreUrl' => 'test', - 'updateInterval' => 3600 + 'updateInterval' => 3601 ]; - $this->config->expects($this->once()) - ->method('setAutoPurgeMinimumInterval') - ->with($this->equalTo($expected['autoPurgeMinimumInterval'])); - $this->config->expects($this->once()) - ->method('setAutoPurgeCount') - ->with($this->equalTo($expected['autoPurgeCount'])); - $this->config->expects($this->once()) - ->method('setMaxRedirects') - ->with($this->equalTo($expected['maxRedirects'])); - $this->config->expects($this->once()) - ->method('setFeedFetcherTimeout') - ->with($this->equalTo($expected['feedFetcherTimeout'])); - $this->config->expects($this->once()) - ->method('setUseCronUpdates') - ->with($this->equalTo($expected['useCronUpdates'])); - $this->config->expects($this->once()) - ->method('setExploreUrl') - ->with($this->equalTo($expected['exploreUrl'])); - $this->config->expects($this->once()) - ->method('setUpdateInterval') - ->with($this->equalTo($expected['updateInterval'])); - $this->config->expects($this->once()) - ->method('write') - ->with($this->equalTo($this->configPath)); - - $this->config->expects($this->once()) - ->method('getAutoPurgeMinimumInterval') - ->will($this->returnValue($expected['autoPurgeMinimumInterval'])); - $this->config->expects($this->once()) - ->method('getAutoPurgeCount') - ->will($this->returnValue($expected['autoPurgeCount'])); - $this->config->expects($this->once()) - ->method('getMaxRedirects') - ->will($this->returnValue($expected['maxRedirects'])); - $this->config->expects($this->once()) - ->method('getFeedFetcherTimeout') - ->will($this->returnValue($expected['feedFetcherTimeout'])); - $this->config->expects($this->once()) - ->method('getUseCronUpdates') - ->will($this->returnValue($expected['useCronUpdates'])); - $this->config->expects($this->once()) - ->method('getMaxSize') - ->will($this->returnValue($expected['maxSize'])); - $this->config->expects($this->once()) - ->method('getExploreUrl') - ->will($this->returnValue($expected['exploreUrl'])); - $this->config->expects($this->once()) - ->method('getUpdateInterval') - ->will($this->returnValue($expected['updateInterval'])); + $this->config->expects($this->exactly(count($expected))) + ->method('setAppValue') + ->withConsecutive( + ['news','autoPurgeMinimumInterval', 1], + ['news','autoPurgeCount', 2], + ['news','maxRedirects', 3], + ['news','feedFetcherTimeout', 4], + ['news','useCronUpdates', false], + ['news','exploreUrl', 'test'], + ['news','updateInterval', 3601] + ); + + $map = [ + ['news','autoPurgeMinimumInterval', 60, 1], + ['news','autoPurgeCount', 200, 2], + ['news','maxRedirects', 10, 3], + ['news','feedFetcherTimeout', 60, 4], + ['news','useCronUpdates', true, false,], + ['news','exploreUrl', '', 'test'], + ['news','updateInterval', 3600, 3601] + ]; + $this->config->expects($this->exactly(count($map))) + ->method('getAppValue') + ->will($this->returnValueMap($map)); $response = $this->controller->update( $expected['autoPurgeMinimumInterval'], $expected['autoPurgeCount'], $expected['maxRedirects'], $expected['feedFetcherTimeout'], - $expected['maxSize'], $expected['useCronUpdates'], $expected['exploreUrl'], $expected['updateInterval'] diff --git a/tests/Unit/Controller/ExportControllerTest.php b/tests/Unit/Controller/ExportControllerTest.php index 84ded5c6f3..94ffa1ed1a 100644 --- a/tests/Unit/Controller/ExportControllerTest.php +++ b/tests/Unit/Controller/ExportControllerTest.php @@ -41,7 +41,7 @@ class ExportControllerTest extends TestCase /** * Gets run before each test */ - public function setUp() + public function setUp(): void { $this->appName = 'news'; $this->user = 'john'; diff --git a/tests/Unit/Controller/FeedApiControllerTest.php b/tests/Unit/Controller/FeedApiControllerTest.php index cc387161d9..c889a54b3e 100644 --- a/tests/Unit/Controller/FeedApiControllerTest.php +++ b/tests/Unit/Controller/FeedApiControllerTest.php @@ -44,7 +44,7 @@ class FeedApiControllerTest extends TestCase private $logger; private $loggerParams; - protected function setUp() + protected function setUp(): void { $this->loggerParams = ['hi']; $this->logger = $this->getMockBuilder(ILogger::class) @@ -85,7 +85,7 @@ protected function setUp() } - public function testIndex() + public function testIndex() { $feeds = [new Feed()]; $starredCount = 3; @@ -116,7 +116,7 @@ public function testIndex() } - public function testIndexNoNewestItemId() + public function testIndexNoNewestItemId() { $feeds = [new Feed()]; $starredCount = 3; @@ -145,7 +145,7 @@ public function testIndexNoNewestItemId() } - public function testDelete() + public function testDelete() { $this->feedService->expects($this->once()) ->method('delete') @@ -158,7 +158,7 @@ public function testDelete() } - public function testDeleteDoesNotExist() + public function testDeleteDoesNotExist() { $this->feedService->expects($this->once()) ->method('delete') @@ -176,7 +176,7 @@ public function testDeleteDoesNotExist() } - public function testCreate() + public function testCreate() { $feeds = [new Feed()]; @@ -206,7 +206,7 @@ public function testCreate() } - public function testCreateNoItems() + public function testCreateNoItems() { $feeds = [new Feed()]; @@ -236,7 +236,7 @@ public function testCreateNoItems() - public function testCreateExists() + public function testCreateExists() { $this->feedService->expects($this->once()) ->method('purgeDeleted') @@ -255,7 +255,7 @@ public function testCreateExists() } - public function testCreateError() + public function testCreateError() { $this->feedService->expects($this->once()) ->method('create') @@ -271,7 +271,7 @@ public function testCreateError() } - public function testRead() + public function testRead() { $this->itemService->expects($this->once()) ->method('readFeed') @@ -285,7 +285,7 @@ public function testRead() } - public function testMove() + public function testMove() { $this->feedService->expects($this->once()) ->method('patch') @@ -299,7 +299,7 @@ public function testMove() } - public function testMoveDoesNotExist() + public function testMoveDoesNotExist() { $this->feedService->expects($this->once()) ->method('patch') @@ -315,7 +315,7 @@ public function testMoveDoesNotExist() } - public function testRename() + public function testRename() { $feedId = 3; $feedTitle = 'test'; @@ -332,7 +332,7 @@ public function testRename() } - public function testRenameError() + public function testRenameError() { $feedId = 3; $feedTitle = 'test'; @@ -370,7 +370,7 @@ public function testfromAllUsers() } - public function testUpdate() + public function testUpdate() { $feedId = 3; $userId = 'hi'; @@ -383,7 +383,7 @@ public function testUpdate() } - public function testUpdateError() + public function testUpdateError() { $feedId = 3; $userId = 'hi'; diff --git a/tests/Unit/Controller/FeedControllerTest.php b/tests/Unit/Controller/FeedControllerTest.php index 4703d307af..9a3114da0d 100644 --- a/tests/Unit/Controller/FeedControllerTest.php +++ b/tests/Unit/Controller/FeedControllerTest.php @@ -45,7 +45,7 @@ class FeedControllerTest extends TestCase /** * Gets run before each test */ - public function setUp() + public function setUp(): void { $this->appName = 'news'; $this->user = 'jack'; @@ -398,7 +398,7 @@ public function testUpdateReturnsJSONError() } - public function testImport() + public function testImport() { $feed = new Feed(); @@ -426,7 +426,7 @@ public function testImport() } - public function testImportCreatesNoAdditionalFeed() + public function testImportCreatesNoAdditionalFeed() { $this->feedService->expects($this->once()) ->method('importArticles') @@ -467,7 +467,7 @@ public function testReadFeed() } - public function testRestore() + public function testRestore() { $this->feedService->expects($this->once()) ->method('unmarkDeleted') @@ -492,7 +492,7 @@ public function testRestoreDoesNotExist() $this->assertEquals($response->getStatus(), Http::STATUS_NOT_FOUND); } - public function testPatch() + public function testPatch() { $expected = [ 'pinned' => true, diff --git a/tests/Unit/Controller/FolderApiControllerTest.php b/tests/Unit/Controller/FolderApiControllerTest.php index 3a93a460a3..311212169e 100644 --- a/tests/Unit/Controller/FolderApiControllerTest.php +++ b/tests/Unit/Controller/FolderApiControllerTest.php @@ -44,7 +44,7 @@ class FolderApiControllerTest extends TestCase private $request; private $msg; - protected function setUp() + protected function setUp(): void { $this->appName = 'news'; $this->request = $this->getMockBuilder(IRequest::class) @@ -79,7 +79,7 @@ protected function setUp() } - public function testIndex() + public function testIndex() { $folders = [new Folder()]; @@ -98,7 +98,7 @@ public function testIndex() } - public function testCreate() + public function testCreate() { $folderName = 'test'; $folder = new Folder(); @@ -122,7 +122,7 @@ public function testCreate() } - public function testCreateAlreadyExists() + public function testCreateAlreadyExists() { $msg = 'exists'; @@ -141,7 +141,7 @@ public function testCreateAlreadyExists() } - public function testCreateInvalidFolderName() + public function testCreateInvalidFolderName() { $msg = 'exists'; @@ -162,7 +162,7 @@ public function testCreateInvalidFolderName() } - public function testDelete() + public function testDelete() { $folderId = 23; $this->folderService->expects($this->once()) @@ -173,7 +173,7 @@ public function testDelete() } - public function testDeleteDoesNotExist() + public function testDeleteDoesNotExist() { $folderId = 23; @@ -193,7 +193,7 @@ public function testDeleteDoesNotExist() } - public function testUpdate() + public function testUpdate() { $folderId = 23; $folderName = 'test'; @@ -209,7 +209,7 @@ public function testUpdate() $this->folderAPI->update($folderId, $folderName); } - public function testUpdateDoesNotExist() + public function testUpdateDoesNotExist() { $folderId = 23; $folderName = 'test'; @@ -230,7 +230,7 @@ public function testUpdateDoesNotExist() } - public function testUpdateExists() + public function testUpdateExists() { $folderId = 23; $folderName = 'test'; @@ -251,7 +251,7 @@ public function testUpdateExists() } - public function testUpdateInvalidFolderName() + public function testUpdateInvalidFolderName() { $folderId = 23; $folderName = ''; @@ -274,7 +274,7 @@ public function testUpdateInvalidFolderName() } - public function testRead() + public function testRead() { $this->itemService->expects($this->once()) ->method('readFolder') diff --git a/tests/Unit/Controller/FolderControllerTest.php b/tests/Unit/Controller/FolderControllerTest.php index b9e0485a4c..abe1ebd7ab 100644 --- a/tests/Unit/Controller/FolderControllerTest.php +++ b/tests/Unit/Controller/FolderControllerTest.php @@ -44,7 +44,7 @@ class FolderControllerTest extends TestCase /** * Gets run before each test */ - public function setUp() + public function setUp(): void { $this->appName = 'news'; $this->user = 'jack'; diff --git a/tests/Unit/Controller/ItemApiControllerTest.php b/tests/Unit/Controller/ItemApiControllerTest.php index 5733a0c871..412b9dd517 100644 --- a/tests/Unit/Controller/ItemApiControllerTest.php +++ b/tests/Unit/Controller/ItemApiControllerTest.php @@ -39,7 +39,7 @@ class ItemApiControllerTest extends TestCase private $request; private $msg; - protected function setUp() + protected function setUp(): void { $this->user = 'tom'; $this->appName = 'news'; @@ -71,7 +71,7 @@ protected function setUp() } - public function testIndex() + public function testIndex() { $item = new Item(); $item->setId(5); @@ -102,7 +102,7 @@ public function testIndex() } - public function testIndexDefaultBatchSize() + public function testIndexDefaultBatchSize() { $item = new Item(); $item->setId(5); @@ -133,7 +133,7 @@ public function testIndexDefaultBatchSize() } - public function testUpdated() + public function testUpdated() { $item = new Item(); $item->setId(5); @@ -162,7 +162,7 @@ public function testUpdated() } - public function testRead() + public function testRead() { $this->itemService->expects($this->once()) ->method('read') @@ -176,7 +176,7 @@ public function testRead() } - public function testReadDoesNotExist() + public function testReadDoesNotExist() { $this->itemService->expects($this->once()) ->method('read') @@ -194,7 +194,7 @@ public function testReadDoesNotExist() } - public function testUnread() + public function testUnread() { $this->itemService->expects($this->once()) ->method('read') @@ -208,7 +208,7 @@ public function testUnread() } - public function testUnreadDoesNotExist() + public function testUnreadDoesNotExist() { $this->itemService->expects($this->once()) ->method('read') @@ -226,7 +226,7 @@ public function testUnreadDoesNotExist() } - public function testStar() + public function testStar() { $this->itemService->expects($this->once()) ->method('star') @@ -241,7 +241,7 @@ public function testStar() } - public function testStarDoesNotExist() + public function testStarDoesNotExist() { $this->itemService->expects($this->once()) ->method('star') @@ -259,7 +259,7 @@ public function testStarDoesNotExist() } - public function testUnstar() + public function testUnstar() { $this->itemService->expects($this->once()) ->method('star') @@ -274,7 +274,7 @@ public function testUnstar() } - public function testUnstarDoesNotExist() + public function testUnstarDoesNotExist() { $this->itemService->expects($this->once()) ->method('star') @@ -292,7 +292,7 @@ public function testUnstarDoesNotExist() } - public function testReadAll() + public function testReadAll() { $this->itemService->expects($this->once()) ->method('readAll') @@ -306,7 +306,7 @@ public function testReadAll() - public function testReadMultiple() + public function testReadMultiple() { $this->itemService->expects($this->at(0)) ->method('read') @@ -326,7 +326,7 @@ public function testReadMultiple() } - public function testReadMultipleDoesntCareAboutException() + public function testReadMultipleDoesntCareAboutException() { $this->itemService->expects($this->at(0)) ->method('read') @@ -342,7 +342,7 @@ public function testReadMultipleDoesntCareAboutException() } - public function testUnreadMultiple() + public function testUnreadMultiple() { $this->itemService->expects($this->at(0)) ->method('read') @@ -362,7 +362,7 @@ public function testUnreadMultiple() } - public function testStarMultiple() + public function testStarMultiple() { $ids = [ [ @@ -395,7 +395,7 @@ public function testStarMultiple() } - public function testStarMultipleDoesntCareAboutException() + public function testStarMultipleDoesntCareAboutException() { $ids = [ [ @@ -423,7 +423,7 @@ public function testStarMultipleDoesntCareAboutException() } - public function testUnstarMultiple() + public function testUnstarMultiple() { $ids = [ [ diff --git a/tests/Unit/Controller/ItemControllerTest.php b/tests/Unit/Controller/ItemControllerTest.php index b24d741487..9dbcf15ce8 100644 --- a/tests/Unit/Controller/ItemControllerTest.php +++ b/tests/Unit/Controller/ItemControllerTest.php @@ -43,7 +43,7 @@ class ItemControllerTest extends TestCase /** * Gets run before each test */ - public function setUp() + public function setUp(): void { $this->appName = 'news'; $this->user = 'jackob'; @@ -96,7 +96,7 @@ public function testReadDoesNotExist() } - public function testReadMultiple() + public function testReadMultiple() { $this->itemService->expects($this->at(0)) ->method('read') @@ -116,7 +116,7 @@ public function testReadMultiple() } - public function testReadMultipleDontStopOnException() + public function testReadMultipleDontStopOnException() { $this->itemService->expects($this->at(0)) ->method('read') diff --git a/tests/Unit/Controller/JSONHttpErrorTest.php b/tests/Unit/Controller/JSONHttpErrorTest.php index bf043bf547..c02b60c9e3 100644 --- a/tests/Unit/Controller/JSONHttpErrorTest.php +++ b/tests/Unit/Controller/JSONHttpErrorTest.php @@ -26,7 +26,7 @@ class JSONHttpErrorTest extends TestCase { - public function testError() + public function testError() { $ex = new \Exception('hi'); $test = new Test(); diff --git a/tests/Unit/Controller/PageControllerTest.php b/tests/Unit/Controller/PageControllerTest.php index ce7a3e73d0..69fed0d77b 100644 --- a/tests/Unit/Controller/PageControllerTest.php +++ b/tests/Unit/Controller/PageControllerTest.php @@ -13,7 +13,7 @@ namespace OCA\News\Tests\Unit\Controller; -use OCA\News\Config\Config; +use OC\L10N\L10N; use OCA\News\Controller\PageController; use \OCA\News\Db\FeedType; use OCA\News\Explore\RecommendedSites; @@ -28,26 +28,51 @@ class PageControllerTest extends TestCase { + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IConfig + */ private $settings; - private $appName; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IRequest + */ private $request; + + /** + * @var PageController + */ private $controller; - private $user; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|L10N + */ private $l10n; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IURLGenerator + */ private $urlGenerator; - private $appConfig; + + /** + * @var array + */ private $configData; - private $config; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|RecommendedSites + */ private $recommended; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|StatusService + */ private $status; /** * Gets run before each test */ - public function setUp() + public function setUp(): void { - $this->appName = 'news'; - $this->user = 'becka'; $this->configData = [ 'name' => 'AppTest', 'id' => 'apptest', @@ -70,12 +95,6 @@ public function setUp() $this->urlGenerator = $this->getMockBuilder(IURLGenerator::class) ->disableOriginalConstructor() ->getMock(); - $this->appConfig = $this->getMockBuilder(Config::class) - ->disableOriginalConstructor() - ->getMock(); - $this->config = $this->getMockBuilder(Config::class) - ->disableOriginalConstructor() - ->getMock(); $this->recommended = $this->getMockBuilder(RecommendedSites::class) ->disableOriginalConstructor() ->getMock(); @@ -83,10 +102,14 @@ public function setUp() ->disableOriginalConstructor() ->getMock(); $this->controller = new PageController( - $this->appName, $this->request, - $this->settings, $this->urlGenerator, $this->config, - $this->l10n, $this->recommended, $this->status, - $this->user + 'news', + $this->request, + $this->settings, + $this->urlGenerator, + $this->l10n, + $this->recommended, + $this->status, + 'becka' ); } @@ -95,15 +118,7 @@ public function testIndex() { $this->status->expects($this->once()) ->method('getStatus') - ->will( - $this->returnValue( - [ - 'warnings' => [ - 'improperlyConfiguredCron' => false - ] - ] - ) - ); + ->will($this->returnValue(['warnings' => ['improperlyConfiguredCron' => false]])); $response = $this->controller->index(); $this->assertEquals('index', $response->getTemplateName()); @@ -130,8 +145,10 @@ public function testIndexNoCorrectCronAjax() $this->assertEquals(true, $response->getParams()['warnings']['improperlyConfiguredCron']); } - - public function testSettings() + /** + * @covers \OCA\News\Controller\PageController::settings + */ + public function testSettings() { $result = [ 'settings' => [ @@ -148,55 +165,23 @@ public function testSettings() $this->l10n->expects($this->once()) ->method('getLanguageCode') ->will($this->returnValue('de')); - $this->settings->expects($this->at(0)) + $this->settings->expects($this->exactly(5)) ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('showAll') + ->withConsecutive( + ['becka', 'news', 'showAll'], + ['becka', 'news', 'compact'], + ['becka', 'news', 'preventReadOnScroll'], + ['becka', 'news', 'oldestFirst'], + ['becka', 'news', 'compactExpand'] ) ->will($this->returnValue('1')); - $this->settings->expects($this->at(1)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compact') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(2)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('preventReadOnScroll') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(3)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('oldestFirst') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(4)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compactExpand') - ) - ->will($this->returnValue('1')); - $this->config->expects($this->once()) - ->method('getExploreUrl') + $this->settings->expects($this->once()) + ->method('getAppValue') + ->with('news', 'exploreUrl') ->will($this->returnValue(' ')); $this->urlGenerator->expects($this->once()) ->method('linkToRoute') - ->with( - $this->equalTo('news.page.explore'), - $this->equalTo(['lang' => 'en']) - ) + ->with('news.page.explore', ['lang' => 'en']) ->will($this->returnValue('test')); @@ -205,7 +190,7 @@ public function testSettings() } - public function testSettingsExploreUrlSet() + public function testSettingsExploreUrlSet() { $result = [ 'settings' => [ @@ -222,48 +207,19 @@ public function testSettingsExploreUrlSet() $this->l10n->expects($this->once()) ->method('getLanguageCode') ->will($this->returnValue('de')); - $this->settings->expects($this->at(0)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('showAll') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(1)) + $this->settings->expects($this->exactly(5)) ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compact') + ->withConsecutive( + ['becka', 'news', 'showAll'], + ['becka', 'news', 'compact'], + ['becka', 'news', 'preventReadOnScroll'], + ['becka', 'news', 'oldestFirst'], + ['becka', 'news', 'compactExpand'] ) ->will($this->returnValue('1')); - $this->settings->expects($this->at(2)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('preventReadOnScroll') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(3)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('oldestFirst') - ) - ->will($this->returnValue('1')); - $this->settings->expects($this->at(4)) - ->method('getUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compactExpand') - ) - ->will($this->returnValue('1')); - $this->config->expects($this->once()) - ->method('getExploreUrl') + $this->settings->expects($this->once()) + ->method('getAppValue') + ->with('news', 'exploreUrl') ->will($this->returnValue('abc')); $this->urlGenerator->expects($this->never()) ->method('getAbsoluteURL'); @@ -273,83 +229,50 @@ public function testSettingsExploreUrlSet() $this->assertEquals($result, $response); } - public function testUpdateSettings() + /** + * @covers \OCA\News\Controller\PageController::updateSettings + */ + public function testUpdateSettings() { $this->settings->expects($this->at(0)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('showAll'), - $this->equalTo('1') - ); + ->with('becka', 'news', 'showAll', '1'); $this->settings->expects($this->at(1)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compact'), - $this->equalTo('1') - ); + ->with('becka', 'news', 'compact', '1'); $this->settings->expects($this->at(2)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('preventReadOnScroll'), - $this->equalTo('0') - ); + ->with('becka', 'news', 'preventReadOnScroll', '0'); $this->settings->expects($this->at(3)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('oldestFirst'), - $this->equalTo('1') - ); + ->with('becka', 'news', 'oldestFirst', '1'); $this->settings->expects($this->at(4)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('compactExpand'), - $this->equalTo('1') - ); - $this->controller->updateSettings(true, true, false, true, true); + ->with('becka', 'news', 'compactExpand', '1'); + $this->controller->updateSettings(true, true, false, true, true); } - public function testExplore() { $in = 'test'; $this->settings->expects($this->at(0)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('lastViewedFeedId'), - $this->equalTo(0) - ); + ->with('becka', 'news', 'lastViewedFeedId', 0); $this->settings->expects($this->at(1)) ->method('setUserValue') - ->with( - $this->equalTo($this->user), - $this->equalTo($this->appName), - $this->equalTo('lastViewedFeedType'), - $this->equalTo(FeedType::EXPLORE) - ); + ->with('becka', 'news', 'lastViewedFeedType', FeedType::EXPLORE); $this->recommended->expects($this->once()) ->method('forLanguage') - ->with($this->equalTo('en')) + ->with('en') ->will($this->returnValue($in)); - $out = $this->controller->explore('en'); $this->assertEquals($in, $out); + } } diff --git a/tests/Unit/Controller/UserApiControllerTest.php b/tests/Unit/Controller/UserApiControllerTest.php index d9df73fe73..dd0140c81e 100644 --- a/tests/Unit/Controller/UserApiControllerTest.php +++ b/tests/Unit/Controller/UserApiControllerTest.php @@ -33,7 +33,7 @@ class UserApiControllerTest extends TestCase private $user; private $file; - protected function setUp() + protected function setUp(): void { $this->appName = 'news'; $this->request = $this->getMockBuilder(IRequest::class) @@ -59,7 +59,7 @@ protected function setUp() } - private function expectUser($uid, $displayName, $lastLogin) + private function expectUser($uid, $displayName, $lastLogin) { $this->userSession->expects($this->any()) ->method('getUser') @@ -75,7 +75,7 @@ private function expectUser($uid, $displayName, $lastLogin) ->will($this->returnValue($displayName)); } - private function expectImg($isJpg, $isPng, $user, $exists, $data) + private function expectImg($isJpg, $isPng, $user, $exists, $data) { $jpg = '/' . $user . '/' . 'avatar.jpg'; $png = '/' . $user . '/' . 'avatar.png'; @@ -98,7 +98,7 @@ private function expectImg($isJpg, $isPng, $user, $exists, $data) ->will($this->returnValue($data)); } - public function testGetJpeg() + public function testGetJpeg() { $this->expectUser('john', 'John', 123); $this->expectImg(true, false, 'john', true, 'hi'); @@ -117,7 +117,7 @@ public function testGetJpeg() $this->assertEquals($expected, $result); } - public function testGetPng() + public function testGetPng() { $this->expectUser('john', 'John', 123); $this->expectImg(false, true, 'john', false, 'hi'); @@ -136,7 +136,7 @@ public function testGetPng() $this->assertEquals($expected, $result); } - public function testNoAvatar() + public function testNoAvatar() { $this->expectUser('john', 'John', 123); $this->expectImg(false, false, 'john', false, 'hi'); diff --git a/tests/Unit/Controller/UtilityApiControllerTest.php b/tests/Unit/Controller/UtilityApiControllerTest.php index 37070b1609..32a66b2e81 100644 --- a/tests/Unit/Controller/UtilityApiControllerTest.php +++ b/tests/Unit/Controller/UtilityApiControllerTest.php @@ -37,7 +37,7 @@ class UtilityApiControllerTest extends TestCase private $appName; private $status; - protected function setUp() + protected function setUp(): void { $this->appName = 'news'; $this->settings = $this->getMockBuilder(IConfig::class) diff --git a/tests/Unit/Db/FolderMapperTest.php b/tests/Unit/Db/FolderMapperTest.php index 11c411b5e6..f8544da650 100644 --- a/tests/Unit/Db/FolderMapperTest.php +++ b/tests/Unit/Db/FolderMapperTest.php @@ -28,7 +28,7 @@ class FolderMapperTest extends MapperTestUtility /** @var string */ private $user; - protected function setUp() + protected function setUp(): void { parent::setUp(); diff --git a/tests/Unit/Db/ItemTest.php b/tests/Unit/Db/ItemTest.php index 6b63f86855..c9a353ea73 100644 --- a/tests/Unit/Db/ItemTest.php +++ b/tests/Unit/Db/ItemTest.php @@ -22,11 +22,11 @@ class ItemTest extends TestCase { /** - * @var Item + * @var Item */ private $item; - protected function setUp() + protected function setUp(): void { $this->item = new Item(); $this->item->setStatus(0); @@ -65,7 +65,7 @@ public function testSetUnstarred() } - public function testToAPI() + public function testToAPI() { $item = new Item(); $item->setId(3); @@ -117,7 +117,7 @@ public function testToAPI() } - public function testJSONSerialize() + public function testJSONSerialize() { $item = new Item(); $item->setId(3); @@ -167,7 +167,7 @@ public function testJSONSerialize() ); } - public function testToExport() + public function testToExport() { $item = new Item(); $item->setId(3); @@ -216,7 +216,7 @@ public function testToExport() } - private function createImportItem($isRead) + private function createImportItem($isRead) { $item = new Item(); $item->setGuid('guid'); @@ -242,7 +242,7 @@ private function createImportItem($isRead) } - public function testSearchIndex() + public function testSearchIndex() { $item = new Item(); $item->setBody('somEthäng'); @@ -255,7 +255,7 @@ public function testSearchIndex() } - public function testFromImport() + public function testFromImport() { $item = $this->createImportItem(false); @@ -282,7 +282,7 @@ public function testFromImport() } - public function testFromImportRead() + public function testFromImportRead() { $item = $this->createImportItem(true); @@ -315,7 +315,7 @@ public function testSetAuthor() $item = new Item(); $item->setAuthor('my link'); $this->assertEquals('my link', $item->getAuthor()); - $this->assertContains('author', $item->getUpdatedFields()); + $this->assertArrayHasKey('author', $item->getUpdatedFields()); } @@ -324,11 +324,11 @@ public function testSetTitle() $item = new Item(); $item->setTitle('my link'); $this->assertEquals('my link', $item->getTitle()); - $this->assertContains('title', $item->getUpdatedFields()); + $this->assertArrayHasKey('title', $item->getUpdatedFields()); } - public function testSetXSSUrl() + public function testSetXSSUrl() { $item = new Item(); $item->setUrl('javascript:alert()'); @@ -336,7 +336,7 @@ public function testSetXSSUrl() } - public function testSetMagnetUrl() + public function testSetMagnetUrl() { $item = new Item(); $item->setUrl('magnet://link.com'); @@ -344,7 +344,7 @@ public function testSetMagnetUrl() } - public function testMakeLinksInBodyOpenNewTab() + public function testMakeLinksInBodyOpenNewTab() { $item = new Item(); $item->setBody("ha"); @@ -354,7 +354,7 @@ public function testMakeLinksInBodyOpenNewTab() ); } - public function testComputeFingerPrint() + public function testComputeFingerPrint() { $title = 'a'; $body = 'b'; diff --git a/tests/Unit/Db/MapperFactoryTest.php b/tests/Unit/Db/MapperFactoryTest.php index 697a62beee..97680e20bb 100644 --- a/tests/Unit/Db/MapperFactoryTest.php +++ b/tests/Unit/Db/MapperFactoryTest.php @@ -29,26 +29,26 @@ class MapperFactoryTest extends TestCase private $db; private $settings; - public function setUp() + public function setUp(): void { $this->db = $this->getMockBuilder(IDBConnection::class) ->disableOriginalConstructor() ->getMock(); } - public function testGetItemMapperSqlite() + public function testGetItemMapperSqlite() { $factory = new MapperFactory($this->db, 'sqlite', new Time()); $this->assertTrue($factory->build() instanceof ItemMapper); } - public function testGetItemMapperPostgres() + public function testGetItemMapperPostgres() { $factory = new MapperFactory($this->db, 'pgsql', new Time()); $this->assertTrue($factory->build() instanceof ItemMapper); } - public function testGetItemMapperMysql() + public function testGetItemMapperMysql() { $factory = new MapperFactory($this->db, 'mysql', new Time()); $this->assertTrue($factory->build() instanceof MysqlMapper); diff --git a/tests/Unit/Db/MapperTestUtility.php b/tests/Unit/Db/MapperTestUtility.php index 5417e16bc4..b414b43e3f 100644 --- a/tests/Unit/Db/MapperTestUtility.php +++ b/tests/Unit/Db/MapperTestUtility.php @@ -43,7 +43,7 @@ abstract class MapperTestUtility extends TestCase * Run this function before the actual test to either set or initialize the * db. After this the db can be accessed by using $this->db */ - protected function setUp() + protected function setUp(): void { parent::setUp(); @@ -64,7 +64,7 @@ protected function setUp() * @param array $array * @return bool true if associative */ - private function isAssocArray(array $array) + private function isAssocArray(array $array) { return array_values($array) !== $array; } @@ -75,7 +75,7 @@ private function isAssocArray(array $array) * @param $value * @return PDO constant */ - private function getPDOType($value) + private function getPDOType($value) { switch (gettype($value)) { case 'integer': diff --git a/tests/Unit/Fetcher/FeedFetcherTest.php b/tests/Unit/Fetcher/FeedFetcherTest.php index f50912f49f..6360973de1 100644 --- a/tests/Unit/Fetcher/FeedFetcherTest.php +++ b/tests/Unit/Fetcher/FeedFetcherTest.php @@ -25,7 +25,9 @@ use OCA\News\Fetcher\FeedFetcher; use OCA\News\Utility\PsrLogger; +use OCP\ILogger; use PHPUnit\Framework\TestCase; +use Psr\Log\LoggerInterface; /** * Class FeedFetcherTest @@ -83,7 +85,7 @@ class FeedFetcherTest extends TestCase private $feed_mock; /** - * @var PsrLogger + * @var LoggerInterface */ private $logger; @@ -128,7 +130,7 @@ class FeedFetcherTest extends TestCase private $modified; private $location; - protected function setUp() + protected function setUp(): void { $this->l10n = $this->getMockBuilder(\OCP\IL10N::class) ->disableOriginalConstructor() @@ -161,8 +163,7 @@ protected function setUp() $timeFactory->expects($this->any()) ->method('getTime') ->will($this->returnValue($this->time)); - $this->logger = $this->getMockBuilder(PsrLogger::class) - ->disableOriginalConstructor() + $this->logger = $this->getMockBuilder(LoggerInterface::class) ->getMock(); $this->scraper = $this->getMockBuilder(Scraper::class) ->disableOriginalConstructor() @@ -373,7 +374,7 @@ public function testNoFavicon() { $this->setUpReader($this->url); - $feed = $this->createFeed(false); + $feed = $this->createFeed('de-DE', false); $this->favicon->expects($this->never()) ->method('get'); diff --git a/tests/Unit/Fetcher/FetcherTest.php b/tests/Unit/Fetcher/FetcherTest.php index 2549ff6068..a90a2da049 100644 --- a/tests/Unit/Fetcher/FetcherTest.php +++ b/tests/Unit/Fetcher/FetcherTest.php @@ -34,7 +34,7 @@ class FetcherTest extends TestCase private $fetcher; - protected function setUp() + protected function setUp(): void { $this->fetcher = new Fetcher(); } diff --git a/tests/Unit/Fetcher/YoutubeFetcherTest.php b/tests/Unit/Fetcher/YoutubeFetcherTest.php index 1c0c4c8198..e08d35f169 100644 --- a/tests/Unit/Fetcher/YoutubeFetcherTest.php +++ b/tests/Unit/Fetcher/YoutubeFetcherTest.php @@ -35,7 +35,7 @@ class YoutubeFetcherTest extends TestCase */ private $feedFetcher; - public function setUp() + public function setUp(): void { $this->feedFetcher = $this->getMockBuilder(FeedFetcher::class) ->disableOriginalConstructor() diff --git a/tests/Unit/Http/TextDownloadResponseTest.php b/tests/Unit/Http/TextDownloadResponseTest.php index 4021d22aa9..be5f53ec12 100644 --- a/tests/Unit/Http/TextDownloadResponseTest.php +++ b/tests/Unit/Http/TextDownloadResponseTest.php @@ -22,7 +22,7 @@ class TextDownloadResponseTest extends TestCase { - protected function setUp() + protected function setUp(): void { $this->response = new TextDownloadResponse( 'sometext', 'file', 'content' @@ -30,7 +30,7 @@ protected function setUp() } - public function testRender() + public function testRender() { $this->assertEquals('sometext', $this->response->render()); } diff --git a/tests/Unit/Http/TextResponseTest.php b/tests/Unit/Http/TextResponseTest.php index 5de374a17b..eaad769b51 100644 --- a/tests/Unit/Http/TextResponseTest.php +++ b/tests/Unit/Http/TextResponseTest.php @@ -21,13 +21,13 @@ class TextResponseTest extends TestCase { - protected function setUp() + protected function setUp(): void { $this->response = new TextResponse('sometext'); } - public function testRender() + public function testRender() { $this->assertEquals('sometext', $this->response->render()); } diff --git a/tests/Unit/Migration/MigrateStatusFlagsTest.php b/tests/Unit/Migration/MigrateStatusFlagsTest.php index fb915ec94b..d71f1a54c7 100644 --- a/tests/Unit/Migration/MigrateStatusFlagsTest.php +++ b/tests/Unit/Migration/MigrateStatusFlagsTest.php @@ -22,15 +22,15 @@ class MigrateStatusFlagsTest extends TestCase { /** - * @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject + * @var IDBConnection|\PHPUnit_Framework_MockObject_MockObject */ protected $db; /** - * @var IConfig|\PHPUnit_Framework_MockObject_MockObject + * @var IConfig|\PHPUnit_Framework_MockObject_MockObject */ protected $config; /** - * @var IOutput|\PHPUnit_Framework_MockObject_MockObject + * @var IOutput|\PHPUnit_Framework_MockObject_MockObject */ protected $output; @@ -41,7 +41,7 @@ protected function setUp(): void $this->output = $this->createMock(IOutput::class); } - public function testRun() + public function testRun() { $statement = $this->createMock(Statement::class); $statement->expects($this->exactly(1)) @@ -67,11 +67,11 @@ public function testRun() $migration->run($this->output); } - /** - * @expectedException \Exception - */ - public function testRunException() + public function testRunException() { + $this->expectException('\Exception'); + $this->expectExceptionMessage('Could not migrate status'); + $statement = $this->createMock(Statement::class); $statement->expects($this->exactly(1)) ->method('execute') @@ -96,7 +96,7 @@ public function testRunException() $migration->run($this->output); } - public function testRunNewerVersion() + public function testRunNewerVersion() { $this->config->expects($this->exactly(1)) ->method('getAppValue') diff --git a/tests/Unit/Service/FeedServiceTest.php b/tests/Unit/Service/FeedServiceTest.php index 76c8f89f61..84c2121eda 100644 --- a/tests/Unit/Service/FeedServiceTest.php +++ b/tests/Unit/Service/FeedServiceTest.php @@ -16,7 +16,7 @@ use FeedIo\Reader\ReadErrorException; -use OCA\News\Config\Config; +use OC\L10N\L10N; use OCA\News\Db\FeedMapper; use OCA\News\Db\ItemMapper; use OCA\News\Service\FeedService; @@ -28,6 +28,7 @@ use OCA\News\Db\Item; use OCA\News\Fetcher\Fetcher; use OCA\News\Fetcher\FetcherException; +use OCP\IConfig; use OCP\IL10N; use OCP\ILogger; @@ -37,28 +38,60 @@ class FeedServiceTest extends TestCase { + /** + * @var \PHPUnit\Framework\MockObject\MockObject|FeedMapper + */ private $feedMapper; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|ItemMapper + */ + private $itemMapper; + /** @var FeedService */ private $feedService; + + /** + * @var string + */ private $user; - private $response; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|Fetcher + */ private $fetcher; - private $itemMapper; - private $threshold; + + /** + * @var int + */ private $time; - private $importParser; + + /** + * @var int + */ private $autoPurgeMinimumInterval; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|\HTMLPurifier + */ private $purifier; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|L10N + */ private $l10n; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|ILogger + */ private $logger; - private $loggerParams; - protected function setUp() + protected function setUp(): void { $this->logger = $this->getMockBuilder(ILogger::class) ->disableOriginalConstructor() ->getMock(); - $this->loggerParams = ['hi']; + $loggerParams = ['hi']; $this->time = 222; $this->autoPurgeMinimumInterval = 10; $timeFactory = $this->getMockBuilder(Time::class) @@ -86,31 +119,34 @@ protected function setUp() ->getMockBuilder(\HTMLPurifier::class) ->disableOriginalConstructor() ->getMock(); - $config = $this->getMockBuilder(Config::class) + $config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); $config->expects($this->any()) - ->method('getAutoPurgeMinimumInterval') + ->method('getAppValue') + ->with('news', 'autoPurgeMinimumInterval') ->will($this->returnValue($this->autoPurgeMinimumInterval)); $this->feedService = new FeedService( $this->feedMapper, $this->fetcher, $this->itemMapper, $this->logger, $this->l10n, - $timeFactory, $config, $this->purifier, $this->loggerParams + $timeFactory, $config, $this->purifier, $loggerParams ); $this->user = 'jack'; } - + /** + * @covers \OCA\News\Service\FeedService::findAll + */ public function testFindAll() { $this->feedMapper->expects($this->once()) ->method('findAllFromUser') - ->with($this->equalTo($this->user)) - ->will($this->returnValue($this->response)); + ->with($this->user) + ->will($this->returnValue([])); $result = $this->feedService->findAll($this->user); - $this->assertEquals($this->response, $result); + $this->assertEquals([], $result); } @@ -120,7 +156,7 @@ public function testCreateDoesNotFindFeed() $url = 'test'; $this->fetcher->expects($this->once()) ->method('fetch') - ->with($this->equalTo($url)) + ->with($url) ->will($this->throwException($ex)); $this->expectException(ServiceNotFoundException::class); $this->feedService->create($url, 1, $this->user); @@ -1145,12 +1181,9 @@ public function testPatchEnableFullText() $this->feedService->patch(3, $this->user, ['fullTextEnabled' => true]); } - - /** - * @expectedException OCA\News\Service\ServiceNotFoundException - */ public function testPatchDoesNotExist() { + $this->expectException('OCA\News\Service\ServiceNotFoundException'); $feed = Feed::fromRow(['id' => 3]); $this->feedMapper->expects($this->once()) ->method('find') diff --git a/tests/Unit/Service/FolderServiceTest.php b/tests/Unit/Service/FolderServiceTest.php index 47c1c9a8d8..4086f55e1a 100644 --- a/tests/Unit/Service/FolderServiceTest.php +++ b/tests/Unit/Service/FolderServiceTest.php @@ -13,13 +13,14 @@ namespace OCA\News\Tests\Unit\Service; -use OCA\News\Config\Config; +use OC\L10N\L10N; use \OCA\News\Db\Folder; use OCA\News\Db\FolderMapper; use OCA\News\Service\FolderService; use OCA\News\Service\ServiceConflictException; use OCA\News\Service\ServiceValidationException; use OCA\News\Utility\Time; +use OCP\IConfig; use OCP\IL10N; use PHPUnit\Framework\TestCase; @@ -28,14 +29,37 @@ class FolderServiceTest extends TestCase { + /** + * @var \PHPUnit\Framework\MockObject\MockObject|FolderMapper + */ private $folderMapper; + + /** + * @var FolderService + */ private $folderService; + + /** + * @var int + */ private $time; + + /** + * @var string + */ private $user; + + /** + * @var int + */ private $autoPurgeMinimumInterval; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|L10N + */ private $l10n; - protected function setUp() + protected function setUp(): void { $this->l10n = $this->getMockBuilder(IL10N::class) ->disableOriginalConstructor() @@ -51,11 +75,12 @@ protected function setUp() ->disableOriginalConstructor() ->getMock(); $this->autoPurgeMinimumInterval = 10; - $config = $this->getMockBuilder(Config::class) + $config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); $config->expects($this->any()) - ->method('getAutoPurgeMinimumInterval') + ->method('getAppValue') + ->with('news', 'autoPurgeMinimumInterval') ->will($this->returnValue($this->autoPurgeMinimumInterval)); $this->folderService = new FolderService( $this->folderMapper, $this->l10n, $timeFactory, $config @@ -119,11 +144,10 @@ public function testCreateThrowsExWhenFolderNameExists() $this->folderService->create($folderName, 'john', 3); } - /** - * @expectedException \OCA\News\Service\ServiceValidationException - */ public function testCreateThrowsExWhenFolderNameEmpty() { + $this->expectException('OCA\News\Service\ServiceValidationException'); + $folderName = ''; $this->folderMapper->expects($this->once()) @@ -211,7 +235,7 @@ public function testRenameThrowsExWhenFolderNameEmpty() } - public function testMarkDeleted() + public function testMarkDeleted() { $id = 3; $folder = new Folder(); @@ -230,7 +254,7 @@ public function testMarkDeleted() } - public function testUnmarkDeleted() + public function testUnmarkDeleted() { $id = 3; $folder = new Folder(); @@ -295,7 +319,7 @@ public function testPurgeDeletedNoInterval() } - public function testDeleteUser() + public function testDeleteUser() { $this->folderMapper->expects($this->once()) ->method('deleteUser') diff --git a/tests/Unit/Service/ItemServiceTest.php b/tests/Unit/Service/ItemServiceTest.php index 9a89d2e1a3..e56add1527 100644 --- a/tests/Unit/Service/ItemServiceTest.php +++ b/tests/Unit/Service/ItemServiceTest.php @@ -13,7 +13,6 @@ namespace OCA\News\Tests\Unit\Service; -use OCA\News\Config\Config; use OCA\News\Db\ItemMapper; use OCA\News\Service\ItemService; use OCA\News\Service\ServiceNotFoundException; @@ -30,20 +29,26 @@ class ItemServiceTest extends TestCase { + /** + * @var \PHPUnit\Framework\MockObject\MockObject|ItemMapper + */ private $mapper; /** - * @var ItemService + * @var ItemService */ private $itemService; - private $user; - private $response; - private $status; + + /** + * @var int + */ private $time; - private $newestItemId; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IConfig + */ private $config; - private $systemConfig; - protected function setUp() + protected function setUp(): void { $this->time = 222; $this->timeFactory = $this->getMockBuilder(Time::class) @@ -58,23 +63,10 @@ protected function setUp() $this->mapper = $this->getMockBuilder(ItemMapper::class) ->disableOriginalConstructor() ->getMock(); - $this->config = $this->getMockBuilder(Config::class) + $this->config = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); - $this->systemConfig = $this->getMockBuilder(IConfig::class) - ->disableOriginalConstructor() - ->getMock(); - $this->itemService = new ItemService( - $this->mapper, - $this->timeFactory, $this->config, $this->systemConfig - ); - $this->user = 'jack'; - $this->id = 3; - $this->updatedSince = 20333; - $this->showAll = true; - $this->offset = 5; - $this->limit = 20; - $this->newestItemId = 4; + $this->itemService = new ItemService($this->mapper, $this->timeFactory, $this->config); } @@ -84,18 +76,15 @@ public function testFindAllNewFeed() $this->mapper->expects($this->once()) ->method('findAllNewFeed') ->with( - $this->equalTo($this->id), - $this->equalTo($this->updatedSince), - $this->equalTo($this->showAll), - $this->equalTo($this->user) + $this->equalTo(3), + $this->equalTo(20333), + $this->equalTo(true), + $this->equalTo('jack') ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue([])); - $result = $this->itemService->findAllNew( - $this->id, $type, $this->updatedSince, $this->showAll, - $this->user - ); - $this->assertEquals($this->response, $result); + $result = $this->itemService->findAllNew(3, $type, 20333, true, 'jack'); + $this->assertEquals([], $result); } @@ -105,18 +94,15 @@ public function testFindAllNewFolder() $this->mapper->expects($this->once()) ->method('findAllNewFolder') ->with( - $this->equalTo($this->id), - $this->equalTo($this->updatedSince), - $this->equalTo($this->showAll), - $this->equalTo($this->user) + $this->equalTo(3), + $this->equalTo(20333), + $this->equalTo(true), + $this->equalTo('jack') ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); - $result = $this->itemService->findAllNew( - $this->id, $type, $this->updatedSince, $this->showAll, - $this->user - ); - $this->assertEquals($this->response, $result); + $result = $this->itemService->findAllNew(3, $type, 20333, true, 'jack'); + $this->assertEquals(['val'], $result); } @@ -126,18 +112,18 @@ public function testFindAllNew() $this->mapper->expects($this->once()) ->method('findAllNew') ->with( - $this->equalTo($this->updatedSince), + $this->equalTo(20333), $this->equalTo($type), - $this->equalTo($this->showAll), - $this->equalTo($this->user) + $this->equalTo(true), + $this->equalTo('jack') ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); $result = $this->itemService->findAllNew( - $this->id, $type, $this->updatedSince, $this->showAll, - $this->user + 3, $type, 20333, true, + 'jack' ); - $this->assertEquals($this->response, $result); + $this->assertEquals(['val'], $result); } @@ -147,21 +133,21 @@ public function testFindAllFeed() $this->mapper->expects($this->once()) ->method('findAllFeed') ->with( - $this->equalTo($this->id), - $this->equalTo($this->limit), - $this->equalTo($this->offset), - $this->equalTo($this->showAll), + $this->equalTo(3), + $this->equalTo(20), + $this->equalTo(5), + $this->equalTo(true), $this->equalTo(false), - $this->equalTo($this->user), + $this->equalTo('jack'), $this->equalTo([]) ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); $result = $this->itemService->findAll( - $this->id, $type, $this->limit, $this->offset, - $this->showAll, false, $this->user + 3, $type, 20, 5, + true, false, 'jack' ); - $this->assertEquals($this->response, $result); + $this->assertEquals(['val'], $result); } @@ -171,21 +157,21 @@ public function testFindAllFolder() $this->mapper->expects($this->once()) ->method('findAllFolder') ->with( - $this->equalTo($this->id), - $this->equalTo($this->limit), - $this->equalTo($this->offset), - $this->equalTo($this->showAll), + $this->equalTo(3), + $this->equalTo(20), + $this->equalTo(5), + $this->equalTo(true), $this->equalTo(true), - $this->equalTo($this->user), + $this->equalTo('jack'), $this->equalTo([]) ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); $result = $this->itemService->findAll( - $this->id, $type, $this->limit, $this->offset, - $this->showAll, true, $this->user + 3, $type, 20, 5, + true, true, 'jack' ); - $this->assertEquals($this->response, $result); + $this->assertEquals(['val'], $result); } @@ -195,21 +181,21 @@ public function testFindAll() $this->mapper->expects($this->once()) ->method('findAll') ->with( - $this->equalTo($this->limit), - $this->equalTo($this->offset), + $this->equalTo(20), + $this->equalTo(5), $this->equalTo($type), - $this->equalTo($this->showAll), $this->equalTo(true), - $this->equalTo($this->user), + $this->equalTo(true), + $this->equalTo('jack'), $this->equalTo([]) ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); $result = $this->itemService->findAll( - $this->id, $type, $this->limit, $this->offset, - $this->showAll, true, $this->user + 3, $type, 20, 5, + true, true, 'jack' ); - $this->assertEquals($this->response, $result); + $this->assertEquals(['val'], $result); } @@ -220,21 +206,21 @@ public function testFindAllSearch() $this->mapper->expects($this->once()) ->method('findAll') ->with( - $this->equalTo($this->limit), - $this->equalTo($this->offset), + $this->equalTo(20), + $this->equalTo(5), $this->equalTo($type), - $this->equalTo($this->showAll), $this->equalTo(true), - $this->equalTo($this->user), + $this->equalTo(true), + $this->equalTo('jack'), $this->equalTo($search) ) - ->will($this->returnValue($this->response)); + ->will($this->returnValue(['val'])); $result = $this->itemService->findAll( - $this->id, $type, $this->limit, $this->offset, - $this->showAll, true, $this->user, $search + 3, $type, 20, 5, + true, true, 'jack', $search ); - $this->assertEquals($this->response, $result); + $this->assertEquals(['val'], $result); } @@ -260,7 +246,7 @@ public function testStar() ->with( $this->equalTo($guidHash), $this->equalTo($feedId), - $this->equalTo($this->user) + $this->equalTo('jack') ) ->will($this->returnValue($item)); @@ -268,7 +254,7 @@ public function testStar() ->method('update') ->with($this->equalTo($expectedItem)); - $this->itemService->star($feedId, $guidHash, true, $this->user); + $this->itemService->star($feedId, $guidHash, true, 'jack'); $this->assertTrue($item->isStarred()); } @@ -296,7 +282,7 @@ public function testUnstar() ->with( $this->equalTo($guidHash), $this->equalTo($feedId), - $this->equalTo($this->user) + $this->equalTo('jack') ) ->will($this->returnValue($item)); @@ -304,7 +290,7 @@ public function testUnstar() ->method('update') ->with($this->equalTo($expectedItem)); - $this->itemService->star($feedId, $guidHash, false, $this->user); + $this->itemService->star($feedId, $guidHash, false, 'jack'); $this->assertFalse($item->isStarred()); } @@ -329,11 +315,11 @@ public function testRead() $this->equalTo($itemId), $this->equalTo(true), $this->equalTo($this->time), - $this->equalTo($this->user) + $this->equalTo('jack') ) ->will($this->returnValue($item)); - $this->itemService->read($itemId, true, $this->user); + $this->itemService->read($itemId, true, 'jack'); } @@ -345,7 +331,7 @@ public function testReadDoesNotExist() ->method('readItem') ->will($this->throwException(new DoesNotExistException(''))); - $this->itemService->read(1, true, $this->user); + $this->itemService->read(1, true, 'jack'); } public function testStarDoesNotExist() @@ -356,7 +342,7 @@ public function testStarDoesNotExist() ->method('findByGuidHash') ->will($this->throwException(new DoesNotExistException(''))); - $this->itemService->star(1, 'hash', true, $this->user); + $this->itemService->star(1, 'hash', true, 'jack'); } @@ -369,10 +355,10 @@ public function testReadAll() ->with( $this->equalTo($highestItemId), $this->equalTo($this->time), - $this->equalTo($this->user) + $this->equalTo('jack') ); - $this->itemService->readAll($highestItemId, $this->user); + $this->itemService->readAll($highestItemId, 'jack'); } @@ -387,10 +373,10 @@ public function testReadFolder() $this->equalTo($folderId), $this->equalTo($highestItemId), $this->equalTo($this->time), - $this->equalTo($this->user) + $this->equalTo('jack') ); - $this->itemService->readFolder($folderId, $highestItemId, $this->user); + $this->itemService->readFolder($folderId, $highestItemId, 'jack'); } @@ -405,17 +391,18 @@ public function testReadFeed() $this->equalTo($feedId), $this->equalTo($highestItemId), $this->equalTo($this->time), - $this->equalTo($this->user) + $this->equalTo('jack') ); - $this->itemService->readFeed($feedId, $highestItemId, $this->user); + $this->itemService->readFeed($feedId, $highestItemId, 'jack'); } public function testAutoPurgeOldWillPurgeOld() { $this->config->expects($this->once()) - ->method('getAutoPurgeCount') + ->method('getAppValue') + ->with('news', 'autoPurgeCount') ->will($this->returnValue(2)); $this->mapper->expects($this->once()) ->method('deleteReadOlderThanThreshold') @@ -427,7 +414,8 @@ public function testAutoPurgeOldWillPurgeOld() public function testAutoPurgeOldWontPurgeOld() { $this->config->expects($this->once()) - ->method('getAutoPurgeCount') + ->method('getAppValue') + ->with('news', 'autoPurgeCount') ->will($this->returnValue(-1)); $this->mapper->expects($this->never()) ->method('deleteReadOlderThanThreshold'); @@ -436,23 +424,23 @@ public function testAutoPurgeOldWontPurgeOld() } - public function testGetNewestItemId() + public function testGetNewestItemId() { $this->mapper->expects($this->once()) ->method('getNewestItemId') - ->with($this->equalTo($this->user)) + ->with($this->equalTo('jack')) ->will($this->returnValue(12)); - $result = $this->itemService->getNewestItemId($this->user); + $result = $this->itemService->getNewestItemId('jack'); $this->assertEquals(12, $result); } - public function testGetNewestItemIdDoesNotExist() + public function testGetNewestItemIdDoesNotExist() { $this->mapper->expects($this->once()) ->method('getNewestItemId') - ->with($this->equalTo($this->user)) + ->with($this->equalTo('jack')) ->will( $this->throwException( new DoesNotExistException('There are no items') @@ -460,7 +448,7 @@ public function testGetNewestItemIdDoesNotExist() ); $this->expectException(ServiceNotFoundException::class); - $this->itemService->getNewestItemId($this->user); + $this->itemService->getNewestItemId('jack'); } @@ -470,10 +458,10 @@ public function testStarredCount() $this->mapper->expects($this->once()) ->method('starredCount') - ->with($this->equalTo($this->user)) + ->with($this->equalTo('jack')) ->will($this->returnValue($star)); - $result = $this->itemService->starredCount($this->user); + $result = $this->itemService->starredCount('jack'); $this->assertEquals($star, $result); } @@ -485,22 +473,22 @@ public function testGetUnreadOrStarred() $this->mapper->expects($this->once()) ->method('findAllUnreadOrStarred') - ->with($this->equalTo($this->user)) + ->with($this->equalTo('jack')) ->will($this->returnValue($star)); - $result = $this->itemService->getUnreadOrStarred($this->user); + $result = $this->itemService->getUnreadOrStarred('jack'); $this->assertEquals($star, $result); } - public function testDeleteUser() + public function testDeleteUser() { $this->mapper->expects($this->once()) ->method('deleteUser') - ->will($this->returnValue($this->user)); + ->will($this->returnValue('jack')); - $this->itemService->deleteUser($this->user); + $this->itemService->deleteUser('jack'); } diff --git a/tests/Unit/Service/ServiceTest.php b/tests/Unit/Service/ServiceTest.php index eb18982902..8f601be468 100644 --- a/tests/Unit/Service/ServiceTest.php +++ b/tests/Unit/Service/ServiceTest.php @@ -37,7 +37,7 @@ class ServiceTest extends TestCase protected $mapper; protected $newsService; - protected function setUp() + protected function setUp(): void { $this->mapper = $this->getMockBuilder(ItemMapper::class) ->disableOriginalConstructor() diff --git a/tests/Unit/Service/StatusServiceTest.php b/tests/Unit/Service/StatusServiceTest.php index 8c42997a02..ee2e196148 100644 --- a/tests/Unit/Service/StatusServiceTest.php +++ b/tests/Unit/Service/StatusServiceTest.php @@ -13,8 +13,6 @@ namespace OCA\News\Tests\Unit\Service; -use OCA\News\Config\Config; -use \OCA\News\Db\FeedType; use OCA\News\Service\StatusService; use OCP\IConfig; use OCP\IDBConnection; @@ -23,83 +21,174 @@ class StatusServiceTest extends TestCase { - + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IConfig + */ private $settings; - private $config; + + /** + * @var \PHPUnit\Framework\MockObject\MockObject|IDBConnection + */ + private $connection; + + /** + * @var StatusService + */ private $service; - private $appName; - public function setUp() + public function setUp(): void { - $this->appName = 'news'; $this->settings = $this->getMockBuilder(IConfig::class) ->disableOriginalConstructor() ->getMock(); - $this->config = $this->getMockBuilder(Config::class) - ->disableOriginalConstructor() - ->getMock(); - $this->db = $this->getMockBuilder(IDBConnection::class) + $this->connection = $this->getMockBuilder(IDBConnection::class) ->disableOriginalConstructor() ->getMock(); - $this->service = new StatusService( - $this->settings, $this->db, - $this->config, $this->appName - ); - } - - private function beforeStatus($cronMode='cron', $cronEnabled=true, - $version='1.0' - ) { - $this->settings->expects($this->at(0)) - ->method('getAppValue') - ->with( - $this->equalTo($this->appName), - $this->equalTo('installed_version') - ) - ->will($this->returnValue($version)); - - $this->settings->expects($this->at(1)) - ->method('getAppValue') - ->with( - $this->equalTo('core'), - $this->equalTo('backgroundjobs_mode') - ) - ->will($this->returnValue($cronMode)); - - $this->config->expects($this->once()) - ->method('getUseCronUpdates') - ->will($this->returnValue($cronEnabled)); - + $this->service = new StatusService($this->settings, $this->connection, 'news'); } - + /** + * @covers \OCA\News\Service\StatusService::getStatus + */ public function testGetStatus() { - $this->beforeStatus(); - + $this->settings->expects($this->exactly(2)) + ->method('getAppValue') + ->withConsecutive( + ['news', 'installed_version'], + ['news', 'useCronUpdates'] + ) + ->will($this->returnValueMap([ + ['news', 'installed_version', '', '1.0'], + ['news', 'useCronUpdates', true, true], + ])); + + $this->settings->expects($this->exactly(1)) + ->method('getSystemValue') + ->with('backgroundjobs_mode') + ->will($this->returnValue('cron')); + + $this->connection->expects($this->exactly(1)) + ->method('supports4ByteText') + ->will($this->returnValue(true)); + + $expected = [ + 'version' => '1.0', + 'warnings' => [ + 'improperlyConfiguredCron' => false, + 'incorrectDbCharset' => false, + ], + ]; $response = $this->service->getStatus(); - $this->assertEquals('1.0', $response['version']); - $this->assertFalse($response['warnings']['improperlyConfiguredCron']); + $this->assertEquals($expected, $response); } - + /** + * @covers \OCA\News\Service\StatusService::getStatus + */ public function testGetStatusNoCorrectCronAjax() { - $this->beforeStatus('ajax'); - + $this->settings->expects($this->exactly(2)) + ->method('getAppValue') + ->withConsecutive( + ['news', 'installed_version'], + ['news', 'useCronUpdates'] + ) + ->will($this->returnValueMap([ + ['news', 'installed_version', '', '1.0'], + ['news', 'useCronUpdates', true, true], + ])); + + $this->settings->expects($this->exactly(1)) + ->method('getSystemValue') + ->with('backgroundjobs_mode') + ->will($this->returnValue('ajax')); + + $this->connection->expects($this->exactly(1)) + ->method('supports4ByteText') + ->will($this->returnValue(true)); + + $expected = [ + 'version' => '1.0', + 'warnings' => [ + 'improperlyConfiguredCron' => true, + 'incorrectDbCharset' => false, + ], + ]; $response = $this->service->getStatus(); - $this->assertTrue($response['warnings']['improperlyConfiguredCron']); + $this->assertEquals($expected, $response); } - - + /** + * @covers \OCA\News\Service\StatusService::getStatus + */ public function testGetStatusNoCorrectCronTurnedOff() { - $this->beforeStatus('ajax', false); - + $this->settings->expects($this->exactly(2)) + ->method('getAppValue') + ->withConsecutive( + ['news', 'installed_version'], + ['news', 'useCronUpdates'] + ) + ->will($this->returnValueMap([ + ['news', 'installed_version', '', '1.0'], + ['news', 'useCronUpdates', true, false], + ])); + + $this->settings->expects($this->exactly(1)) + ->method('getSystemValue') + ->with('backgroundjobs_mode') + ->will($this->returnValue('ajax')); + + $this->connection->expects($this->exactly(1)) + ->method('supports4ByteText') + ->will($this->returnValue(true)); + + $expected = [ + 'version' => '1.0', + 'warnings' => [ + 'improperlyConfiguredCron' => false, + 'incorrectDbCharset' => false, + ], + ]; $response = $this->service->getStatus(); - $this->assertFalse($response['warnings']['improperlyConfiguredCron']); + $this->assertEquals($expected, $response); } + /** + * @covers \OCA\News\Service\StatusService::getStatus + */ + public function testGetStatusReportsNon4ByteText() + { + $this->settings->expects($this->exactly(2)) + ->method('getAppValue') + ->withConsecutive( + ['news', 'installed_version'], + ['news', 'useCronUpdates'] + ) + ->will($this->returnValueMap([ + ['news', 'installed_version', '', '1.0'], + ['news', 'useCronUpdates', true, false], + ])); + + $this->settings->expects($this->exactly(1)) + ->method('getSystemValue') + ->with('backgroundjobs_mode') + ->will($this->returnValue('ajax')); + + $this->connection->expects($this->exactly(1)) + ->method('supports4ByteText') + ->will($this->returnValue(false)); + + $expected = [ + 'version' => '1.0', + 'warnings' => [ + 'improperlyConfiguredCron' => false, + 'incorrectDbCharset' => true, + ], + ]; + $response = $this->service->getStatus(); + $this->assertEquals($expected, $response); + } } \ No newline at end of file diff --git a/tests/Unit/Utility/OPMLExporterTest.php b/tests/Unit/Utility/OPMLExporterTest.php index 80cbaf9501..8c7c3c9236 100644 --- a/tests/Unit/Utility/OPMLExporterTest.php +++ b/tests/Unit/Utility/OPMLExporterTest.php @@ -32,7 +32,7 @@ class OPMLExporterTest extends TestCase /** @var Folder */ private $folder2; - protected function setUp() + protected function setUp(): void { $this->exporter = new OPMLExporter(); $this->folder1 = new Folder(); @@ -55,7 +55,7 @@ protected function setUp() } - private function getAttribute($item, $name) + private function getAttribute($item, $name) { // used to fix scrutinizer errors if ($item instanceof \DOMElement) { @@ -75,7 +75,7 @@ public function testBuildEmpty() } - public function testBuildReturnsFolders() + public function testBuildReturnsFolders() { $result = $this->exporter->build([$this->folder1, $this->folder2], []); $xpath = new \DOMXpath($result); @@ -101,7 +101,7 @@ public function testBuildReturnsFolders() } - public function testBuildReturnsOnlyOneFeedIfParentFolderNotThere() + public function testBuildReturnsOnlyOneFeedIfParentFolderNotThere() { $result = $this->exporter->build([], [$this->feed1, $this->feed2]); $xpath = new \DOMXpath($result); @@ -127,7 +127,7 @@ public function testBuildReturnsOnlyOneFeedIfParentFolderNotThere() } - public function testBuildReturnsFeedsAndFolders() + public function testBuildReturnsFeedsAndFolders() { $result = $this->exporter->build( [$this->folder1, $this->folder2], diff --git a/tests/Unit/Utility/UpdaterTest.php b/tests/Unit/Utility/UpdaterTest.php index 3a285ccfdd..3cd81de021 100644 --- a/tests/Unit/Utility/UpdaterTest.php +++ b/tests/Unit/Utility/UpdaterTest.php @@ -28,7 +28,7 @@ class UpdaterTest extends TestCase private $itemService; private $updater; - protected function setUp() + protected function setUp(): void { $this->folderService = $this->getMockBuilder(FolderService::class) ->disableOriginalConstructor() @@ -46,7 +46,7 @@ protected function setUp() ); } - public function testBeforeUpdate() + public function testBeforeUpdate() { $this->folderService->expects($this->once()) ->method('purgeDeleted'); @@ -56,14 +56,14 @@ public function testBeforeUpdate() } - public function testAfterUpdate() + public function testAfterUpdate() { $this->itemService->expects($this->once()) ->method('autoPurgeOld'); $this->updater->afterUpdate(); } - public function testUpdate() + public function testUpdate() { $this->feedService->expects($this->once()) ->method('updateAll');