diff options
| author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-24 17:15:51 +0200 |
|---|---|---|
| committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-24 17:15:51 +0200 |
| commit | 242555e659d4c03f46bc95a7437456718f1b6706 (patch) | |
| tree | af4086281cb0ed4b76964690eeb15f9e20c8525c /tests | |
| parent | 37b48d2aef2b82db461c8227b78e01c5cdd8e9c1 (diff) | |
fixed a bug when deleting folders
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/unit/db/FolderMapperTest.php | 15 |
1 files changed, 12 insertions, 3 deletions
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); } |