move autopurge to itembl

4 files changed, 52 insertions, 48 deletions

diff --git a/tests/bl/FeedBlTest.php b/tests/bl/FeedBlTest.php
index 5ad02e789..ae0414614 100644
--- a/tests/bl/FeedBlTest.php
+++ b/tests/bl/FeedBlTest.php
@@ -50,7 +50,6 @@ class FeedBlTest extends \OCA\AppFramework\Utility\TestUtility {
 	private $threshold;
 
 	protected function setUp(){
-		$this->threshold = 2;
 		$this->api = $this->getAPIMock();
 		$this->mapper = $this->getMockBuilder('\OCA\News\Db\FeedMapper')
 			->disableOriginalConstructor()
@@ -62,8 +61,7 @@ class FeedBlTest extends \OCA\AppFramework\Utility\TestUtility {
 			->disableOriginalConstructor()
 			->getMock();
 		$this->bl = new FeedBl($this->mapper, 
-			$this->fetcher, $this->itemMapper, $this->api,
-			$this->threshold);
+			$this->fetcher, $this->itemMapper, $this->api);
 		$this->user = 'jack';
 		$response = 'hi';
 
@@ -305,23 +303,6 @@ class FeedBlTest extends \OCA\AppFramework\Utility\TestUtility {
 	}
 
 
-	public function testAutoPurgeOldWillPurgeOld(){
-		$feed = new Feed();
-		$feed->setId(3);
-		$unread = array(
-			new Feed(), $feed
-		);
-		$this->mapper->expects($this->once())
-			->method('getReadOlderThanThreshold')
-			->with($this->equalTo($this->threshold))
-			->will($this->returnValue($unread));
-		$this->mapper->expects($this->once())
-			->method('deleteReadOlderThanId')
-			->with($this->equalTo($feed->getId()));
-
-		$result = $this->bl->autoPurgeOld();
-
-	}
 
 }
 
diff --git a/tests/bl/ItemBlTest.php b/tests/bl/ItemBlTest.php
index dc8f46a2c..40d922528 100644
--- a/tests/bl/ItemBlTest.php
+++ b/tests/bl/ItemBlTest.php
@@ -55,7 +55,8 @@ class ItemBlTest extends \OCA\AppFramework\Utility\TestUtility {
 		$statusFlag->expects($this->any())
 			->method('typeToStatus')
 			->will($this->returnValue($this->status));
-		$this->bl = new ItemBl($this->mapper, $statusFlag);
+		$this->threshold = 2;
+		$this->bl = new ItemBl($this->mapper, $statusFlag, $this->threshold);
 		$this->user = 'jack';
 		$response = 'hi';
 		$this->id = 3;
@@ -245,6 +246,26 @@ class ItemBlTest extends \OCA\AppFramework\Utility\TestUtility {
 		$this->bl->readFeed($feedId, $highestItemId, $this->user);
 	}
 
+
+	public function testAutoPurgeOldWillPurgeOld(){
+		$item = new Item();
+		$item->setId(3);
+		$unread = array(
+			new Item(), $item
+		);
+		$this->mapper->expects($this->once())
+			->method('getReadOlderThanThreshold')
+			->with($this->equalTo($this->threshold))
+			->will($this->returnValue($unread));
+		$this->mapper->expects($this->once())
+			->method('deleteReadOlderThanId')
+			->with($this->equalTo($item->getId()));
+
+		$result = $this->bl->autoPurgeOld();
+
+	}
+
+
 }
 
 
diff --git a/tests/db/FeedMapperTest.php b/tests/db/FeedMapperTest.php
index 58a683836..d7163be30 100644
--- a/tests/db/FeedMapperTest.php
+++ b/tests/db/FeedMapperTest.php
@@ -249,32 +249,6 @@ class FeedMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 	}
 
 
-	public function testGetReadOlderThanThreshold(){
-		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
-		$sql = 'SELECT * FROM `*PREFIX*news_items` ' .
-			'WHERE NOT ((`status` & ?) > 0)';
-		$threshold = 10;
-		$feed = new Feed();
-		$feed->setId(30);
-		$rows = array(array('id' => 30));
-		$params = array($status);
-
-		$this->setMapperResult($sql, $params, $rows);
-		$result = $this->mapper->getReadOlderThanThreshold($threshold);
-
-		$this->assertEquals($feed->getId(), $result[0]->getId());
-	}
-
-
-	public function testDeleteReadOlderThanId(){
-		$id = 10;
-		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
-		$sql = 'DELETE FROM `*PREFIX*news_items` WHERE `id` < ? ' .
-			'AND NOT ((`status` & ?) > 0)';
-		$params = array($id, $status);
-
-		$this->setMapperResult($sql, $params);
-		$this->mapper->deleteReadOlderThanId($id);
-	}
+	
 
 }
\ No newline at end of file
diff --git a/tests/db/ItemMapperTest.php b/tests/db/ItemMapperTest.php
index ea0feadd8..de9b2b4ac 100644
--- a/tests/db/ItemMapperTest.php
+++ b/tests/db/ItemMapperTest.php
@@ -262,4 +262,32 @@ class ItemMapperTest extends \OCA\AppFramework\Utility\MapperTestUtility {
 		$this->assertEquals($this->items[0], $result);
 	}
 
+
+	public function testGetReadOlderThanThreshold(){
+		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
+		$sql = 'SELECT * FROM `*PREFIX*news_items` ' .
+			'WHERE NOT ((`status` & ?) > 0)';
+		$threshold = 10;
+		$feed = new Feed();
+		$feed->setId(30);
+		$rows = array(array('id' => 30));
+		$params = array($status);
+
+		$this->setMapperResult($sql, $params, $rows);
+		$result = $this->mapper->getReadOlderThanThreshold($threshold);
+
+		$this->assertEquals($feed->getId(), $result[0]->getId());
+	}
+
+
+	public function testDeleteReadOlderThanId(){
+		$id = 10;
+		$status = StatusFlag::STARRED | StatusFlag::UNREAD;
+		$sql = 'DELETE FROM `*PREFIX*news_items` WHERE `id` < ? ' .
+			'AND NOT ((`status` & ?) > 0)';
+		$params = array($id, $status);
+
+		$this->setMapperResult($sql, $params);
+		$this->mapper->deleteReadOlderThanId($id);
+	}
 }
\ No newline at end of file