diff options
author | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-21 21:10:45 +0200 |
---|---|---|
committer | Bernhard Posselt <nukeawhale@gmail.com> | 2013-05-21 21:10:45 +0200 |
commit | 031ba0ce524f35c70b776173917ae4ce3819951e (patch) | |
tree | a54c45c0e9b9412ae7970034e7621115dce714c8 /tests/unit/db | |
parent | 284d428111d03c16561c15dc98daaab802d2cac4 (diff) |
When creating a feed or folder the it should purge the deleted
Edit
fix #176
Diffstat (limited to 'tests/unit/db')
-rw-r--r-- | tests/unit/db/FeedMapperTest.php | 16 | ||||
-rw-r--r-- | tests/unit/db/FolderMapperTest.php | 17 |
2 files changed, 31 insertions, 2 deletions
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php index 6894e16d0..460156e5c 100644 --- a/tests/unit/db/FeedMapperTest.php +++ b/tests/unit/db/FeedMapperTest.php @@ -289,7 +289,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $deleteOlderThan = 110; $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . 'WHERE `deleted_at` > 0 ' . - 'AND `deleted_at` < ?'; + 'AND `deleted_at` < ? '; $this->setMapperResult($sql, array($deleteOlderThan), $rows); $result = $this->mapper->getToDelete($deleteOlderThan); @@ -314,4 +314,18 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { } + public function testGetAllPurgeDeletedFromUser(){ + $rows = array( + array('id' => $this->feeds[0]->getId()), + array('id' => $this->feeds[1]->getId()) + ); + $deleteOlderThan = 110; + $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' . + 'WHERE `deleted_at` > 0 ' . + 'AND `user_id` = ?'; + $this->setMapperResult($sql, array($this->user), $rows); + $result = $this->mapper->getToDelete(null, $this->user); + + $this->assertEquals($this->feeds, $result); + } } diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php index 87726b893..d31a014a6 100644 --- a/tests/unit/db/FolderMapperTest.php +++ b/tests/unit/db/FolderMapperTest.php @@ -187,7 +187,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { $deleteOlderThan = 110; $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . 'WHERE `deleted_at` > 0 ' . - 'AND `deleted_at` < ?'; + 'AND `deleted_at` < ? '; $this->setMapperResult($sql, array($deleteOlderThan), $rows); $result = $this->folderMapper->getToDelete($deleteOlderThan); @@ -213,4 +213,19 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility { } + public function testGetAllPurgeDeletedUser(){ + $rows = array( + array('id' => $this->folders[0]->getId()), + array('id' => $this->folders[1]->getId()) + ); + $deleteOlderThan = 110; + $sql = 'SELECT * FROM `*PREFIX*news_folders` ' . + 'WHERE `deleted_at` > 0 ' . + 'AND `user_id` = ?'; + $this->setMapperResult($sql, array($this->user), $rows); + $result = $this->folderMapper->getToDelete(null, $this->user); + + $this->assertEquals($this->folders, $result); + } + }
\ No newline at end of file |