diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-07 23:00:34 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-09-07 23:00:34 +0200 |
commit | ee861fa6dd80378be60cb76d2fb28c5e0e808ab6 (patch) | |
tree | ee068e63498b9bfddff3cda366607b43cef688de /tests/unit | |
parent | 4a36e0e4af8df6971be40f08c8ab0fd65c78fdd6 (diff) |
extra work for postgres, fix #338
Diffstat (limited to 'tests/unit')
-rw-r--r-- | tests/unit/db/ItemMapperTest.php | 3 | ||||
-rw-r--r-- | tests/unit/db/MapperFactoryTest.php | 75 | ||||
-rw-r--r-- | tests/unit/db/postgres/ItemMapperTest.php | 191 |
3 files changed, 266 insertions, 3 deletions
diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php index 23896727e..eb04b1514 100644 --- a/tests/unit/db/ItemMapperTest.php +++ b/tests/unit/db/ItemMapperTest.php @@ -331,9 +331,6 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { public function testDeleteReadOlderThanThreshold(){ - $this->markTestIncomplete( - 'Fix on postgres first' - ); $threshold = 10; $status = StatusFlag::STARRED | StatusFlag::UNREAD; diff --git a/tests/unit/db/MapperFactoryTest.php b/tests/unit/db/MapperFactoryTest.php new file mode 100644 index 000000000..c1be2095b --- /dev/null +++ b/tests/unit/db/MapperFactoryTest.php @@ -0,0 +1,75 @@ +<?php + +/** +* ownCloud - News +* +* @author Alessandro Cosentino +* @author Bernhard Posselt +* @copyright 2012 Alessandro Cosentino cosenal@gmail.com +* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCA\News\Db; + +require_once(__DIR__ . "/../../classloader.php"); + + + +class MapperTest extends \PHPUnit_Framework_TestCase { + + + public function setUp() { + $this->api = $this->getMockBuilder('\OCA\AppFramework\Core\API') + ->disableOriginalConstructor() + ->getMock(); + } + + + public function testGetItemMapperSqlite() { + $this->api->expects($this->once()) + ->method('getSystemValue') + ->with($this->equalTo('dbtype')) + ->will($this->returnValue('sqlite')); + $factory = new MapperFactory($this->api); + + $this->assertTrue($factory->getItemMapper() instanceof ItemMapper); + } + + + public function testGetItemMapperMysql() { + $this->api->expects($this->once()) + ->method('getSystemValue') + ->with($this->equalTo('dbtype')) + ->will($this->returnValue('mysql')); + $factory = new MapperFactory($this->api); + + $this->assertTrue($factory->getItemMapper() instanceof ItemMapper); + } + + + public function testGetItemMapperPostgres() { + $this->api->expects($this->once()) + ->method('getSystemValue') + ->with($this->equalTo('dbtype')) + ->will($this->returnValue('pgsql')); + $factory = new MapperFactory($this->api); + + $this->assertTrue($factory->getItemMapper() instanceof \OCA\News\Db\Postgres\ItemMapper); + } + + +}
\ No newline at end of file diff --git a/tests/unit/db/postgres/ItemMapperTest.php b/tests/unit/db/postgres/ItemMapperTest.php new file mode 100644 index 000000000..3e9fb8867 --- /dev/null +++ b/tests/unit/db/postgres/ItemMapperTest.php @@ -0,0 +1,191 @@ +<?php + +/** +* ownCloud - News +* +* @author Alessandro Cosentino +* @author Bernhard Posselt +* @copyright 2012 Alessandro Cosentino cosenal@gmail.com +* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com +* +* This library is free software; you can redistribute it and/or +* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE +* License as published by the Free Software Foundation; either +* version 3 of the License, or any later version. +* +* This library is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +* GNU AFFERO GENERAL PUBLIC LICENSE for more details. +* +* You should have received a copy of the GNU Affero General Public +* License along with this library. If not, see <http://www.gnu.org/licenses/>. +* +*/ + +namespace OCA\News\Db\Postgres; + +use \OCA\News\Db\Item; +use \OCA\News\Db\StatusFlag; + + +require_once(__DIR__ . "/../../../classloader.php"); + + +class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { + + private $mapper; + private $items; + private $newestItemId; + private $limit; + private $user; + private $offset; + private $updatedSince; + private $status; + + + public function setUp() + { + $this->beforeEach(); + + $this->mapper = new ItemMapper($this->api); + + // create mock items + $item1 = new Item(); + $item2 = new Item(); + + $this->items = array( + $item1, + $item2 + ); + + $this->userId = 'john'; + $this->id = 3; + $this->folderId = 2; + + $this->row = array( + array('id' => $this->items[0]->getId()), + ); + + $this->rows = array( + array('id' => $this->items[0]->getId()), + array('id' => $this->items[1]->getId()) + ); + + $this->user = 'john'; + $this->limit = 10; + $this->offset = 3; + $this->id = 11; + $this->status = 333; + $this->updatedSince = 323; + $this->newestItemId = 2; + + } + + + private function makeSelectQuery($prependTo){ + return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '. + 'JOIN `*PREFIX*news_feeds` `feeds` ' . + 'ON `feeds`.`id` = `items`.`feed_id` '. + 'AND `feeds`.`deleted_at` = 0 ' . + 'AND `feeds`.`user_id` = ? ' . + $prependTo . + 'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' . + 'ON `folders`.`id` = `feeds`.`folder_id` ' . + 'WHERE `feeds`.`folder_id` = 0 ' . + 'OR `folders`.`deleted_at` = 0 ' . + 'ORDER BY `items`.`id` DESC'; + } + + private function makeSelectQueryStatus($prependTo, $status) { + $status = (int) $status; + + return $this->makeSelectQuery( + 'AND ((`items`.`status` & ' . $status . ') = ' . $status . ') ' . + $prependTo + ); + } + + + public function testDeleteReadOlderThanThresholdDoesNotDeleteBelowThreshold(){ + $status = StatusFlag::STARRED | StatusFlag::UNREAD; + $sql = 'SELECT COUNT(*) `size`, `feed_id` ' . + 'FROM `*PREFIX*news_items` ' . + 'WHERE NOT ((`status` & ?) > 0) ' . + 'GROUP BY `feed_id` ' . + 'HAVING COUNT(*) > ?'; + + $threshold = 10; + $rows = array(array('feed_id' => 30, 'size' => 9)); + $params = array($status, $threshold); + + $this->setMapperResult($sql, $params, $rows); + $this->mapper->deleteReadOlderThanThreshold($threshold); + + + } + + + public function testDeleteReadOlderThanThreshold(){ + $threshold = 10; + $status = StatusFlag::STARRED | StatusFlag::UNREAD; + + $sql1 = 'SELECT COUNT(*) `size`, `feed_id` ' . + 'FROM `*PREFIX*news_items` ' . + 'WHERE NOT ((`status` & ?) > 0) ' . + 'GROUP BY `feed_id` ' . + 'HAVING COUNT(*) > ?'; + $params1 = array($status, $threshold); + + + $row = array('feed_id' => 30, 'size' => 11); + + $sql2 = 'DELETE FROM `*PREFIX*news_items` ' . + 'WHERE `id` IN (' . + 'SELECT `id` FROM `*PREFIX*news_items` ' . + 'WHERE NOT ((`status` & ?) > 0) ' . + 'AND `feed_id` = ? ' . + 'ORDER BY `id` ASC ' . + 'LIMIT ?' . + ')'; + $params2 = array($status, 30, 1); + + + $pdoResult = $this->getMock('Result', + array('fetchRow')); + + $pdoResult->expects($this->at(0)) + ->method('fetchRow') + ->will($this->returnValue($row)); + $pdoResult->expects($this->at(1)) + ->method('fetchRow') + ->will($this->returnValue(false)); + + $query = $this->getMock('Query', + array('execute')); + $query->expects($this->at(0)) + ->method('execute') + ->with($this->equalTo($params1)) + ->will($this->returnValue($pdoResult)); + + $this->api->expects($this->at(0)) + ->method('prepareQuery') + ->with($this->equalTo($sql1)) + ->will(($this->returnValue($query))); + + $query2 = $this->getMock('Query', + array('execute')); + $query2->expects($this->at(0)) + ->method('execute') + ->with($this->equalTo($params2)); + + $this->api->expects($this->at(1)) + ->method('prepareQuery') + ->with($this->equalTo($sql2)) + ->will($this->returnValue($query2)); + + $result = $this->mapper->deleteReadOlderThanThreshold($threshold); + } + + +} |