From 7675b0184f492e0da2565cd2e770caf8ba6e2752 Mon Sep 17 00:00:00 2001
From: Bernhard Posselt <dev@bernhard-posselt.com>
Date: Fri, 27 Sep 2013 20:06:58 +0200
Subject: external to api folder

---
 tests/unit/api/FeedAPITest.php        | 510 +++++++++++++++++++++++++
 tests/unit/api/FolderAPITest.php      | 441 ++++++++++++++++++++++
 tests/unit/api/ItemAPITest.php        | 690 ++++++++++++++++++++++++++++++++++
 tests/unit/api/NewsAPITest.php        | 142 +++++++
 tests/unit/external/FeedAPITest.php   | 510 -------------------------
 tests/unit/external/FolderAPITest.php | 441 ----------------------
 tests/unit/external/ItemAPITest.php   | 690 ----------------------------------
 tests/unit/external/NewsAPITest.php   | 142 -------
 8 files changed, 1783 insertions(+), 1783 deletions(-)
 create mode 100644 tests/unit/api/FeedAPITest.php
 create mode 100644 tests/unit/api/FolderAPITest.php
 create mode 100644 tests/unit/api/ItemAPITest.php
 create mode 100644 tests/unit/api/NewsAPITest.php
 delete mode 100644 tests/unit/external/FeedAPITest.php
 delete mode 100644 tests/unit/external/FolderAPITest.php
 delete mode 100644 tests/unit/external/ItemAPITest.php
 delete mode 100644 tests/unit/external/NewsAPITest.php

(limited to 'tests')

diff --git a/tests/unit/api/FeedAPITest.php b/tests/unit/api/FeedAPITest.php
new file mode 100644
index 000000000..e3b5b5587
--- /dev/null
+++ b/tests/unit/api/FeedAPITest.php
@@ -0,0 +1,510 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\API;
+
+use \OCA\AppFramework\Http\Request;
+use \OCA\AppFramework\Http\JSONResponse;
+use \OCA\AppFramework\Http\Http;
+use \OCA\AppFramework\Utility\ControllerTestUtility;
+
+use \OCA\News\BusinessLayer\BusinessLayerException;
+use \OCA\News\BusinessLayer\BusinessLayerConflictException;
+use \OCA\News\Db\Folder;
+use \OCA\News\Db\Feed;
+use \OCA\News\Db\Item;
+
+require_once(__DIR__ . "/../../classloader.php");
+
+
+class FeedAPITest extends ControllerTestUtility {
+
+	private $folderBusinessLayer;
+	private $feedBusinessLayer;
+	private $itemBusinessLayer;
+	private $feedAPI;
+	private $api;
+	private $user;
+	private $request;
+	private $msg;
+
+	protected function setUp() {
+		$this->api = $this->getMockBuilder(
+			'\OCA\AppFramework\Core\API')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request = $this->getMockBuilder(
+			'\OCA\AppFramework\Http\Request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->folderBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\FolderBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->feedBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\FeedBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->itemBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\ItemBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$this->request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+		$this->user = 'tom';
+		$this->msg = 'hohoho';
+	}
+
+
+	private function assertDefaultAnnotations($methodName){
+		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
+			'Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->feedAPI, $methodName, $annotations);
+	}
+
+
+	public function testGetAllAnnotations(){
+		$this->assertDefaultAnnotations('getAll');
+	}
+
+
+	public function testCreateAnnotations(){
+		$this->assertDefaultAnnotations('create');
+	}
+
+
+	public function testDeleteAnnotations(){
+		$this->assertDefaultAnnotations('delete');
+	}
+
+
+	public function testMoveAnnotations(){
+		$this->assertDefaultAnnotations('move');
+	}
+
+
+	public function testReadAnnotations(){
+		$this->assertDefaultAnnotations('read');
+	}
+
+
+	public function testGetAllFromUsersAnnotations(){
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->feedAPI, 'getAllFromAllUsers', $annotations);
+	}
+
+
+	public function testUpdateAnnotations(){
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->feedAPI, 'update', $annotations);
+	}
+
+
+	public function testGetAll() {
+		$feeds = array(
+			new Feed()
+		);
+		$starredCount = 3;
+		$newestItemId = 2;
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('starredCount')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($starredCount));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('getNewestItemId')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($newestItemId));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('findAll')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($feeds));
+
+		$response = $this->feedAPI->getAll();
+
+		$this->assertEquals(array(
+			'feeds' => array($feeds[0]->toAPI()),
+			'starredCount' => $starredCount,
+			'newestItemId' => $newestItemId
+		), $response->getData());
+	}
+
+
+	public function testGetAllNoNewestItemId() {
+		$feeds = array(
+			new Feed()
+		);
+		$starredCount = 3;
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('starredCount')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($starredCount));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('getNewestItemId')
+			->with($this->equalTo($this->user))
+			->will($this->throwException(new BusinessLayerException('')));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('findAll')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($feeds));
+
+		$response = $this->feedAPI->getAll();
+
+		$this->assertEquals(array(
+			'feeds' => array($feeds[0]->toAPI()),
+			'starredCount' => $starredCount,
+		), $response->getData());
+	}
+
+
+	public function testDelete() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2
+		)));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('delete')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo($this->user));
+
+		$response = $this->feedAPI->delete();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testDeleteDoesNotExist() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2
+		)));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('delete')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->feedAPI->delete();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testCreate() {
+		$feeds = array(
+			new Feed()
+		);
+		$request = new Request(array('params' => array(
+			'url' => 'ho',
+			'folderId' => 3
+		)));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$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->equalTo(false));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('create')
+			->with(
+				$this->equalTo('ho'),
+				$this->equalTo(3),
+				$this->equalTo($this->user))
+			->will($this->returnValue($feeds[0]));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('getNewestItemId')
+			->will($this->returnValue(3));
+
+		$response = $this->feedAPI->create();
+
+		$this->assertEquals(array(
+			'feeds' => array($feeds[0]->toAPI()),
+			'newestItemId' => 3
+		), $response->getData());
+
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testCreateNoItems() {
+		$feeds = array(
+			new Feed()
+		);
+		$request = new Request(array('params' => array(
+			'url' => 'ho',
+			'folderId' => 3
+		)));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$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->equalTo(false));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('create')
+			->with(
+				$this->equalTo('ho'),
+				$this->equalTo(3),
+				$this->equalTo($this->user))
+			->will($this->returnValue($feeds[0]));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('getNewestItemId')
+			->will($this->throwException(new BusinessLayerException('')));
+
+		$response = $this->feedAPI->create();
+
+		$this->assertEquals(array(
+			'feeds' => array($feeds[0]->toAPI())
+		), $response->getData());
+
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+
+	public function testCreateExists() {
+		$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->equalTo(false));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('create')
+			->will($this->throwException(new BusinessLayerConflictException($this->msg)));
+
+		$response = $this->feedAPI->create();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus());
+	}
+
+
+	public function testCreateError() {
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('create')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->feedAPI->create();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testRead() {
+		$request = new Request(array(
+			'urlParams' => array(
+				'feedId' => 3
+			),
+			'params' => array(
+				'newestItemId' => 30,
+			)
+		));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('readFeed')
+			->with(
+				$this->equalTo(3),
+				$this->equalTo(30),
+				$this->equalTo($this->user));
+
+		$response = $this->feedAPI->read();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testMove() {
+		$request = new Request(array(
+			'urlParams' => array(
+				'feedId' => 3
+			),
+			'params' => array(
+				'folderId' => 30,
+			)
+		));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('move')
+			->with(
+				$this->equalTo(3),
+				$this->equalTo(30),
+				$this->equalTo($this->user));
+
+		$response = $this->feedAPI->move();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testMoveDoesNotExist() {
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->feedBusinessLayer->expects($this->once())
+			->method('move')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->feedAPI->move();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testGetAllFromAllUsers(){
+		$feed = new Feed();
+		$feed->setUrl(3);
+		$feed->setId(1);
+		$feed->setUserId('john');
+		$feeds = array($feed);
+		$this->feedBusinessLayer->expects($this->once())
+			->method('findAllFromAllUsers')
+			->will($this->returnValue($feeds));
+		$response = $this->feedAPI->getAllFromAllUsers();
+		$this->assertTrue($response instanceof JSONResponse);
+		$this->assertEquals('{"feeds":[{"id":1,"userId":"john"}]}', $response->render());
+	}
+
+
+	public function testUpdate() {
+		$feedId = 3;
+		$userId = 'hi';
+		$request = new Request(array('params' => array(
+			'feedId' => $feedId,
+			'userId' => $userId
+		)));
+		$this->feedAPI = new FeedAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->feedBusinessLayer,
+			$this->itemBusinessLayer
+		);
+		$this->feedBusinessLayer->expects($this->once())
+			->method('update')
+			->with($this->equalTo($feedId), $this->equalTo($userId));
+
+		$response = $this->feedAPI->update();
+		$this->assertTrue($response instanceof JSONResponse);
+	}
+
+
+	public function testUpdateError() {
+		$this->feedBusinessLayer->expects($this->once())
+			->method('update')
+			->will($this->throwException(new \Exception($this->msg)));
+		$this->api->expects($this->once())
+			->method('log')
+			->with($this->equalTo('Could not update feed ' . $this->msg),
+				$this->equalTo('debug'));
+
+		$response = $this->feedAPI->update();
+
+		$this->assertTrue($response instanceof JSONResponse);
+
+	}
+
+
+}
diff --git a/tests/unit/api/FolderAPITest.php b/tests/unit/api/FolderAPITest.php
new file mode 100644
index 000000000..8c33233b0
--- /dev/null
+++ b/tests/unit/api/FolderAPITest.php
@@ -0,0 +1,441 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\API;
+
+use \OCA\AppFramework\Http\Request;
+use \OCA\AppFramework\Http\JSONResponse;
+use \OCA\AppFramework\Utility\ControllerTestUtility;
+use \OCA\AppFramework\Http\Http;
+
+use \OCA\News\BusinessLayer\BusinessLayerException;
+use \OCA\News\BusinessLayer\BusinessLayerConflictException;
+use \OCA\News\BusinessLayer\BusinessLayerValidationException;
+
+use \OCA\News\Db\Folder;
+use \OCA\News\Db\Feed;
+use \OCA\News\Db\Item;
+
+require_once(__DIR__ . "/../../classloader.php");
+
+
+class FolderAPITest extends ControllerTestUtility {
+
+	private $folderBusinessLayer;
+	private $itemBusinessLayer;
+	private $folderAPI;
+	private $api;
+	private $user;
+	private $request;
+	private $msg;
+
+	protected function setUp() {
+		$this->api = $this->getMockBuilder(
+			'\OCA\AppFramework\Core\API')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request = $this->getMockBuilder(
+			'\OCA\AppFramework\Http\Request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->folderBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\FolderBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->itemBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\ItemBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			$this->request,
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+		$this->user = 'tom';
+		$this->msg = 'test';
+	}
+
+
+	private function assertDefaultAnnotations($methodName){
+		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
+			'Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->folderAPI, $methodName, $annotations);
+	}
+
+
+	public function testGetAllAnnotations(){
+		$this->assertDefaultAnnotations('getAll');
+	}
+
+
+	public function testCreateAnnotations(){
+		$this->assertDefaultAnnotations('create');
+	}
+
+
+	public function testDeleteAnnotations(){
+		$this->assertDefaultAnnotations('delete');
+	}
+
+
+	public function testUpdateAnnotations(){
+		$this->assertDefaultAnnotations('update');
+	}
+
+
+	public function testReadAnnotations(){
+		$this->assertDefaultAnnotations('read');
+	}
+
+
+	public function testGetAll() {
+		$folders = array(
+			new Folder()
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('findAll')
+			->with($this->equalTo($this->user))
+			->will($this->returnValue($folders));
+
+		$response = $this->folderAPI->getAll();
+
+		$this->assertEquals(array(
+			'folders' => array($folders[0]->toAPI())
+		), $response->getData());
+	}
+
+
+	public function testCreate() {
+		$folderName = 'test';
+		$folder = new Folder();
+		$folder->setName($folderName);
+		$folders = array(
+			$folder
+		);
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(array('params' => array(
+				'name' => $folderName
+			))),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$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->equalTo(false));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('create')
+			->with($this->equalTo($folderName), $this->equalTo($this->user))
+			->will($this->returnValue($folder));
+
+		$response = $this->folderAPI->create();
+
+		$this->assertEquals(array(
+			'folders' => array($folders[0]->toAPI())
+		), $response->getData());
+	}
+
+
+	public function testCreateAlreadyExists() {
+		$msg = 'exists';
+
+		$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->equalTo(false));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('create')
+			->will($this->throwException(new BusinessLayerConflictException($msg)));
+
+		$response = $this->folderAPI->create();
+
+		$data = $response->getData();
+		$this->assertEquals($msg, $data['message']);
+		$this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus());
+	}
+
+
+	public function testCreateInvalidFolderName() {
+		$msg = 'exists';
+
+		$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->equalTo(false));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('create')
+			->will($this->throwException(new BusinessLayerValidationException($msg)));
+
+		$response = $this->folderAPI->create();
+
+		$data = $response->getData();
+		$this->assertEquals($msg, $data['message']);
+		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
+	}
+
+
+	public function testDelete() {
+		$folderId = 23;
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(array('urlParams' => array(
+				'folderId' => $folderId
+			))),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('delete')
+			->with($this->equalTo($folderId), $this->equalTo($this->user));
+
+		$response = $this->folderAPI->delete();
+
+		$this->assertEmpty($response->getData());
+	}
+
+
+	public function testDeleteDoesNotExist() {
+		$folderId = 23;
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(array('urlParams' => array(
+				'folderId' => $folderId
+			))),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('delete')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->folderAPI->delete();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testUpdate() {
+		$folderId = 23;
+		$folderName = 'test';
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(
+				array(
+					'urlParams' => array(
+						'folderId' => $folderId
+					),
+
+					'params' => array(
+						'name' => $folderName
+					)
+				)
+			),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('rename')
+			->with($this->equalTo($folderId),
+				$this->equalTo($folderName),
+				$this->equalTo($this->user));
+
+		$response = $this->folderAPI->update();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+	public function testUpdateDoesNotExist() {
+		$folderId = 23;
+		$folderName = 'test';
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(
+				array(
+					'urlParams' => array(
+						'folderId' => $folderId
+					),
+
+					'params' => array(
+						'name' => $folderName
+					)
+				)
+			),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('rename')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->folderAPI->update();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testUpdateExists() {
+		$folderId = 23;
+		$folderName = 'test';
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(
+				array(
+					'urlParams' => array(
+						'folderId' => $folderId
+					),
+
+					'params' => array(
+						'name' => $folderName
+					)
+				)
+			),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('rename')
+			->will($this->throwException(new BusinessLayerConflictException($this->msg)));
+
+		$response = $this->folderAPI->update();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus());
+	}
+
+
+	public function testUpdateInvalidFolderName() {
+		$folderId = 23;
+		$folderName = '';
+
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			new Request(
+				array(
+					'urlParams' => array(
+						'folderId' => $folderId
+					),
+
+					'params' => array(
+						'name' => $folderName
+					)
+				)
+			),
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->folderBusinessLayer->expects($this->once())
+			->method('rename')
+			->will($this->throwException(new BusinessLayerValidationException($this->msg)));
+
+		$response = $this->folderAPI->update();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_UNPROCESSABLE_ENTITY, $response->getStatus());
+	}
+
+
+	public function testRead() {
+		$request = new Request(array(
+			'urlParams' => array(
+				'folderId' => 3
+			),
+			'params' => array(
+				'newestItemId' => 30,
+			)
+		));
+		$this->folderAPI = new FolderAPI(
+			$this->api,
+			$request,
+			$this->folderBusinessLayer,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('readFolder')
+			->with(
+				$this->equalTo(3),
+				$this->equalTo(30),
+				$this->equalTo($this->user));
+
+		$response = $this->folderAPI->read();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+}
diff --git a/tests/unit/api/ItemAPITest.php b/tests/unit/api/ItemAPITest.php
new file mode 100644
index 000000000..b172d5752
--- /dev/null
+++ b/tests/unit/api/ItemAPITest.php
@@ -0,0 +1,690 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\API;
+
+use \OCA\AppFramework\Http\Request;
+use \OCA\AppFramework\Http\JSONResponse;
+use \OCA\AppFramework\Http\Http;
+use \OCA\AppFramework\Utility\ControllerTestUtility;
+
+use \OCA\News\BusinessLayer\BusinessLayerException;
+use \OCA\News\Db\Item;
+
+require_once(__DIR__ . "/../../classloader.php");
+
+
+class ItemAPITest extends ControllerTestUtility {
+
+	private $itemBusinessLayer;
+	private $itemAPI;
+	private $api;
+	private $user;
+	private $request;
+	private $msg;
+
+	protected function setUp() {
+		$this->api = $this->getMockBuilder(
+			'\OCA\AppFramework\Core\API')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request = $this->getMockBuilder(
+			'\OCA\AppFramework\Http\Request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->itemBusinessLayer = $this->getMockBuilder(
+			'\OCA\News\BusinessLayer\ItemBusinessLayer')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->user = 'tom';
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$this->request,
+			$this->itemBusinessLayer
+		);
+		$this->msg = 'hi';
+	}
+
+
+	private function assertDefaultAnnotations($methodName){
+		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
+			'Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->itemAPI, $methodName, $annotations);
+	}
+
+
+	public function testGetAllAnnotations(){
+		$this->assertDefaultAnnotations('getAll');
+	}
+
+
+	public function testGetUpdatedAnnotations(){
+		$this->assertDefaultAnnotations('getUpdated');
+	}
+
+
+	public function testReadAllAnnotations(){
+		$this->assertDefaultAnnotations('readAll');
+	}
+
+
+	public function testReadAnnotations(){
+		$this->assertDefaultAnnotations('read');
+	}
+
+
+	public function testStarAnnotations(){
+		$this->assertDefaultAnnotations('star');
+	}
+
+
+	public function testUnreadAnnotations(){
+		$this->assertDefaultAnnotations('unread');
+	}
+
+
+	public function testUnstarAnnotations(){
+		$this->assertDefaultAnnotations('unstar');
+	}
+
+
+	public function testReadMultipleAnnotations(){
+		$this->assertDefaultAnnotations('readMultiple');
+	}
+
+
+	public function testStarMultipleAnnotations(){
+		$this->assertDefaultAnnotations('starMultiple');
+	}
+
+
+	public function testUnreadMultipleAnnotations(){
+		$this->assertDefaultAnnotations('unreadMultiple');
+	}
+
+
+	public function testUnstarMultipleAnnotations(){
+		$this->assertDefaultAnnotations('unstarMultiple');
+	}
+
+
+	public function testGetAll() {
+		$items = array(
+			new Item()
+		);
+		$request = new Request(array('params' => array(
+			'batchSize' => 30,
+			'offset' => 20,
+			'type' => 1,
+			'id' => 2,
+			'getRead' => 'false'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('findAll')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo(1),
+				$this->equalTo(30),
+				$this->equalTo(20),
+				$this->equalTo(false),
+				$this->equalTo($this->user)
+			)
+			->will($this->returnValue($items));
+
+		$response = $this->itemAPI->getAll();
+
+		$this->assertEquals(array(
+			'items' => array($items[0]->toAPI())
+		), $response->getData());
+	}
+
+
+	public function testGetAllDefaultBatchSize() {
+		$items = array(
+			new Item()
+		);
+		$request = new Request(array('params' => array(
+			'offset' => 20,
+			'type' => 1,
+			'id' => 2,
+			'getRead' => 'false'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('findAll')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo(1),
+				$this->equalTo(20),
+				$this->equalTo(20),
+				$this->equalTo(false),
+				$this->equalTo($this->user)
+			)
+			->will($this->returnValue($items));
+
+		$response = $this->itemAPI->getAll();
+
+		$this->assertEquals(array(
+			'items' => array($items[0]->toAPI())
+		), $response->getData());
+	}
+
+
+	public function testGetUpdated() {
+		$items = array(
+			new Item()
+		);
+		$request = new Request(array('params' => array(
+			'lastModified' => 30,
+			'type' => 1,
+			'id' => 2,
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('findAllNew')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo(1),
+				$this->equalTo(30),
+				$this->equalTo(true),
+				$this->equalTo($this->user)
+			)
+			->will($this->returnValue($items));
+
+		$response = $this->itemAPI->getUpdated();
+
+		$this->assertEquals(array(
+			'items' => array($items[0]->toAPI())
+		), $response->getData());
+	}
+
+
+	public function testRead() {
+		$request = new Request(array('urlParams' => array(
+			'itemId' => 2
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('read')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo(true),
+				$this->equalTo($this->user)
+			);
+
+		$response = $this->itemAPI->read();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testReadDoesNotExist() {
+		$request = new Request(array('urlParams' => array(
+			'itemId' => 2
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('read')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->itemAPI->read();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testUnread() {
+		$request = new Request(array('urlParams' => array(
+			'itemId' => 2
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('read')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo(false),
+				$this->equalTo($this->user)
+			);
+
+		$response = $this->itemAPI->unread();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testUnreadDoesNotExist() {
+		$request = new Request(array('urlParams' => array(
+			'itemId' => 2
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('read')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->itemAPI->unread();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testStar() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2,
+			'guidHash' => 'hash'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('star')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo('hash'),
+				$this->equalTo(true),
+				$this->equalTo($this->user)
+			);
+
+		$response = $this->itemAPI->star();
+
+		$data = $response->getData();
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testStarDoesNotExist() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2,
+			'guidHash' => 'hash'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('star')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->itemAPI->star();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testUnstar() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2,
+			'guidHash' => 'hash'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('star')
+			->with(
+				$this->equalTo(2),
+				$this->equalTo('hash'),
+				$this->equalTo(false),
+				$this->equalTo($this->user)
+			);
+
+		$response = $this->itemAPI->unstar();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testUnstarDoesNotExist() {
+		$request = new Request(array('urlParams' => array(
+			'feedId' => 2,
+			'guidHash' => 'hash'
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('star')
+			->will($this->throwException(new BusinessLayerException($this->msg)));
+
+		$response = $this->itemAPI->unstar();
+
+		$data = $response->getData();
+		$this->assertEquals($this->msg, $data['message']);
+		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
+	}
+
+
+	public function testReadAll() {
+		$request = new Request(array(
+			'params' => array(
+				'newestItemId' => 30,
+			)
+		));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->once())
+			->method('readAll')
+			->with(
+				$this->equalTo(30),
+				$this->equalTo($this->user));
+
+		$response = $this->itemAPI->readAll();
+
+		$this->assertEmpty($response->getData());
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+
+	public function testReadMultiple() {
+		$request = new Request(array('params' => array(
+			'items' => array(2, 4)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('read')
+			->with($this->equalTo(2),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('read')
+			->with($this->equalTo(4),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$response = $this->itemAPI->readMultiple();
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testReadMultipleDoesntCareAboutException() {
+		$request = new Request(array('params' => array(
+			'items' => array(2, 4)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('read')
+			->will($this->throwException(new BusinessLayerException('')));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('read')
+			->with($this->equalTo(4),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$this->itemAPI->readMultiple();
+	}
+
+
+	public function testUnreadMultiple() {
+		$request = new Request(array('params' => array(
+			'items' => array(2, 4)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('read')
+			->with($this->equalTo(2),
+				$this->equalTo(false),
+				$this->equalTo($this->user));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('read')
+			->with($this->equalTo(4),
+				$this->equalTo(false),
+				$this->equalTo($this->user));
+		$response = $this->itemAPI->unreadMultiple();
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testStarMultiple() {
+		$request = new Request(array('params' => array(
+			'items' => array(
+				array(
+					'feedId' => 2,
+					'guidHash' => 'a'
+				),
+				array(
+					'feedId' => 4,
+					'guidHash' => 'b'
+				)
+			)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('star')
+			->with($this->equalTo(2),
+				$this->equalTo('a'),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('star')
+			->with($this->equalTo(4),
+				$this->equalTo('b'),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$response = $this->itemAPI->starMultiple();
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+	public function testStarMultipleDoesntCareAboutException() {
+		$request = new Request(array('params' => array(
+			'items' => array(
+				array(
+					'feedId' => 2,
+					'guidHash' => 'a'
+				),
+				array(
+					'feedId' => 4,
+					'guidHash' => 'b'
+				)
+			)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('star')
+			->will($this->throwException(new BusinessLayerException('')));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('star')
+			->with($this->equalTo(4),
+				$this->equalTo('b'),
+				$this->equalTo(true),
+				$this->equalTo($this->user));
+		$this->itemAPI->starMultiple();
+	}
+
+
+	public function testUnstarMultiple() {
+		$request = new Request(array('params' => array(
+			'items' => array(
+				array(
+					'feedId' => 2,
+					'guidHash' => 'a'
+				),
+				array(
+					'feedId' => 4,
+					'guidHash' => 'b'
+				)
+			)
+		)));
+		$this->itemAPI = new ItemAPI(
+			$this->api,
+			$request,
+			$this->itemBusinessLayer
+		);
+
+		$this->api->expects($this->once())
+			->method('getUserId')
+			->will($this->returnValue($this->user));
+		$this->itemBusinessLayer->expects($this->at(0))
+			->method('star')
+			->with($this->equalTo(2),
+				$this->equalTo('a'),
+				$this->equalTo(false),
+				$this->equalTo($this->user));
+		$this->itemBusinessLayer->expects($this->at(1))
+			->method('star')
+			->with($this->equalTo(4),
+				$this->equalTo('b'),
+				$this->equalTo(false),
+				$this->equalTo($this->user));
+		$response = $this->itemAPI->unstarMultiple();
+		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
+	}
+
+
+}
diff --git a/tests/unit/api/NewsAPITest.php b/tests/unit/api/NewsAPITest.php
new file mode 100644
index 000000000..412f5e580
--- /dev/null
+++ b/tests/unit/api/NewsAPITest.php
@@ -0,0 +1,142 @@
+<?php
+
+/**
+* ownCloud - News
+*
+* @author Alessandro Cosentino
+* @author Bernhard Posselt
+* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
+* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
+*
+* This library is free software; you can redistribute it and/or
+* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
+* License as published by the Free Software Foundation; either
+* version 3 of the License, or any later version.
+*
+* This library is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
+*
+* You should have received a copy of the GNU Affero General Public
+* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
+*
+*/
+
+namespace OCA\News\API;
+
+use \OCA\AppFramework\Http\Request;
+use \OCA\AppFramework\Http\JSONResponse;
+use \OCA\AppFramework\Utility\ControllerTestUtility;
+
+require_once(__DIR__ . "/../../classloader.php");
+
+
+class NewsAPITest extends ControllerTestUtility {
+
+	private $api;
+	private $request;
+	private $newsAPI;
+	private $updater;
+
+	protected function setUp() {
+		$this->api = $this->getMockBuilder(
+			'\OCA\AppFramework\Core\API')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->request = $this->getMockBuilder(
+			'\OCA\AppFramework\Http\Request')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->updater = $this->getMockBuilder(
+			'\OCA\News\Utility\Updater')
+			->disableOriginalConstructor()
+			->getMock();
+		$this->newsAPI = new NewsAPI($this->api, $this->request, $this->updater);
+	}
+
+
+	private function assertDefaultAnnotations($methodName){
+		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
+			'Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->newsAPI, $methodName, $annotations);
+	}
+
+	public function testVersionAnnotations(){
+		$this->assertDefaultAnnotations('version');
+	}
+
+	public function testBeforeUpdateAnnotations(){
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->newsAPI, 'beforeUpdate', $annotations);
+	}
+
+	public function testAfterUpdateAnnotations(){
+		$annotations = array('Ajax', 'CSRFExemption', 'API');
+		$this->assertAnnotations($this->newsAPI, 'afterUpdate', $annotations);
+	}
+
+	public function testGetVersion(){
+		$this->api->expects($this->once())
+			->method('getAppValue')
+			->with($this->equalTo('installed_version'))
+			->will($this->returnValue('1.0'));
+
+		$response = $this->newsAPI->version();
+		$data = $response->getData();
+		$version = $data['version'];
+
+		$this->assertEquals('1.0', $version);
+	}
+
+
+	public function testBeforeUpdate(){
+		$this->updater->expects($this->once())
+			->method('beforeUpdate');
+		$response = $this->newsAPI->beforeUpdate();
+		$this->assertTrue($response instanceof JSONResponse);
+	}
+
+
+	public function testAfterUpdate(){
+		$this->updater->expects($this->once())
+			->method('afterUpdate');
+		$response = $this->newsAPI->afterUpdate();
+		$this->assertTrue($response instanceof JSONResponse);
+	}
+
+
+	public function testCorsAnnotations(){
+		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
+			'Ajax', 'CSRFExemption', 'IsLoggedInExemption');
+		$this->assertAnnotations($this->newsAPI, 'cors', $annotations);
+	}
+
+
+	public function testCors() {
+		$this->request = new Request(array('server' => array()));
+		$this->newsAPI = new NewsAPI($this->api, $this->request, $this->updater);
+		$response = $this->newsAPI->cors();
+
+		$headers = $response->getHeaders();
+
+		$this->assertEquals('*', $headers['Access-Control-Allow-Origin']);
+		$this->assertEquals('PUT, POST, GET, DELETE', $headers['Access-Control-Allow-Methods']);
+		$this->assertEquals('true', $headers['Access-Control-Allow-Credentials']);
+		$this->assertEquals('Authorization, Content-Type', $headers['Access-Control-Allow-Headers']);
+		$this->assertEquals('1728000', $headers['Access-Control-Max-Age']);
+	}
+
+
+	public function testCorsUsesOriginIfGiven() {
+		$this->request = new Request(array('server' => array('HTTP_ORIGIN' => 'test')));
+		$this->newsAPI = new NewsAPI($this->api, $this->request, $this->updater);
+		$response = $this->newsAPI->cors();
+
+		$headers = $response->getHeaders();
+
+		$this->assertEquals('test', $headers['Access-Control-Allow-Origin']);
+	}
+
+
+}
diff --git a/tests/unit/external/FeedAPITest.php b/tests/unit/external/FeedAPITest.php
deleted file mode 100644
index ec6aedf19..000000000
--- a/tests/unit/external/FeedAPITest.php
+++ /dev/null
@@ -1,510 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\External;
-
-use \OCA\AppFramework\Http\Request;
-use \OCA\AppFramework\Http\JSONResponse;
-use \OCA\AppFramework\Http\Http;
-use \OCA\AppFramework\Utility\ControllerTestUtility;
-
-use \OCA\News\BusinessLayer\BusinessLayerException;
-use \OCA\News\BusinessLayer\BusinessLayerConflictException;
-use \OCA\News\Db\Folder;
-use \OCA\News\Db\Feed;
-use \OCA\News\Db\Item;
-
-require_once(__DIR__ . "/../../classloader.php");
-
-
-class FeedAPITest extends ControllerTestUtility {
-
-	private $folderBusinessLayer;
-	private $feedBusinessLayer;
-	private $itemBusinessLayer;
-	private $feedAPI;
-	private $api;
-	private $user;
-	private $request;
-	private $msg;
-
-	protected function setUp() {
-		$this->api = $this->getMockBuilder(
-			'\OCA\AppFramework\Core\API')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->request = $this->getMockBuilder(
-			'\OCA\AppFramework\Http\Request')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->folderBusinessLayer = $this->getMockBuilder(
-			'\OCA\News\BusinessLayer\FolderBusinessLayer')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->feedBusinessLayer = $this->getMockBuilder(
-			'\OCA\News\BusinessLayer\FeedBusinessLayer')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->itemBusinessLayer = $this->getMockBuilder(
-			'\OCA\News\BusinessLayer\ItemBusinessLayer')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$this->request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-		$this->user = 'tom';
-		$this->msg = 'hohoho';
-	}
-
-
-	private function assertDefaultAnnotations($methodName){
-		$annotations = array('IsAdminExemption', 'IsSubAdminExemption',
-			'Ajax', 'CSRFExemption', 'API');
-		$this->assertAnnotations($this->feedAPI, $methodName, $annotations);
-	}
-
-
-	public function testGetAllAnnotations(){
-		$this->assertDefaultAnnotations('getAll');
-	}
-
-
-	public function testCreateAnnotations(){
-		$this->assertDefaultAnnotations('create');
-	}
-
-
-	public function testDeleteAnnotations(){
-		$this->assertDefaultAnnotations('delete');
-	}
-
-
-	public function testMoveAnnotations(){
-		$this->assertDefaultAnnotations('move');
-	}
-
-
-	public function testReadAnnotations(){
-		$this->assertDefaultAnnotations('read');
-	}
-
-
-	public function testGetAllFromUsersAnnotations(){
-		$annotations = array('Ajax', 'CSRFExemption', 'API');
-		$this->assertAnnotations($this->feedAPI, 'getAllFromAllUsers', $annotations);
-	}
-
-
-	public function testUpdateAnnotations(){
-		$annotations = array('Ajax', 'CSRFExemption', 'API');
-		$this->assertAnnotations($this->feedAPI, 'update', $annotations);
-	}
-
-
-	public function testGetAll() {
-		$feeds = array(
-			new Feed()
-		);
-		$starredCount = 3;
-		$newestItemId = 2;
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('starredCount')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($starredCount));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('getNewestItemId')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($newestItemId));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('findAll')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-
-		$response = $this->feedAPI->getAll();
-
-		$this->assertEquals(array(
-			'feeds' => array($feeds[0]->toAPI()),
-			'starredCount' => $starredCount,
-			'newestItemId' => $newestItemId
-		), $response->getData());
-	}
-
-
-	public function testGetAllNoNewestItemId() {
-		$feeds = array(
-			new Feed()
-		);
-		$starredCount = 3;
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('starredCount')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($starredCount));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('getNewestItemId')
-			->with($this->equalTo($this->user))
-			->will($this->throwException(new BusinessLayerException('')));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('findAll')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-
-		$response = $this->feedAPI->getAll();
-
-		$this->assertEquals(array(
-			'feeds' => array($feeds[0]->toAPI()),
-			'starredCount' => $starredCount,
-		), $response->getData());
-	}
-
-
-	public function testDelete() {
-		$request = new Request(array('urlParams' => array(
-			'feedId' => 2
-		)));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('delete')
-			->with(
-				$this->equalTo(2),
-				$this->equalTo($this->user));
-
-		$response = $this->feedAPI->delete();
-
-		$this->assertEmpty($response->getData());
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-	public function testDeleteDoesNotExist() {
-		$request = new Request(array('urlParams' => array(
-			'feedId' => 2
-		)));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('delete')
-			->will($this->throwException(new BusinessLayerException($this->msg)));
-
-		$response = $this->feedAPI->delete();
-
-		$data = $response->getData();
-		$this->assertEquals($this->msg, $data['message']);
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-
-	public function testCreate() {
-		$feeds = array(
-			new Feed()
-		);
-		$request = new Request(array('params' => array(
-			'url' => 'ho',
-			'folderId' => 3
-		)));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$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->equalTo(false));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('create')
-			->with(
-				$this->equalTo('ho'),
-				$this->equalTo(3),
-				$this->equalTo($this->user))
-			->will($this->returnValue($feeds[0]));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('getNewestItemId')
-			->will($this->returnValue(3));
-
-		$response = $this->feedAPI->create();
-
-		$this->assertEquals(array(
-			'feeds' => array($feeds[0]->toAPI()),
-			'newestItemId' => 3
-		), $response->getData());
-
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-	public function testCreateNoItems() {
-		$feeds = array(
-			new Feed()
-		);
-		$request = new Request(array('params' => array(
-			'url' => 'ho',
-			'folderId' => 3
-		)));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$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->equalTo(false));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('create')
-			->with(
-				$this->equalTo('ho'),
-				$this->equalTo(3),
-				$this->equalTo($this->user))
-			->will($this->returnValue($feeds[0]));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('getNewestItemId')
-			->will($this->throwException(new BusinessLayerException('')));
-
-		$response = $this->feedAPI->create();
-
-		$this->assertEquals(array(
-			'feeds' => array($feeds[0]->toAPI())
-		), $response->getData());
-
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-
-	public function testCreateExists() {
-		$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->equalTo(false));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('create')
-			->will($this->throwException(new BusinessLayerConflictException($this->msg)));
-
-		$response = $this->feedAPI->create();
-
-		$data = $response->getData();
-		$this->assertEquals($this->msg, $data['message']);
-		$this->assertEquals(Http::STATUS_CONFLICT, $response->getStatus());
-	}
-
-
-	public function testCreateError() {
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('create')
-			->will($this->throwException(new BusinessLayerException($this->msg)));
-
-		$response = $this->feedAPI->create();
-
-		$data = $response->getData();
-		$this->assertEquals($this->msg, $data['message']);
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-
-	public function testRead() {
-		$request = new Request(array(
-			'urlParams' => array(
-				'feedId' => 3
-			),
-			'params' => array(
-				'newestItemId' => 30,
-			)
-		));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->itemBusinessLayer->expects($this->once())
-			->method('readFeed')
-			->with(
-				$this->equalTo(3),
-				$this->equalTo(30),
-				$this->equalTo($this->user));
-
-		$response = $this->feedAPI->read();
-
-		$this->assertEmpty($response->getData());
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-	public function testMove() {
-		$request = new Request(array(
-			'urlParams' => array(
-				'feedId' => 3
-			),
-			'params' => array(
-				'folderId' => 30,
-			)
-		));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('move')
-			->with(
-				$this->equalTo(3),
-				$this->equalTo(30),
-				$this->equalTo($this->user));
-
-		$response = $this->feedAPI->move();
-
-		$this->assertEmpty($response->getData());
-		$this->assertEquals(Http::STATUS_OK, $response->getStatus());
-	}
-
-
-	public function testMoveDoesNotExist() {
-		$this->api->expects($this->once())
-			->method('getUserId')
-			->will($this->returnValue($this->user));
-		$this->feedBusinessLayer->expects($this->once())
-			->method('move')
-			->will($this->throwException(new BusinessLayerException($this->msg)));
-
-		$response = $this->feedAPI->move();
-
-		$data = $response->getData();
-		$this->assertEquals($this->msg, $data['message']);
-		$this->assertEquals(Http::STATUS_NOT_FOUND, $response->getStatus());
-	}
-
-
-	public function testGetAllFromAllUsers(){
-		$feed = new Feed();
-		$feed->setUrl(3);
-		$feed->setId(1);
-		$feed->setUserId('john');
-		$feeds = array($feed);
-		$this->feedBusinessLayer->expects($this->once())
-			->method('findAllFromAllUsers')
-			->will($this->returnValue($feeds));
-		$response = $this->feedAPI->getAllFromAllUsers();
-		$this->assertTrue($response instanceof JSONResponse);
-		$this->assertEquals('{"feeds":[{"id":1,"userId":"john"}]}', $response->render());
-	}
-
-
-	public function testUpdate() {
-		$feedId = 3;
-		$userId = 'hi';
-		$request = new Request(array('params' => array(
-			'feedId' => $feedId,
-			'userId' => $userId
-		)));
-		$this->feedAPI = new FeedAPI(
-			$this->api,
-			$request,
-			$this->folderBusinessLayer,
-			$this->feedBusinessLayer,
-			$this->itemBusinessLayer
-		);
-		$this->feedBusinessLayer->expects($this->once())
-			->method('update')
-			->with($this->equalTo($feedId), $this->equalTo($userId));
-
-		$response = $this->feedAPI->update();
-		$this->assertTrue($response instanceof JSONResponse);
-	}
-
-
-	public function testUpdateError() {
-		$this->feedBusinessLayer->expects($this->once())
-			->method('update')
-			->will($this->throwException(new \Exception($this->msg)));
-		$this->api->expects($this->once())
-			->method('log')
-			->with($this->equalTo('Could not update feed ' . $this->msg),
-				$this->equalTo('debug'));
-
-		$response = $this->feedAPI->update();
-
-		$this->assertTrue($response instanceof JSONResponse);
-
-	}
-
-
-}
diff --git a/tests/unit/external/FolderAPITest.php b/tests/unit/external/FolderAPITest.php
deleted file mode 100644
index 145cc6720..000000000
--- a/tests/unit/external/FolderAPITest.php
+++ /dev/null
@@ -1,441 +0,0 @@
-<?php
-
-/**
-* ownCloud - News
-*
-* @author Alessandro Cosentino
-* @author Bernhard Posselt
-* @copyright 2012 Alessandro Cosentino cosenal@gmail.com
-* @copyright 2012 Bernhard Posselt dev@bernhard-posselt.com
-*
-* This library is free software; you can redistribute it and/or
-* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE
-* License as published by the Free Software Foundation; either
-* version 3 of the License, or any later version.
-*
-* This library is distributed in the hope that it will be useful,
-* but WITHOUT ANY WARRANTY; without even the implied warranty of
-* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-* GNU AFFERO GENERAL PUBLIC LICENSE for more details.
-*
-* You should have received a copy of the GNU Affero General Public
-* License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-*
-*/
-
-namespace OCA\News\External;
-
-use \OCA\AppFramework\Http\Request;
-use \OCA\AppFramework\Http\JSONResponse;
-use \OCA\AppFramework\Utility\ControllerTestUtility;
-use \OCA\AppFramework\Http\Http;
-
-use \OCA\News\BusinessLayer\BusinessLayerException;
-use \OCA\News\BusinessLayer\BusinessLayerConflictException;
-use \OCA\News\BusinessLayer\BusinessLayerValidationException;
-
-use \OCA\News\Db\Folder;
-use \OCA\News\