use a deleted flag for deleted feeds to handle undo

8 files changed, 392 insertions, 65 deletions

diff --git a/tests/unit/businesslayer/FeedBusinessLayerTest.php b/tests/unit/businesslayer/FeedBusinessLayerTest.php
index 34a6030e4..882106693 100644
--- a/tests/unit/businesslayer/FeedBusinessLayerTest.php
+++ b/tests/unit/businesslayer/FeedBusinessLayerTest.php
@@ -38,8 +38,8 @@ use \OCA\News\Utility\ImportParser;
 
 class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
-	private $mapper;
-	private $businessLayer;
+	private $feedMapper;
+	private $feedBusinessLayer;
 	private $user;
 	private $response;
 	private $fetcher;
@@ -47,10 +47,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 	private $threshold;
 	private $time;
 	private $importParser;
+	private $autoPurgeMinimumInterval;
 
 	protected function setUp(){
 		$this->api = $this->getAPIMock();
 		$this->time = 222;
+		$this->autoPurgeMinimumInterval = 10;
 		$timeFactory = $this->getMockBuilder(
 			'\OCA\AppFramework\Utility\TimeFactory')
 			->disableOriginalConstructor()
@@ -58,7 +60,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$timeFactory->expects($this->any())
 			->method('getTime')
 			->will($this->returnValue($this->time));
-		$this->mapper = $this->getMockBuilder('\OCA\News\Db\FeedMapper')
+		$this->feedMapper = $this->getMockBuilder('\OCA\News\Db\FeedMapper')
 			->disableOriginalConstructor()
 			->getMock();
 		$this->fetcher = $this->getMockBuilder('\OCA\News\Utility\Fetcher')
@@ -70,21 +72,21 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->importParser = $this->getMockBuilder('\OCA\News\Utility\ImportParser')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->businessLayer = new FeedBusinessLayer($this->mapper, 
+		$this->feedBusinessLayer = new FeedBusinessLayer($this->feedMapper, 
 			$this->fetcher, $this->itemMapper, $this->api,
-			$timeFactory, $this->importParser);
+			$timeFactory, $this->importParser, $this->autoPurgeMinimumInterval);
 		$this->user = 'jack';
 		$response = 'hi';
 	}
 
 
 	public function testFindAll(){
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('findAllFromUser')
 			->with($this->equalTo($this->user))
 			->will($this->returnValue($this->response));
 
-		$result = $this->businessLayer->findAll($this->user);
+		$result = $this->feedBusinessLayer->findAll($this->user);
 		$this->assertEquals($this->response, $result);
 	}
 
@@ -98,7 +100,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->api->expects($this->once())
 			->method('getTrans')
 			->will($this->returnValue($trans));
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('findByUrlHash')
 			->with($this->equalTo(md5($url)), $this->equalTo($this->user))
 			->will($this->throwException(new DoesNotExistException('yo')));
@@ -107,7 +109,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->with($this->equalTo($url))
 			->will($this->throwException($ex));
 		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->businessLayer->create($url, 1, $this->user);
+		$this->feedBusinessLayer->create($url, 1, $this->user);
 	}
 
 	public function testCreate(){
@@ -125,7 +127,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			array($item1, $item2)
 		);
 
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('findByUrlHash')
 			->with($this->equalTo(md5($url)), $this->equalTo($this->user))
 			->will($this->throwException($ex));
@@ -133,7 +135,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('fetch')
 			->with($this->equalTo($url))
 			->will($this->returnValue($return));
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('insert')
 			->with($this->equalTo($createdFeed))
 			->will($this->returnValue($createdFeed));
@@ -158,7 +160,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('insert')
 			->with($this->equalTo($return[1][0]));
 		
-		$feed = $this->businessLayer->create($url, $folderId, $this->user);
+		$feed = $this->feedBusinessLayer->create($url, $folderId, $this->user);
 
 		$this->assertEquals($feed->getFolderId(), $folderId);
 		$this->assertEquals($feed->getUrl(), $url);
@@ -180,7 +182,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			array($item1, $item2)
 		);
 
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('findByUrlHash')
 			->with($this->equalTo(md5($url)), $this->equalTo($this->user))
 			->will($this->throwException($ex));
@@ -188,7 +190,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('fetch')
 			->with($this->equalTo($url))
 			->will($this->returnValue($return));
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('insert')
 			->with($this->equalTo($createdFeed))
 			->will($this->returnValue($createdFeed));
@@ -209,7 +211,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 				$this->equalTo($item1->getFeedId()),
 				$this->equalTo($this->user));
 		
-		$feed = $this->businessLayer->create($url, $folderId, $this->user);
+		$feed = $this->feedBusinessLayer->create($url, $folderId, $this->user);
 
 		$this->assertEquals($feed->getFolderId(), $folderId);
 		$this->assertEquals($feed->getUrl(), $url);
@@ -233,7 +235,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$fetchReturn = array($feed, $items);
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
@@ -251,12 +253,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('insert')
 			->with($this->equalTo($items[0]));
 
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 	}
@@ -276,7 +278,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$fetchReturn = array($feed, $items);
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
@@ -295,12 +297,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->itemMapper->expects($this->never())
 			->method('delete');
 		
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 	}
@@ -323,7 +325,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$fetchReturn = array($feed, $items);
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 				$this->equalTo($this->user))
@@ -342,12 +344,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->itemMapper->expects($this->never())
 			->method('delete');
 
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 	}
@@ -369,7 +371,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$fetchReturn = array($feed, $items);
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 				$this->equalTo($this->user))
@@ -388,12 +390,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->itemMapper->expects($this->never())
 			->method('delete');
 
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 	}
@@ -415,7 +417,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$fetchReturn = array($feed, $items);
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
@@ -436,12 +438,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('insert')
 			->with($this->equalTo($item));
 		
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 		$this->assertTrue($item->isUnread());
@@ -454,7 +456,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->getUrl('test');
 		$ex = new FetcherException('');
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
@@ -465,12 +467,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->api->expects($this->any())
 			->method('log');
 		
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($feed->getId(), $this->user)
 			->will($this->returnValue($feed));
 
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 
 		$this->assertEquals($return, $feed);
 	}
@@ -483,14 +485,14 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		
 		$ex = new DoesNotExistException('');
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
 			->will($this->throwException($ex));
 
 		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 	}
 
 	
@@ -513,7 +515,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$fetchReturn = array($feed, $items);
 		$ex = new DoesNotExistException('');
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
@@ -528,14 +530,14 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 					$this->equalTo($this->user))
 			->will($this->returnValue($item2));;
 	
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('find')
 			->with($this->equalTo($feed->getId()),
 					$this->equalTo($this->user))
 			->will($this->throwException($ex));
 
 		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$return = $this->businessLayer->update($feed->getId(), $this->user);
+		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
 	}
 
 
@@ -547,7 +549,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setId($feedId);
 		$feed->setPreventUpdate(true);
 
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('find')
 			->with($this->equalTo($feedId), 
 				$this->equalTo($this->user))
@@ -555,7 +557,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->fetcher->expects($this->never())
 			->method('fetch');
 
-		$this->businessLayer->update($feedId, $this->user);
+		$this->feedBusinessLayer->update($feedId, $this->user);
 	}
 
 
@@ -566,16 +568,16 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 		$feed->setFolderId(16);
 		$feed->setId($feedId);
 
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('find')
 			->with($this->equalTo($feedId), $this->equalTo($this->user))
 			->will($this->returnValue($feed));
 
-		$this->mapper->expects($this->once())
+		$this->feedMapper->expects($this->once())
 			->method('update')
 			->with($this->equalTo($feed));
 
-		$this->businessLayer->move($feedId, $folderId, $this->user);
+		$this->feedBusinessLayer->move($feedId, $folderId, $this->user);
 
 		$this->assertEquals($folderId, $feed->getFolderId());
 	}
@@ -597,15 +599,15 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$items = array(new Item());
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('findByUrlHash')
 			->with($this->equalTo($urlHash),
 				$this->equalTo($this->user))
 			->will($this->throwException(new DoesNotExistException('hi')));
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('insert')
 			->will($this->returnValue($feed));
-		$this->mapper->expects($this->at(2))
+		$this->feedMapper->expects($this->at(2))
 			->method('findByUrlHash')
 			->with($this->equalTo($urlHash),
 				$this->equalTo($this->user))
@@ -619,7 +621,7 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('insert');
 
 
-		$result = $this->businessLayer->importGoogleReaderJSON(array(), $this->user);
+		$result = $this->feedBusinessLayer->importGoogleReaderJSON(array(), $this->user);
 
 		$this->assertEquals($feed, $result);
 	}
@@ -649,12 +651,12 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
 		$in = array();
 
-		$this->mapper->expects($this->at(0))
+		$this->feedMapper->expects($this->at(0))
 			->method('findByUrlHash')
 			->with($this->equalTo($urlHash),
 				$this->equalTo($this->user))
 			->will($this->returnValue($feed));
-		$this->mapper->expects($this->at(1))
+		$this->feedMapper->expects($this->at(1))
 			->method('findByUrlHash')
 			->with($this->equalTo($urlHash),
 				$this->equalTo($this->user))
@@ -673,10 +675,69 @@ class FeedBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 			->method('insert')
 			->with($this->equalTo($savedItem));
 
-		$result = $this->businessLayer->importGoogleReaderJSON($in, $this->user);
+		$result = $this->feedBusinessLayer->importGoogleReaderJSON($in, $this->user);
 
 		$this->assertEquals($feed, $result);
 	}
 
 
+	public function testMarkDeleted() {
+		$id = 3;
+		$feed = new Feed();
+		$feed2 = new Feed();
+		$feed2->setDeletedAt($this->time);
+
+		$this->feedMapper->expects($this->once())
+			->method('find')
+			->with($this->equalTo($id), $this->equalTo($this->user))
+			->will($this->returnValue($feed));
+		$this->feedMapper->expects($this->once())
+			->method('update')
+			->with($this->equalTo($feed2));
+
+		$this->feedBusinessLayer->markDeleted($id, $this->user);
+	}
+
+
+	public function testUnmarkDeleted() {
+		$id = 3;
+		$feed = new Feed();
+		$feed2 = new Feed();
+		$feed2->setDeletedAt(0);
+
+		$this->feedMapper->expects($this->once())
+			->method('find')
+			->with($this->equalTo($id), $this->equalTo($this->user))
+			->will($this->returnValue($feed));
+		$this->feedMapper->expects($this->once())
+			->method('update')
+			->with($this->equalTo($feed2));
+
+		$this->feedBusinessLayer->unmarkDeleted($id, $this->user);
+	}
+
+
+	public function testPurgeDeleted(){
+		$feed1 = new Feed();
+		$feed1->setId(3);
+		$feed2 = new Feed();
+		$feed2->setId(5);
+		$feeds = array($feed1, $feed2);
+
+		$time = $this->time - $this->autoPurgeMinimumInterval;
+		$this->feedMapper->expects($this->once())
+			->method('getToDelete')
+			->with($this->equalTo($time), $this->equalTo($this->user))
+			->will($this->returnValue($feeds));
+		$this->feedMapper->expects($this->at(1))
+			->method('delete')
+			->with($this->equalTo($feed1));
+		$this->feedMapper->expects($this->at(2))
+			->method('delete')
+			->with($this->equalTo($feed2));
+
+		$this->feedBusinessLayer->purgeDeleted($this->user);
+	}
+
+
 }
diff --git a/tests/unit/businesslayer/FolderBusinessLayerTest.php b/tests/unit/businesslayer/FolderBusinessLayerTest.php
index ad4e188e4..1e26f0226 100644
--- a/tests/unit/businesslayer/FolderBusinessLayerTest.php
+++ b/tests/unit/businesslayer/FolderBusinessLayerTest.php
@@ -33,17 +33,31 @@ use \OCA\News\Db\Folder;
 
 class FolderBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 
-	protected $api;
-	protected $folderMapper;
-	protected $folderBusinessLayer;
+	private $folderMapper;
+	private $folderBusinessLayer;
+	private $time;
+	private $user;
+	private $autoPurgeMinimumInterval;
 
 	protected function setUp(){
 		$this->api = $this->getAPIMock();
+		$this->time = 222;
+		$timeFactory = $this->getMockBuilder(
+			'\OCA\AppFramework\Utility\TimeFactory')
+			->disableOriginalConstructor()
+			->getMock();
+		$timeFactory->expects($this->any())
+			->method('getTime')
+			->will($this->returnValue($this->time));
 		$this->folderMapper = $this->getMockBuilder(
 			'\OCA\News\Db\FolderMapper')
 			->disableOriginalConstructor()
 			->getMock();
-		$this->folderBusinessLayer = new FolderBusinessLayer($this->folderMapper, $this->api);
+		$this->autoPurgeMinimumInterval = 10;
+		$this->folderBusinessLayer = new FolderBusinessLayer(
+			$this->folderMapper, $this->api, $timeFactory, 
+			$this->autoPurgeMinimumInterval);
+		$this->user = 'hi';
 	}
 
 
@@ -161,4 +175,61 @@ class FolderBusinessLayerTest extends \OCA\AppFramework\Utility\TestUtility {
 	}
 
 
+	public function testMarkDeleted() {
+		$id = 3;
+		$folder = new Folder();
+		$folder2 = new Folder();
+		$folder2->setDeletedAt($this->time);
+
+		$this->folderMapper->expects($this->once())
+			->method('find')
+			->with($this->equalTo($id), $this->equalTo($this->user))
+			->will($this->returnValue($folder));
+		$this->folderMapper->expects($this->once())
+			->method('update')
+			->with($this->equalTo($folder2));
+
+		$this->folderBusinessLayer->markDeleted($id, $this->user);
+	}
+
+
+	public function testUnmarkDeleted() {
+		$id = 3;
+		$folder = new Folder();
+		$folder2 = new Folder();
+		$folder2->setDeletedAt(0);
+
+		$this->folderMapper->expects($this->once())
+			->method('find')
+			->with($this->equalTo($id), $this->equalTo($this->user))
+			->will($this->returnValue($folder));
+		$this->folderMapper->expects($this->once())
+			->method('update')
+			->with($this->equalTo($folder2));
+
+		$this->folderBusinessLayer->unmarkDeleted($id, $this->user);
+	}
+
+	public function testPurgeDeleted(){
+		$folder1 = new Folder();
+		$folder1->setId(3);
+		$folder2 = new Folder();
+		$folder2->setId(5);
+		$feeds = array($folder1, $folder2);
+
+		$time = $this->time - $this->autoPurgeMinimumInterval;
+		$this->folderMapper->expects($this->once())
+			->method('getToDelete')
+			->with($this->equalTo($time), $this->equalTo($this->user))
+			->will($this->returnValue($feeds));
+		$this->folderMapper->expects($this->at(1))
+			->method('delete')
+			->with($this->equalTo($folder1));
+		$this->folderMapper->expects($this->at(2))
+			->method('delete')
+			->with($this->equalTo($folder2));
+
+		$this->folderBusinessLayer->purgeDeleted($this->user);
+	}
+
 }
diff --git a/tests/unit/controller/FeedControllerTest.php b/tests/unit/controller/FeedControllerTest.php
index c89d432d6..841ba5ea2 100644
--- a/tests/unit/controller/FeedControllerTest.php
+++ b/tests/unit/controller/FeedControllerTest.php
@@ -111,6 +111,11 @@ class FeedControllerTest extends ControllerTestUtility {
 	}
 
 
+	public function testRestoreAnnotations(){
+		$this->assertFeedControllerAnnotations('restore');
+	}
+
+
 	public function testUpdateAnnotations(){
 		$this->assertFeedControllerAnnotations('update');
 	}
@@ -311,7 +316,9 @@ class FeedControllerTest extends ControllerTestUtility {
 		$this->itemBusinessLayer->expects($this->once())
 			->method('getNewestItemId')
 			->will($this->returnValue($result['newestItemId']));
-
+		$this->feedBusinessLayer->expects($this->once())
+			->method('purgeDeleted')
+			->with($this->equalTo($this->user));
 		$this->feedBusinessLayer->expects($this->once())
 			->method('create')
 			->with($this->equalTo($post['url']),
@@ -340,6 +347,9 @@ class FeedControllerTest extends ControllerTestUtility {
 		$this->api->expects($this->once())
 			->method('getUserId')
 			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('purgeDeleted')
+			->with($this->equalTo($this->user));
 
 		$this->itemBusinessLayer->expects($this->once())
 			->method('getNewestItemId')
@@ -362,6 +372,12 @@ class FeedControllerTest extends ControllerTestUtility {
 	public function testCreateReturnsErrorForInvalidCreate(){
 		$msg = 'except';
 		$ex = new BusinessLayerException($msg);
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('purgeDeleted')
+			->with($this->equalTo($this->user));
 		$this->feedBusinessLayer->expects($this->once())
 			->method('create')
 			->will($this->throwException($ex));
@@ -385,7 +401,7 @@ class FeedControllerTest extends ControllerTestUtility {
 			->method('getUserId')
 			->will($this->returnValue($this->user));
 		$this->feedBusinessLayer->expects($this->once())
-			->method('delete')
+			->method('markDeleted')
 			->with($this->equalTo($url['feedId']));
 
 		$response = $this->controller->delete();
@@ -404,7 +420,7 @@ class FeedControllerTest extends ControllerTestUtility {
 			->method('getUserId')
 			->will($this->returnValue($this->user));
 		$this->feedBusinessLayer->expects($this->once())
-			->method('delete')
+			->method('markDeleted')
 			->will($this->throwException(new BusinessLayerException($msg)));
 
 		$response = $this->controller->delete();
@@ -583,4 +599,45 @@ class FeedControllerTest extends ControllerTestUtility {
 		$this->assertEquals($expected, $response->getParams());
 	}
 
+
+	public function testRestore() {
+		$url = array(
+				'feedId' => 4
+		);
+		$this->controller = $this->getPostController(array(), $url);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('unmarkDeleted')
+			->with($this->equalTo($url['feedId']));
+
+		$response = $this->controller->restore();
+		$this->assertTrue($response instanceof JSONResponse);		
+	}
+
+
+	public function testRestoreDoesNotExist(){
+		$url = array(
+				'feedId' => 4
+		);
+		$msg = 'hehe';
+		$this->controller = $this->getPostController(array(), $url);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('unmarkDeleted')
+			->will($this->throwException(new BusinessLayerException($msg)));
+
+		$response = $this->controller->restore();
+		$params = json_decode($response->render(), true);
+
+		$this->assertEquals('error', $params['status']);
+		$this->assertEquals($msg, $params['msg']);
+		$this->assertTrue($response instanceof JSONResponse);
+	}
+
 }
\ No newline at end of file
diff --git a/tests/unit/controller/FolderControllerTest.php b/tests/unit/controller/FolderControllerTest.php
index 30edf737f..64df7dc16 100644
--- a/tests/unit/controller/FolderControllerTest.php
+++ b/tests/unit/controller/FolderControllerTest.php
@@ -118,6 +118,11 @@ class FolderControllerTest extends ControllerTestUtility {
 	}
 
 
+	public function testRestoreAnnotations(){
+		$this->assertFolderControllerAnnotations('restore');
+	}
+
+
 	public function testRenameAnnotations(){
 		$this->assertFolderControllerAnnotations('rename');
 	}
@@ -234,6 +239,9 @@ class FolderControllerTest extends ControllerTestUtility {
 			->method('getUserId')
 			->will($this->returnValue($this->user));
 		$this->folderBusinessLayer->expects($this->once())
+			->method('purgeDeleted')
+			->with($this->equalTo($this->user));
+		$this->folderBusinessLayer->expects($this->once())
 			->method('create')
 			->with($this->equalTo($post['folderName']), 
 				$this->equalTo($this->user))
@@ -249,6 +257,12 @@ class FolderControllerTest extends ControllerTestUtility {
 	public function testCreateReturnsErrorForInvalidCreate(){
 		$msg = 'except';
 		$ex = new BusinessLayerExistsException($msg);
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('purgeDeleted')
+			->with($this->equalTo($this->user));
 		$this->folderBusinessLayer->expects($this->once())
 			->method('create')
 			->will($this->throwException($ex));
@@ -270,7 +284,7 @@ class FolderControllerTest extends ControllerTestUtility {
 			->method('getUserId')
 			->will($this->returnValue($this->user));
 		$this->folderBusinessLayer->expects($this->once())
-			->method('delete')
+			->method('markDeleted')
 			->with($this->equalTo($url['folderId']), 
 				$this->equalTo($this->user));
 		
@@ -288,7 +302,7 @@ class FolderControllerTest extends ControllerTestUtility {
 			->method('getUserId')
 			->will($this->returnValue($this->user));
 		$this->folderBusinessLayer->expects($this->once())
-			->method('delete')
+			->method('markDeleted')
 			->will($this->throwException(new BusinessLayerException($this->msg)));
 		
 		$response = $this->controller->delete();
@@ -373,4 +387,43 @@ class FolderControllerTest extends ControllerTestUtility {
 		$this->assertEquals($expected, $response->getParams());
 	}
 
+
+	public function testRestore(){
+		$url = array('folderId' => 5);
+		$this->controller = $this->getPostController(array(), $url);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('unmarkDeleted')
+			->with($this->equalTo($url['folderId']), 
+				$this->equalTo($this->user));
+		
+		$response = $this->controller->restore();
+
+		$this->assertTrue($response instanceof JSONResponse);	
+	}
+
+
+	public function testRestoreDoesNotExist(){
+		$url = array('folderId' => 5);
+		$this->controller = $this->getPostController(array(), $url);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('unmarkDeleted')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+		
+		$response = $this->controller->restore();
+
+		$params = json_decode($response->render(), true);
+
+		$this->assertEquals('error', $params['status']);
+		$this->assertEquals($this->msg, $params['msg']);
+		$this->assertTrue($response instanceof JSONResponse);
+	}
+
 }
\ No newline at end of file
diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
index 1f8d08ef8..8f7d139e1 100644
--- a/tests/unit/db/FeedMapperTest.php
+++ b/tests/unit/db/FeedMapperTest.php
@@ -146,6 +146,7 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 				'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' . 
 				StatusFlag::UNREAD . ' ' .
 			'WHERE `feeds`.`user_id` = ? ' .
+			'AND `feeds`.`deleted_at` = 0 ' .
 			'GROUP BY `feeds`.`id`';
 		
 		$this->setMapperResult($sql, 
@@ -260,6 +261,37 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 	}
 
 
+	public function testGetPurgeDeleted(){
+		$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 `deleted_at` < ?';
+		$this->setMapperResult($sql, array($deleteOlderThan), $rows);
+		$result = $this->mapper->getToDelete($deleteOlderThan);
+
+		$this->assertEquals($this->feeds, $result);
+	}
 	
 
+	public function testGetPurgeDeletedFromUser(){
+		$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 `deleted_at` < ? ' .
+			'AND `user_id` = ?';
+		$this->setMapperResult($sql, array($deleteOlderThan, $this->user), $rows);
+		$result = $this->mapper->getToDelete($deleteOlderThan, $this->user);
+
+		$this->assertEquals($this->feeds, $result);
+	}
+
+	
 }
\ No newline at end of file
diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php
index 57eff63a4..87726b893 100644
--- a/tests/unit/db/FolderMapperTest.php
+++ b/tests/unit/db/FolderMapperTest.php
@@ -32,6 +32,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 
 	private $folderMapper;
 	private $folders;
+	private $user;
 	
 	protected function setUp(){
 		$this->beforeEach();
@@ -46,6 +47,7 @@ class FolderMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 			$folder1,
 			$folder2
 		);