From 242555e659d4c03f46bc95a7437456718f1b6706 Mon Sep 17 00:00:00 2001 From: Bernhard Posselt Date: Fri, 24 May 2013 17:15:51 +0200 Subject: fixed a bug when deleting folders --- tests/unit/db/FolderMapperTest.php | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'tests') diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php index d31a014a6..d065b9cbc 100644 --- a/tests/unit/db/FolderMapperTest.php +++ b/tests/unit/db/FolderMapperTest.php @@ -144,10 +144,11 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `id` = ?'; $arguments = array($folder->getId()); - $sql2 = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?; '. - 'DELETE `items` FROM `*PREFIX*news_items` `items` '. + $sql2 = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?'; + + $sql3 = 'DELETE `items` FROM `*PREFIX*news_items` `items` '. 'LEFT JOIN `*PREFIX*news_feeds` `feeds` ON '. - '`items`.`feed_id` = `feed`.`id` WHERE `feeds`.`id` IS NULL;'; + '`items`.`feed_id` = `feeds`.`id` WHERE `feeds`.`id` IS NULL'; $arguments2 = array($folder->getId()); $pdoResult = $this->getMock('Result', @@ -175,6 +176,14 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { ->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->folderMapper->delete($folder); } -- cgit v1.2.3