diff options
Diffstat (limited to 'tests/unit/db/FeedMapperTest.php')
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 109 |
1 files changed, 49 insertions, 60 deletions
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php index 607255fde..c3b276ba6 100644 --- a/tests/unit/db/FeedMapperTest.php +++ b/tests/unit/db/FeedMapperTest.php @@ -30,10 +30,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { $feed1 = new Feed(); $feed2 = new Feed(); - $this->feeds = array( - $feed1, - $feed2 - ); + $this->feeds = [$feed1, $feed2]; $this->user = 'herman'; } @@ -41,9 +38,9 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFind(){ $userId = 'john'; $id = 3; - $rows = array( - array('id' => $this->feeds[0]->getId()), - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . @@ -56,7 +53,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($id, $userId); + $params = [$id, $userId]; $this->setMapperResult($sql, $params, $rows); $result = $this->mapper->find($id, $userId); @@ -80,7 +77,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($id, $userId); + $params = [$id, $userId]; $this->setMapperResult($sql, $params); $this->setExpectedException('\OCP\AppFramework\Db\DoesNotExistException'); @@ -91,10 +88,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFindMoreThanOneResultFound(){ $userId = 'john'; $id = 3; - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . @@ -107,7 +104,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $params = array($id, $userId); + $params = [$id, $userId]; $this->setMapperResult($sql, $params, $rows); $this->setExpectedException('\OCP\AppFramework\Db\MultipleObjectsReturnedException'); @@ -116,10 +113,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFindAll(){ - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '. @@ -141,7 +138,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $this->setMapperResult($sql, array(), $rows); + $this->setMapperResult($sql, [], $rows); $result = $this->mapper->findAll(); $this->assertEquals($this->feeds, $result); @@ -150,10 +147,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFindAllFromUser(){ $userId = 'john'; - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '. @@ -175,8 +172,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $this->setMapperResult($sql, - array($userId), $rows); + $this->setMapperResult($sql, [$userId], $rows); $result = $this->mapper->findAllFromUser($userId); $this->assertEquals($this->feeds, $result); @@ -185,9 +181,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFindByUrlHash(){ $urlHash = md5('hihi'); - $row = array( - array('id' => $this->feeds[0]->getId()), - ); + $row = [['id' => $this->feeds[0]->getId()]]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . @@ -200,8 +194,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $this->setMapperResult($sql, - array($urlHash, $this->user), $row); + $this->setMapperResult($sql, [$urlHash, $this->user], $row); $result = $this->mapper->findByUrlHash($urlHash, $this->user); $this->assertEquals($this->feeds[0], $result); @@ -222,8 +215,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $this->setMapperResult($sql, - array($urlHash, $this->user)); + $this->setMapperResult($sql, [$urlHash, $this->user]); $this->setExpectedException('\OCP\AppFramework\Db\DoesNotExistException'); $this->mapper->findByUrlHash($urlHash, $this->user); @@ -232,10 +224,10 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testFindByUrlHashMoreThanOneResultFound(){ $urlHash = md5('hihi'); - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' . 'FROM `*PREFIX*news_feeds` `feeds` ' . 'LEFT JOIN `*PREFIX*news_items` `items` ' . @@ -248,8 +240,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { '`feeds`.`url`, `feeds`.`title`, `feeds`.`link`,'. '`feeds`.`favicon_link`, `feeds`.`added`, `feeds`.`articles_per_update`,'. '`feeds`.`folder_id`, `feeds`.`prevent_update`, `feeds`.`deleted_at`'; - $this->setMapperResult($sql, - array($urlHash, $this->user), $rows); + $this->setMapperResult($sql, [$urlHash, $this->user], $rows); $this->setExpectedException('\OCP\AppFramework\Db\MultipleObjectsReturnedException'); $this->mapper->findByUrlHash($urlHash, $this->user); @@ -261,15 +252,13 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { $feed->setId(3); $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `id` = ?'; - $arguments = array($feed->getId()); + $arguments = [$feed->getId()]; $sql2 = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` = ?'; - $arguments2 = array($feed->getId()); + $arguments2 = [$feed->getId()]; - $pdoResult = $this->getMock('Result', - array('fetchRow')); - $pdoResult->expects($this->any()) - ->method('fetchRow'); + $pdoResult = $this->getMock('Result', ['fetch']); + $pdoResult->expects($this->any())->method('fetch'); $this->setMapperResult($sql, $arguments); $this->setMapperResult($sql2, $arguments2); @@ -280,15 +269,15 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testGetPurgeDeleted(){ - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $deleteOlderThan = 110; $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `deleted_at` > 0 ' . 'AND `deleted_at` < ? '; - $this->setMapperResult($sql, array($deleteOlderThan), $rows); + $this->setMapperResult($sql, [$deleteOlderThan], $rows); $result = $this->mapper->getToDelete($deleteOlderThan); $this->assertEquals($this->feeds, $result); @@ -296,16 +285,16 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testGetPurgeDeletedFromUser(){ - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $deleteOlderThan = 110; $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `deleted_at` > 0 ' . 'AND `deleted_at` < ? ' . 'AND `user_id` = ?'; - $this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows); + $this->setMapperResult($sql, [$deleteOlderThan, $this->user], $rows); $result = $this->mapper->getToDelete($deleteOlderThan, $this->user); $this->assertEquals($this->feeds, $result); @@ -313,15 +302,15 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { public function testGetAllPurgeDeletedFromUser(){ - $rows = array( - array('id' => $this->feeds[0]->getId()), - array('id' => $this->feeds[1]->getId()) - ); + $rows = [ + ['id' => $this->feeds[0]->getId()], + ['id' => $this->feeds[1]->getId()] + ]; $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `deleted_at` > 0 ' . 'AND `user_id` = ?'; - $this->setMapperResult($sql, array($this->user), $rows); + $this->setMapperResult($sql, [$this->user], $rows); $result = $this->mapper->getToDelete(null, $this->user); $this->assertEquals($this->feeds, $result); @@ -332,7 +321,7 @@ class FeedMapperTest extends \OCP\AppFramework\Db\MapperTestUtility { $userId = 'john'; $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `user_id` = ?'; - $this->setMapperResult($sql, array($userId)); + $this->setMapperResult($sql, [$userId]); $this->mapper->deleteUser($userId); } |