diff options
author | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-04 17:32:57 +0200 |
---|---|---|
committer | Bernhard Posselt <dev@bernhard-posselt.com> | 2014-04-04 17:33:08 +0200 |
commit | 2879f07476bb8a81f5316c8ea95d0b536fdf97ea (patch) | |
tree | ce2eb7ed56d7c8e44ddc68cc7aa2840999a0df8a | |
parent | 1b2595ec13966c2a7a236eb1823d72aaaa72dfeb (diff) |
depend on oc6, bind correct types, fix #457
-rw-r--r-- | CHANGELOG | 4 | ||||
-rw-r--r-- | appinfo/info.xml | 2 | ||||
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 21 | ||||
-rw-r--r-- | tests/unit/db/FolderMapperTest.php | 35 | ||||
-rw-r--r-- | tests/unit/db/ItemMapperTest.php | 35 | ||||
-rw-r--r-- | tests/unit/db/postgres/ItemMapperTest.php | 34 |
6 files changed, 13 insertions, 118 deletions
@@ -1,5 +1,7 @@ -owncloud-news (1.809) +owncloud-news (2.001) * Delete folders, feeds and articles if a user is deleted +* Also remember collapsed folders on postgres +* Require ownCloud 6 owncloud-news (1.808) * Also focus article area when clicking on all unread link diff --git a/appinfo/info.xml b/appinfo/info.xml index 08178c420..dc97c3fd6 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,5 +6,5 @@ <licence>AGPL</licence> <author>Alessandro Cosentino, Bernhard Posselt, Jan-Christoph Borchardt. Powered by SimplePie (Ryan Parman, Geoffrey Sneddon, Ryan McCue and contributors).</author> <version>1.808</version> - <require>5.0.6</require> + <require>6</require> </info> diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php index b7d095861..f347e9732 100644 --- a/tests/unit/db/FeedMapperTest.php +++ b/tests/unit/db/FeedMapperTest.php @@ -284,25 +284,8 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $pdoResult->expects($this->any()) ->method('fetchRow'); - $query = $this->getMock('Query', - array('execute')); - $query->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($arguments)) - ->will($this->returnValue($pdoResult)); - $this->api->expects($this->at(0)) - ->method('prepareQuery') - ->with($this->equalTo($sql)) - ->will(($this->returnValue($query))); - - $query->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($arguments2)) - ->will($this->returnValue($pdoResult)); - $this->api->expects($this->at(1)) - ->method('prepareQuery') - ->with($this->equalTo($sql2)) - ->will(($this->returnValue($query))); + $this->setMapperResult($sql, $arguments); + $this->setMapperResult($sql2, $arguments2); $this->mapper->delete($feed); diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php index 989f7a339..0ca53ad81 100644 --- a/tests/unit/db/FolderMapperTest.php +++ b/tests/unit/db/FolderMapperTest.php @@ -151,38 +151,9 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { '`items`.`feed_id` = `feeds`.`id` WHERE `feeds`.`id` IS NULL'; $arguments2 = array($folder->getId()); - $pdoResult = $this->getMock('Result', - array('fetchRow')); - $pdoResult->expects($this->any()) - ->method('fetchRow'); - - $query = $this->getMock('Query', - array('execute')); - $query->expects($this->at(0)) - ->method('execute') - ->with($this->equalTo($arguments)) - ->will($this->returnValue($pdoResult)); - $this->api->expects($this->at(0)) - ->method('prepareQuery') - ->with($this->equalTo($sql)) - ->will(($this->returnValue($query))); - - $query->expects($this->at(1)) - ->method('execute') - ->with($this->equalTo($arguments2)) - ->will($this->returnValue($pdoResult)); - $this->api->expects($this->at(1)) - ->method('prepareQuery') - ->with($this->equalTo($sql2)) - ->will(($this->returnValue($query))); - - $query->expects($this->at(2)) - ->method('execute') - ->will($this->returnValue($pdoResult)); - $this->api->expects($this->at(2)) - ->method('prepareQuery') - ->with($this->equalTo($sql3)) - ->will(($this->returnValue($query))); + $this->setMapperResult($sql, $arguments); + $this->setMapperResult($sql2, $arguments2); + $this->setMapperResult($sql3); $this->folderMapper->delete($folder); } diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php index a2df2178a..a13f7d58d 100644 --- a/tests/unit/db/ItemMapperTest.php +++ b/tests/unit/db/ItemMapperTest.php @@ -368,39 +368,8 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { 'ORDER BY `id` ASC'; $params2 = array($status, 30); - - $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), $this->equalTo(1)) - ->will($this->returnValue($query2)); + $this->setMapperResult($sql1, $params1, array($row)); + $this->setMapperResult($sql2, $params2); $result = $this->mapper->deleteReadOlderThanThreshold($threshold); } diff --git a/tests/unit/db/postgres/ItemMapperTest.php b/tests/unit/db/postgres/ItemMapperTest.php index 0dad0471a..1e3207387 100644 --- a/tests/unit/db/postgres/ItemMapperTest.php +++ b/tests/unit/db/postgres/ItemMapperTest.php @@ -157,38 +157,8 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $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)); + $this->setMapperResult($sql1, $params1, array($row)); + $this->setMapperResult($sql2, $params2); $result = $this->mapper->deleteReadOlderThanThreshold($threshold); } |