1 files changed, 348 insertions, 348 deletions

diff --git a/tests/unit/service/ItemServiceTest.php b/tests/unit/service/ItemServiceTest.php
index 03d644eb9..b9f23fee6 100644
--- a/tests/unit/service/ItemServiceTest.php
+++ b/tests/unit/service/ItemServiceTest.php
@@ -22,403 +22,403 @@ use \OCA\News\Db\FeedType;
 
 class ItemServiceTest extends \PHPUnit_Framework_TestCase {
 
-	private $mapper;
-	private $itemService;
-	private $user;
-	private $response;
-	private $status;
-	private $time;
-	private $newestItemId;
-
-
-	protected function setUp(){
-		$this->time = 222;
-		$timeFactory = $this->getMock('TimeFactory', ['getTime']);
-		$timeFactory->expects($this->any())
-			->method('getTime')
-			->will($this->returnValue($this->time));
-		$this->mapper = $this->getMockBuilder('\OCA\News\Db\ItemMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$statusFlag = $this->getMockBuilder('\OCA\News\Db\StatusFlag')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->status = StatusFlag::STARRED;
-		$statusFlag->expects($this->any())
-			->method('typeToStatus')
-			->will($this->returnValue($this->status));
-		$this->threshold = 2;
-		$config = $this->getMockBuilder(
-			'\OCA\News\Config\Config')
-			->disableOriginalConstructor()
-			->getMock();
-		$config->expects($this->any())
-			->method('getAutoPurgeCount')
-			->will($this->returnValue($this->threshold));
-		$this->itemService = new ItemService($this->mapper,
-			$statusFlag, $timeFactory, $config);
-		$this->user = 'jack';
-		$this->id = 3;
-		$this->updatedSince = 20333;
-		$this->showAll = true;
-		$this->offset = 5;
-		$this->limit = 20;
-		$this->newestItemId = 4;
-	}
-
-
-	public function testFindAllNewFeed(){
-		$type = FeedType::FEED;
-		$this->mapper->expects($this->once())
-			->method('findAllNewFeed')
-			->with($this->equalTo($this->id),
-					$this->equalTo($this->updatedSince),
-					$this->equalTo($this->status),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAllNew(
-			$this->id, $type, $this->updatedSince, $this->showAll,
-			$this->user);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testFindAllNewFolder(){
-		$type = FeedType::FOLDER;
-		$this->mapper->expects($this->once())
-			->method('findAllNewFolder')
-			->with($this->equalTo($this->id),
-					$this->equalTo($this->updatedSince),
-					$this->equalTo($this->status),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAllNew(
-			$this->id, $type, $this->updatedSince, $this->showAll,
-			$this->user);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testFindAllNew(){
-		$type = FeedType::STARRED;
-		$this->mapper->expects($this->once())
-			->method('findAllNew')
-			->with(	$this->equalTo($this->updatedSince),
-					$this->equalTo($this->status),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAllNew(
-			$this->id, $type, $this->updatedSince, $this->showAll,
-			$this->user);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testFindAllFeed(){
-		$type = FeedType::FEED;
-		$this->mapper->expects($this->once())
-			->method('findAllFeed')
-			->with($this->equalTo($this->id),
-					$this->equalTo($this->limit),
-					$this->equalTo($this->offset),
-					$this->equalTo($this->status),
-					$this->equalTo(false),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAll(
-			$this->id, $type, $this->limit, $this->offset,
-			$this->showAll, false, $this->user
-		);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testFindAllFolder(){
-		$type = FeedType::FOLDER;
-		$this->mapper->expects($this->once())
-			->method('findAllFolder')
-			->with($this->equalTo($this->id),
-					$this->equalTo($this->limit),
-					$this->equalTo($this->offset),
-					$this->equalTo($this->status),
-					$this->equalTo(true),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAll(
-			$this->id, $type, $this->limit, $this->offset,
-			$this->showAll, true, $this->user
-		);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testFindAll(){
-		$type = FeedType::STARRED;
-		$this->mapper->expects($this->once())
-			->method('findAll')
-			->with(	$this->equalTo($this->limit),
-					$this->equalTo($this->offset),
-					$this->equalTo($this->status),
-					$this->equalTo(true),
-					$this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->itemService->findAll(
-			$this->id, $type, $this->limit, $this->offset,
-			$this->showAll, true, $this->user
-		);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testStar(){
-		$itemId = 3;
-		$feedId = 5;
-		$guidHash = md5('hihi');
-
-		$item = new Item();
-		$item->setStatus(128);
-		$item->setId($itemId);
-		$item->setUnstarred();
-
-		$expectedItem = new Item();
-		$expectedItem->setStatus(128);
-		$expectedItem->setStarred();
-		$expectedItem->setId($itemId);
-		$expectedItem->setLastModified($this->time);
-
-		$this->mapper->expects($this->once())
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($guidHash),
-				$this->equalTo($feedId),
-				$this->equalTo($this->user))
-			->will($this->returnValue($item));
-
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($expectedItem));
-
-		$this->itemService->star($feedId, $guidHash, true, $this->user);
-
-		$this->assertTrue($item->isStarred());
-	}
-
-
-	public function testUnstar(){
-		$itemId = 3;
-		$feedId = 5;
-		$guidHash = md5('hihi');
-
-		$item = new Item();
-		$item->setStatus(128);
-		$item->setId($itemId);
-		$item->setStarred();
-
-		$expectedItem = new Item();
-		$expectedItem->setStatus(128);
-		$expectedItem->setUnstarred();
-		$expectedItem->setId($itemId);
-		$expectedItem->setLastModified($this->time);
-
-		$this->mapper->expects($this->once())
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($guidHash),
-				$this->equalTo($feedId),
-				$this->equalTo($this->user))
-			->will($this->returnValue($item));
-
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($expectedItem));
-
-		$this->itemService->star($feedId, $guidHash, false, $this->user);
-
-		$this->assertTrue($item->isUnstarred());
-	}
-
-	public function testUnread(){
-		$itemId = 3;
-		$item = new Item();
-		$item->setStatus(128);
-		$item->setId($itemId);
-		$item->setRead();
-
-		$expectedItem = new Item();
-		$expectedItem->setStatus(128);
-		$expectedItem->setUnread();
-		$expectedItem->setId($itemId);
-		$expectedItem->setLastModified($this->time);
+    private $mapper;
+    private $itemService;
+    private $user;
+    private $response;
+    private $status;
+    private $time;
+    private $newestItemId;
+
+
+    protected function setUp(){
+        $this->time = 222;
+        $timeFactory = $this->getMock('TimeFactory', ['getTime']);
+        $timeFactory->expects($this->any())
+            ->method('getTime')
+            ->will($this->returnValue($this->time));
+        $this->mapper = $this->getMockBuilder('\OCA\News\Db\ItemMapper')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $statusFlag = $this->getMockBuilder('\OCA\News\Db\StatusFlag')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $this->status = StatusFlag::STARRED;
+        $statusFlag->expects($this->any())
+            ->method('typeToStatus')
+            ->will($this->returnValue($this->status));
+        $this->threshold = 2;
+        $config = $this->getMockBuilder(
+            '\OCA\News\Config\Config')
+            ->disableOriginalConstructor()
+            ->getMock();
+        $config->expects($this->any())
+            ->method('getAutoPurgeCount')
+            ->will($this->returnValue($this->threshold));
+        $this->itemService = new ItemService($this->mapper,
+            $statusFlag, $timeFactory, $config);
+        $this->user = 'jack';
+        $this->id = 3;
+        $this->updatedSince = 20333;
+        $this->showAll = true;
+        $this->offset = 5;
+        $this->limit = 20;
+        $this->newestItemId = 4;
+    }
+
+
+    public function testFindAllNewFeed(){
+        $type = FeedType::FEED;
+        $this->mapper->expects($this->once())
+            ->method('findAllNewFeed')
+            ->with($this->equalTo($this->id),
+                    $this->equalTo($this->updatedSince),
+                    $this->equalTo($this->status),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAllNew(
+            $this->id, $type, $this->updatedSince, $this->showAll,
+            $this->user);
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testFindAllNewFolder(){
+        $type = FeedType::FOLDER;
+        $this->mapper->expects($this->once())
+            ->method('findAllNewFolder')
+            ->with($this->equalTo($this->id),
+                    $this->equalTo($this->updatedSince),
+                    $this->equalTo($this->status),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAllNew(
+            $this->id, $type, $this->updatedSince, $this->showAll,
+            $this->user);
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testFindAllNew(){
+        $type = FeedType::STARRED;
+        $this->mapper->expects($this->once())
+            ->method('findAllNew')
+            ->with( $this->equalTo($this->updatedSince),
+                    $this->equalTo($this->status),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAllNew(
+            $this->id, $type, $this->updatedSince, $this->showAll,
+            $this->user);
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testFindAllFeed(){
+        $type = FeedType::FEED;
+        $this->mapper->expects($this->once())
+            ->method('findAllFeed')
+            ->with($this->equalTo($this->id),
+                    $this->equalTo($this->limit),
+                    $this->equalTo($this->offset),
+                    $this->equalTo($this->status),
+                    $this->equalTo(false),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAll(
+            $this->id, $type, $this->limit, $this->offset,
+            $this->showAll, false, $this->user
+        );
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testFindAllFolder(){
+        $type = FeedType::FOLDER;
+        $this->mapper->expects($this->once())
+            ->method('findAllFolder')
+            ->with($this->equalTo($this->id),
+                    $this->equalTo($this->limit),
+                    $this->equalTo($this->offset),
+                    $this->equalTo($this->status),
+                    $this->equalTo(true),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAll(
+            $this->id, $type, $this->limit, $this->offset,
+            $this->showAll, true, $this->user
+        );
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testFindAll(){
+        $type = FeedType::STARRED;
+        $this->mapper->expects($this->once())
+            ->method('findAll')
+            ->with( $this->equalTo($this->limit),
+                    $this->equalTo($this->offset),
+                    $this->equalTo($this->status),
+                    $this->equalTo(true),
+                    $this->equalTo($this->user))
+            ->will($this->returnValue($this->response));
+
+        $result = $this->itemService->findAll(
+            $this->id, $type, $this->limit, $this->offset,
+            $this->showAll, true, $this->user
+        );
+        $this->assertEquals($this->response, $result);
+    }
+
+
+    public function testStar(){
+        $itemId = 3;
+        $feedId = 5;
+        $guidHash = md5('hihi');
+
+        $item = new Item();
+        $item->setStatus(128);
+        $item->setId($itemId);
+        $item->setUnstarred();
+
+        $expectedItem = new Item();
+        $expectedItem->setStatus(128);
+        $expectedItem->setStarred();
+        $expectedItem->setId($itemId);
+        $expectedItem->setLastModified($this->time);
+
+        $this->mapper->expects($this->once())
+            ->method('findByGuidHash')
+            ->with(
+                $this->equalTo($guidHash),
+                $this->equalTo($feedId),
+                $this->equalTo($this->user))
+            ->will($this->returnValue($item));
+
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($this->equalTo($expectedItem));
+
+        $this->itemService->star($feedId, $guidHash, true, $this->user);
+
+        $this->assertTrue($item->isStarred());
+    }
+
+
+    public function testUnstar(){
+        $itemId = 3;
+        $feedId = 5;
+        $guidHash = md5('hihi');
+
+        $item = new Item();
+        $item->setStatus(128);
+        $item->setId($itemId);
+        $item->setStarred();
+
+        $expectedItem = new Item();
+        $expectedItem->setStatus(128);
+        $expectedItem->setUnstarred();
+        $expectedItem->setId($itemId);
+        $expectedItem->setLastModified($this->time);
+
+        $this->mapper->expects($this->once())
+            ->method('findByGuidHash')
+            ->with(
+                $this->equalTo($guidHash),
+                $this->equalTo($feedId),
+                $this->equalTo($this->user))
+            ->will($this->returnValue($item));
+
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($this->equalTo($expectedItem));
+
+        $this->itemService->star($feedId, $guidHash, false, $this->user);
+
+        $this->assertTrue($item->isUnstarred());
+    }
+
+    public function testUnread(){
+        $itemId = 3;
+        $item = new Item();
+        $item->setStatus(128);
+        $item->setId($itemId);
+        $item->setRead();
+
+        $expectedItem = new Item();
+        $expectedItem->setStatus(128);
+        $expectedItem->setUnread();
+        $expectedItem->setId($itemId);
+        $expectedItem->setLastModified($this->time);
 
-		$this->mapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($itemId), $this->equalTo($this->user))
-			->will($this->returnValue($item));
+        $this->mapper->expects($this->once())
+            ->method('find')
+            ->with($this->equalTo($itemId), $this->equalTo($this->user))
+            ->will($this->returnValue($item));
 
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($expectedItem));
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($this->equalTo($expectedItem));
 
-		$this->itemService->read($itemId, false, $this->user);
+        $this->itemService->read($itemId, false, $this->user);
 
-		$this->assertTrue($item->isUnread());
-	}
+        $this->assertTrue($item->isUnread());
+    }
 
 
-	public function testRead(){
-		$itemId = 3;
-		$item = new Item();
-		$item->setStatus(128);
-		$item->setId($itemId);
-		$item->setUnread();
+    public function testRead(){
+        $itemId = 3;
+        $item = new Item();
+        $item->setStatus(128);
+        $item->setId($itemId);
+        $item->setUnread();
 
-		$expectedItem = new Item();
-		$expectedItem->setStatus(128);
-		$expectedItem->setRead();
-		$expectedItem->setId($itemId);
-		$expectedItem->setLastModified($this->time);
+        $expectedItem = new Item();
+        $expectedItem->setStatus(128);
+        $expectedItem->setRead();
+        $expectedItem->setId($itemId);
+        $expectedItem->setLastModified($this->time);
 
-		$this->mapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($itemId), $this->equalTo($this->user))
-			->will($this->returnValue($item));
+        $this->mapper->expects($this->once())
+            ->method('find')
+            ->with($this->equalTo($itemId), $this->equalTo($this->user))
+            ->will($this->returnValue($item));
 
-		$this->mapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($expectedItem));
+        $this->mapper->expects($this->once())
+            ->method('update')
+            ->with($this->equalTo($expectedItem));
 
-		$this->itemService->read($itemId, true, $this->user);
+        $this->itemService->read($itemId, true, $this->user);
 
-		$this->assertTrue($item->isRead());
-	}
+        $this->assertTrue($item->isRead());
+    }
 
 
-	public function testStarDoesNotExist(){
+    public function testStarDoesNotExist(){
 
-		$this->setExpectedException('\OCA\News\Service\ServiceNotFoundException');
-		$this->mapper->expects($this->once())
-			->method('findByGuidHash')
-			->will($this->throwException(new DoesNotExistException('')));
+        $this->setExpectedException('\OCA\News\Service\ServiceNotFoundException');
+        $this->mapper->expects($this->once())
+            ->method('findByGuidHash')
+            ->will($this->throwException(new DoesNotExistException('')));
 
-		$this->itemService->star(1, 'hash', true, $this->user);
-	}
+        $this->itemService->star(1, 'hash', true, $this->user);
+    }
 
 
-	public function testReadAll(){
-		$highestItemId = 6;
+    public function testReadAll(){
+        $highestItemId = 6;
 
-		$this->mapper->expects($this->once())
-			->method('readAll')
-			->with($this->equalTo($highestItemId),
-				$this->equalTo($this->time),
-				$this->equalTo($this->user));
+        $this->mapper->expects($this->once())
+            ->method('readAll')
+            ->with($this->equalTo($highestItemId),
+                $this->equalTo($this->time),
+                $this->equalTo($this->user));
 
-		$this->itemService->readAll($highestItemId, $this->user);
-	}
+        $this->itemService->readAll($highestItemId, $this->user);
+    }
 
 
-	public function testReadFolder(){
-		$folderId = 3;
-		$highestItemId = 6;
+    public function testReadFolder(){
+        $folderId = 3;
+        $highestItemId = 6;
 
-		$this->mapper->expects($this->once())
-			->method('readFolder')
-			->with($this->equalTo($folderId),
-				$this->equalTo($highestItemId),
-				$this->equalTo($this->time),
-				$this->equalTo($this->user));
+        $this->mapper->expects($this->once())
+            ->method('readFolder')
+            ->with($this->equalTo($folderId),
+                $this->equalTo($highestItemId),
+                $this->equalTo($this->time),
+                $this->equalTo($this->user));
 
-		$this->itemService->readFolder($folderId, $highestItemId, $this->user);
-	}
+        $this->itemService->readFolder($folderId, $highestItemId, $this->user);
+    }
 
 
-	public function testReadFeed(){
-		$feedId = 3;
-		$highestItemId = 6;
+    public function testReadFeed(){
+        $feedId = 3;
+        $highestItemId = 6;
 
-		$this->mapper->expects($this->once())
-			->method('readFeed')
-			->with($this->equalTo($feedId),
-				$this->equalTo($highestItemId),
-				$this->equalTo($this->time),
-				$this->equalTo($this->user));
+        $this->mapper->expects($this->once())
+            ->method('readFeed')
+            ->with($this->equalTo($feedId),
+                $this->equalTo($highestItemId),
+                $this->equalTo($this->time),
+                $this->equalTo($this->user));
 
-		$this->itemService->readFeed($feedId, $highestItemId, $this->user);
-	}
+        $this->itemService->readFeed($feedId, $highestItemId, $this->user);
+    }
 
 
-	public function testAutoPurgeOldWillPurgeOld(){
-		$this->mapper->expects($this->once())
-			->method('deleteReadOlderThanThreshold')
-			->with($this->equalTo($this->threshold));
+    public function testAutoPurgeOldWillPurgeOld(){
+        $this->mapper->expects($this->once())
+            ->method('deleteReadOlderThanThreshold')
+            ->with($this->equalTo($this->threshold));
 
-		$this->itemService->autoPurgeOld();
-	}
+        $this->itemService->autoPurgeOld();
+    }
 
 
-	public function testGetNewestItemId() {
-		$this->mapper->expects($this->once())
-			->method('getNewestItemId')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue(12));
+    public function testGetNewestItemId() {
+        $this->mapper->expects($this->once())
+            ->method('getNewestItemId')
+            ->with($this->equalTo($this->user))
+            ->will($this->returnValue(12));
 
-		$result = $this->itemService->getNewestItemId($this->user);
-		$this->assertEquals(12, $result);
-	}
+        $result = $this->itemService->getNewestItemId($this->user);
+        $this->assertEquals(12, $result);
+    }
 
 
-	public function testGetNewestItemIdDoesNotExist() {
-		$this->mapper->expects($this->once())
-			->method('getNewestItemId')
-			->with($this->equalTo($this->user))
-			->will($this->throwException(new DoesNotExistException('There are no items')));
+    public function testGetNewestItemIdDoesNotExist() {
+        $this->mapper->expects($this->once())
+            ->method('getNewestItemId')
+            ->with($this->equalTo($this->user))
+            ->will($this->throwException(new DoesNotExistException('There are no items')));
 
-		$this->setExpectedException('\OCA\News\Service\ServiceNotFoundException');
-		$this->itemService->getNewestItemId($this->user);
-	}
+        $this->setExpectedException('\OCA\News\Service\ServiceNotFoundException');
+        $this->itemService->getNewestItemId($this->user);
+    }
 
 
-	public function testStarredCount(){
-		$star = 18;
+    public function testStarredCount(){
+        $star = 18;
 
-		$this->mapper->expects($this->once())
-			->method('starredCount')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($star));
+        $this->mapper->expects($this->once())
+            ->method('starredCount')
+            ->with($this->equalTo($this->user))
+            ->will($this->returnValue($star));
 
-		$result = $this->itemService->starredCount($this->user);
+        $result = $this->itemService->starredCount($this->user);
 
-		$this->assertEquals($star, $result);
-	}
+        $this->assertEquals($star, $result);
+    }
 
 
-	public function testGetUnreadOrStarred(){
-		$star = 18;
+    public function testGetUnreadOrStarred(){
+        $star = 18;
 
-		$this->mapper->expects($this->once())
-			->method('findAllUnreadOrStarred')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($star));
+        $this->mapper->expects($this->once())
+            ->method('findAllUnreadOrStarred')
+            ->with($this->equalTo($this->user))
+            ->will($this->returnValue($star));
 
-		$result = $this->itemService->getUnreadOrStarred($this->user);
+        $result = $this->itemService->getUnreadOrStarred($this->user);
 
-		$this->assertEquals($star, $result);
-	}
+        $this->assertEquals($star, $result);
+    }
 
 
-	public function testDeleteUser() {
-		$this->mapper->expects($this->once())
-			->method('deleteUser')
-			->will($this->returnValue($this->user));
+    public function testDeleteUser() {
+        $this->mapper->expects($this->once())
+            ->method('deleteUser')
+            ->will($this->returnValue($this->user));
 
-		$this->itemService->deleteUser($this->user);
-	}
+        $this->itemService->deleteUser($this->user);
+    }