rename businesslayer to service

5 files changed, 0 insertions, 1522 deletions

diff --git a/tests/unit/businesslayer/BusinessLayerTest.php b/tests/unit/businesslayer/BusinessLayerTest.php
deleted file mode 100644
index 898458adb..000000000
--- a/tests/unit/businesslayer/BusinessLayerTest.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-/**
- * ownCloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-namespace OCA\News\BusinessLayer;
-
-require_once(__DIR__ . "/../../classloader.php");
-
-
-use \OCP\AppFramework\Db\DoesNotExistException;
-use \OCP\AppFramework\Db\MultipleObjectsReturnedException;
-
-use \OCA\News\Db\Folder;
-
-
-class TestBusinessLayer extends BusinessLayer {
-	public function __construct($mapper){
-		parent::__construct($mapper);
-	}
-}
-
-class BusinessLayerTest extends \PHPUnit_Framework_TestCase {
-
-	protected $mapper;
-	protected $newsBusinessLayer;
-
-	protected function setUp(){
-		$this->mapper = $this->getMockBuilder('\OCA\News\Db\ItemMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->newsBusinessLayer = new TestBusinessLayer($this->mapper);
-	}
-
-
-	public function testDelete(){
-		$id = 5;
-		$user = 'ken';
-		$folder = new Folder();
-		$folder->setId($id);
-
-		$this->mapper->expects($this->once())
-			->method('delete')
-			->with($this->equalTo($folder));
-		$this->mapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($id), $this->equalTo($user))
-			->will($this->returnValue($folder));
-
-		$this->newsBusinessLayer->delete($id, $user);
-	}
-
-
-	public function testFind(){
-		$id = 3;
-		$user = 'ken';
-
-		$this->mapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($id), $this->equalTo($user));
-
-		$this->newsBusinessLayer->find($id, $user);
-	}
-
-
-	public function testFindDoesNotExist(){
-		$ex = new DoesNotExistException('hi');
-
-		$this->mapper->expects($this->once())
-			->method('find')
-			->will($this->throwException($ex));
-
-		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->newsBusinessLayer->find(1, '');
-	}
-
-
-	public function testFindMultiple(){
-		$ex = new MultipleObjectsReturnedException('hi');
-
-		$this->mapper->expects($this->once())
-			->method('find')
-			->will($this->throwException($ex));
-
-		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->newsBusinessLayer->find(1, '');
-	}
-
-}
diff --git a/tests/unit/businesslayer/FeedBusinessLayerTest.php b/tests/unit/businesslayer/FeedBusinessLayerTest.php
deleted file mode 100644
index 786b3016c..000000000
--- a/tests/unit/businesslayer/FeedBusinessLayerTest.php
+++ /dev/null
@@ -1,723 +0,0 @@
-<?php
-/**
- * ownCloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-
-namespace OCA\News\BusinessLayer;
-
-require_once(__DIR__ . "/../../classloader.php");
-
-use \OCP\AppFramework\Db\DoesNotExistException;
-
-use \OCA\News\Db\Feed;
-use \OCA\News\Db\Item;
-use \OCA\News\Fetcher\Fetcher;
-use \OCA\News\Fetcher\FetcherException;
-
-class FeedBusinessLayerTest extends \PHPUnit_Framework_TestCase {
-
-	private $feedMapper;
-	private $feedBusinessLayer;
-	private $user;
-	private $response;
-	private $fetcher;
-	private $itemMapper;
-	private $threshold;
-	private $time;
-	private $importParser;
-	private $autoPurgeMinimumInterval;
-	private $enhancer;
-	private $purifier;
-	private $l10n;
-	private $logger;
-	private $loggerParams;
-
-	protected function setUp(){
-		$this->logger = $this->getMockBuilder(
-			'\OCP\ILogger')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->loggerParams = ['hi'];
-		$this->time = 222;
-		$this->autoPurgeMinimumInterval = 10;
-		$timeFactory = $this->getMock('TimeFactory', ['getTime']);
-		$timeFactory->expects($this->any())
-			->method('getTime')
-			->will($this->returnValue($this->time));
-		$this->l10n = $this->getMockBuilder('\OCP\IL10N')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->feedMapper = $this->getMockBuilder('\OCA\News\Db\FeedMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->fetcher = $this->getMockBuilder('\OCA\News\Fetcher\Fetcher')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->itemMapper = $this->getMockBuilder('\OCA\News\Db\ItemMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->enhancer = $this->getMockBuilder('\OCA\News\ArticleEnhancer\Enhancer')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->purifier = $this->getMock('purifier', ['purify']);
-		$config = $this->getMockBuilder(
-			'\OCA\News\Utility\Config')
-			->disableOriginalConstructor()
-			->getMock();
-		$config->expects($this->any())
-			->method('getAutoPurgeMinimumInterval')
-			->will($this->returnValue($this->autoPurgeMinimumInterval));
-
-		$this->feedBusinessLayer = new FeedBusinessLayer($this->feedMapper,
-			$this->fetcher, $this->itemMapper, $this->logger, $this->l10n,
-			$timeFactory, $config, $this->enhancer, $this->purifier, $this->loggerParams);
-		$this->user = 'jack';
-	}
-
-
-	public function testFindAll(){
-		$this->feedMapper->expects($this->once())
-			->method('findAllFromUser')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($this->response));
-
-		$result = $this->feedBusinessLayer->findAll($this->user);
-		$this->assertEquals($this->response, $result);
-	}
-
-
-	public function testCreateDoesNotFindFeed(){
-		$ex = new FetcherException('hi');
-		$url = 'test';
-		$this->l10n->expects($this->once())
-			->method('t');
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->with($this->equalTo($url))
-			->will($this->throwException($ex));
-		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->feedBusinessLayer->create($url, 1, $this->user);
-	}
-
-	public function testCreate(){
-		$url = 'http://test';
-		$folderId = 10;
-		$createdFeed = new Feed();
-		$ex = new DoesNotExistException('yo');
-		$createdFeed->setUrl($url);
-		$createdFeed->setUrlHash('hsssi');
-		$createdFeed->setLink($url);
-		$item1 = new Item();
-		$item1->setGuidHash('hi');
-		$item2 = new Item();
-		$item2->setGuidHash('yo');
-		$return = [
-			$createdFeed,
-			[$item1, $item2]
-		];
-
-		$this->feedMapper->expects($this->once())
-			->method('findByUrlHash')
-			->with($this->equalTo($createdFeed->getUrlHash()), $this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->with($this->equalTo($url))
-			->will($this->returnValue($return));
-		$this->feedMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($createdFeed))
-			->will($this->returnValue($createdFeed));
-		$this->itemMapper->expects($this->at(0))
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($item2->getGuidHash()),
-				$this->equalTo($item2->getFeedId()),
-				$this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->enhancer->expects($this->at(0))
-			->method('enhance')
-			->with($this->equalTo($return[1][1]),
-				$this->equalTo($url))
-			->will($this->returnValue($return[1][1]));
-		$this->purifier->expects($this->at(0))
-			->method('purify')
-			->with($this->equalTo($return[1][1]->getBody()))
-			->will($this->returnValue($return[1][1]->getBody()));
-		$this->itemMapper->expects($this->at(1))
-			->method('insert')
-			->with($this->equalTo($return[1][1]));
-		$this->itemMapper->expects($this->at(2))
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($item1->getGuidHash()),
-				$this->equalTo($item1->getFeedId()),
-				$this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->enhancer->expects($this->at(1))
-			->method('enhance')
-			->with($this->equalTo($return[1][0]),
-				$this->equalTo($url))
-			->will($this->returnValue($return[1][0]));
-		$this->purifier->expects($this->at(1))
-			->method('purify')
-			->with($this->equalTo($return[1][0]->getBody()))
-			->will($this->returnValue($return[1][0]->getBody()));
-		$this->itemMapper->expects($this->at(3))
-			->method('insert')
-			->with($this->equalTo($return[1][0]));
-
-		$feed = $this->feedBusinessLayer->create($url, $folderId, $this->user);
-
-		$this->assertEquals($feed->getFolderId(), $folderId);
-		$this->assertEquals($feed->getUrl(), $url);
-		$this->assertEquals($feed->getArticlesPerUpdate(), 2);
-	}
-
-
-	public function testCreateItemGuidExistsAlready(){
-		$url = 'http://test';
-		$folderId = 10;
-		$ex = new DoesNotExistException('yo');
-		$createdFeed = new Feed();
-		$createdFeed->setUrl($url);
-		$createdFeed->setUrlHash($url);
-		$createdFeed->setLink($url);
-		$item1 = new Item();
-		$item1->setGuidHash('hi');
-		$item2 = new Item();
-		$item2->setGuidHash('yo');
-		$return = [
-			$createdFeed,
-			[$item1, $item2]
-		];
-
-		$this->feedMapper->expects($this->once())
-			->method('findByUrlHash')
-			->with($this->equalTo($createdFeed->getUrlHash()), 
-				$this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->with($this->equalTo($url))
-			->will($this->returnValue($return));
-		$this->feedMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($createdFeed))
-			->will($this->returnValue($createdFeed));
-		$this->itemMapper->expects($this->at(0))
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($item2->getGuidHash()),
-				$this->equalTo($item2->getFeedId()),
-				$this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->enhancer->expects($this->at(0))
-			->method('enhance')
-			->with($this->equalTo($return[1][1]),
-				$this->equalTo($url))
-			->will($this->returnValue($return[1][1]));
-		$this->purifier->expects($this->at(0))
-			->method('purify')
-			->with($this->equalTo($return[1][1]->getBody()))
-			->will($this->returnValue($return[1][1]->getBody()));
-		$this->itemMapper->expects($this->at(1))
-			->method('insert')
-			->with($this->equalTo($return[1][1]));
-		$this->itemMapper->expects($this->at(2))
-			->method('findByGuidHash')
-			->with(
-				$this->equalTo($item1->getGuidHash()),
-				$this->equalTo($item1->getFeedId()),
-				$this->equalTo($this->user));
-
-		$feed = $this->feedBusinessLayer->create($url, $folderId, $this->user);
-
-		$this->assertEquals($feed->getFolderId(), $folderId);
-		$this->assertEquals($feed->getUrl(), $url);
-		$this->assertEquals(1, $feed->getUnreadCount());
-	}
-
-
-	public function testUpdateCreatesNewEntry(){
-		$feed = new Feed();
-		$feed->setId(3);
-		$feed->setArticlesPerUpdate(1);
-		$feed->setUrlHash('yo');
-
-		$item = new Item();
-		$item->setGuidHash(md5('hi'));
-		$item->setFeedId(3);
-		$items = [$item];
-
-		$ex = new DoesNotExistException('hi');
-
-		$fetchReturn = [$feed, $items];
-
-		$this->feedMapper->expects($this->at(0))
-			->method('find')
-			->with($this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue($fetchReturn));
-		$this->itemMapper->expects($this->once())
-			->method('findByGuidHash')
-			->with($this->equalTo($items[0]->getGuidHash()),
-					$this->equalTo($items[0]->getFeedId()),
-					$this->equalTo($this->user))
-			->will($this->throwException($ex));
-		$this->enhancer->expects($this->at(0))
-			->method('enhance')
-			->with($this->equalTo($items[0]),
-				$this->equalTo($feed->getUrl()))
-			->will($this->returnValue($items[0]));
-		$this->purifier->expects($this->at(0))
-			->method('purify')
-			->with($this->equalTo($items[0]->getBody()))
-			->will($this->returnValue($items[0]->getBody()));
-		$this->itemMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($items[0]));
-
-		$this->feedMapper->expects($this->at(1))
-			->method('find')
-			->with($feed->getId(), $this->user)
-			->will($this->returnValue($feed));
-
-		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
-
-		$this->assertEquals($return, $feed);
-	}
-
-
-	public function testUpdateUpdatesArticlesPerFeedCount() {
-		$feed = new Feed();
-		$feed->setId(3);
-		$feed->setUrlHash('yo');
-
-		$existingFeed = new Feed();
-		$feed->setArticlesPerUpdate(2);
-
-		$item = new Item();
-		$item->setGuidHash(md5('hi'));
-		$item->setFeedId(3);
-		$items = [$item];
-
-		$this->feedMapper->expects($this->any())
-			->method('find')
-			->will($this->returnValue($existingFeed));
-
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue([$feed, $items]));
-
-		$this->feedMapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($existingFeed));
-
-
-		$this->feedBusinessLayer->update($feed->getId(), $this->user);
-	}
-
-	public function testUpdateFails(){
-		$feed = new Feed();
-		$feed->setId(3);
-		$ex = new FetcherException('');
-
-		$this->feedMapper->expects($this->at(0))
-			->method('find')
-			->with($this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->will($this->throwException($ex));
-		$this->logger->expects($this->any())
-			->method('debug');
-
-		$this->feedMapper->expects($this->at(1))
-			->method('find')
-			->with($feed->getId(), $this->user)
-			->will($this->returnValue($feed));
-
-		$return = $this->feedBusinessLayer->update($feed->getId(), $this->user);
-
-		$this->assertEquals($return, $feed);
-	}
-
-
-	public function testUpdateDoesNotFindEntry() {
-		$feed = new Feed();
-		$feed->setId(3);
-
-		$ex = new DoesNotExistException('');
-
-		$this->feedMapper->expects($this->at(0))
-			->method('find')
-			->with($this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->throwException($ex));
-
-		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->feedBusinessLayer->update($feed->getId(), $this->user);
-	}
-
-
-	public function testUpdateDoesNotFindUpdatedEntry() {
-		$feed = new Feed();
-		$feed->setId(3);
-		$feed->setArticlesPerUpdate(1);
-
-		$item = new Item();
-		$item->setGuidHash(md5('hi'));
-		$item->setPubDate(3333);
-		$item->setId(4);
-		$items = [$item];
-
-		$item2 = new Item();
-		$item2->setPubDate(111);
-
-		$fetchReturn = [$feed, $items];
-		$ex = new DoesNotExistException('');
-
-		$this->feedMapper->expects($this->at(0))
-			->method('find')
-			->with($this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->fetcher->expects($this->once())
-			->method('fetch')
-			->will($this->returnValue($fetchReturn));
-		$this->itemMapper->expects($this->once())
-			->method('findByGuidHash')
-			->with($this->equalTo($item->getGuidHash()),
-					$this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->returnValue($item2));;
-
-		$this->feedMapper->expects($this->at(1))
-			->method('find')
-			->with($this->equalTo($feed->getId()),
-					$this->equalTo($this->user))
-			->will($this->throwException($ex));
-
-		$this->setExpectedException('\OCA\News\BusinessLayer\BusinessLayerException');
-		$this->feedBusinessLayer->update($feed->getId(), $this->user);
-	}
-
-
-	public function testUpdateDoesntUpdateIfFeedIsPrevented() {
-		$feedId = 3;
-		$feed = new Feed();
-		$feed->setFolderId(16);
-		$feed->setId($feedId);
-		$feed->setPreventUpdate(true);
-
-		$this->feedMapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($feedId),
-				$this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->fetcher->expects($this->never())
-			->method('fetch');
-
-		$this->feedBusinessLayer->update($feedId, $this->user);
-	}
-
-
-	public function testMove(){
-		$feedId = 3;
-		$folderId = 4;
-		$feed = new Feed();
-		$feed->setFolderId(16);
-		$feed->setId($feedId);
-
-		$this->feedMapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($feedId), $this->equalTo($this->user))
-			->will($this->returnValue($feed));
-
-		$this->feedMapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($feed));
-
-		$this->feedBusinessLayer->move($feedId, $folderId, $this->user);
-
-		$this->assertEquals($folderId, $feed->getFolderId());
-	}
-
-
-	public function testRenameFeed(){
-		$feedId = 3;
-		$feedTitle = "New Feed Title";
-		$feed = new Feed();
-		$feed->setTitle("Feed Title");
-		$feed->setId($feedId);
-
-		$this->feedMapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($feedId), $this->equalTo($this->user))
-			->will($this->returnValue($feed));
-
-		$this->feedMapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($feed));
-
-		$this->feedBusinessLayer->rename($feedId, $feedTitle, $this->user);
-
-		$this->assertEquals($feedTitle, $feed->getTitle());
-	}
-
-
-	public function testImportArticles(){
-		$url = 'http://owncloud/nofeed';
-
-		$feed = new Feed();
-		$feed->setId(3);
-		$feed->setUserId($this->user);
-		$feed->setUrl($url);
-		$feed->setLink($url);
-		$feed->setTitle('Articles without feed');
-		$feed->setAdded($this->time);
-		$feed->setFolderId(0);
-		$feed->setPreventUpdate(true);
-
-		$feeds = [$feed];
-
-		$item = new Item();
-		$item->setFeedId(3);
-		$item->setAuthor('john');
-		$item->setGuid('s');
-		$item->setTitle('hey');
-		$item->setPubDate(333);
-		$item->setBody('come over');
-		$item->setEnclosureMime('mime');
-		$item->setEnclosureLink('lin');
-		$item->setUnread();
-		$item->setUnstarred();
-		$item->setLastModified($this->time);
-
-		$json = $item->toExport(['feed3' => $feed]);
-
-		$items = [$json];
-
-		$this->feedMapper->expects($this->once())
-			->method('findAllFromUser')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-
-		$this->itemMapper->expects($this->once())
-			->method('findByGuidHash')
-			->will($this->throwException(new DoesNotExistException('yo')));
-		$this->itemMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($item));
-
-		$this->purifier->expects($this->once())
-			->method('purify')
-			->with($this->equalTo($item->getBody()))
-			->will($this->returnValue($item->getBody()));
-
-		$result = $this->feedBusinessLayer->importArticles($items, $this->user);
-
-		$this->assertEquals(null, $result);
-	}
-
-
-	public function testImportArticlesCreatesOwnFeedWhenNotFound(){
-		$url = 'http://owncloud/args';
-
-		$feed = new Feed();
-		$feed->setId(3);
-		$feed->setUserId($this->user);
-		$feed->setUrl($url);
-		$feed->setLink($url);
-		$feed->setTitle('Articles without feed');
-		$feed->setAdded($this->time);
-		$feed->setFolderId(0);
-		$feed->setPreventUpdate(true);
-
-		$feeds = [$feed];
-
-		$item = new Item();
-		$item->setFeedId(3);
-		$item->setAuthor('john');
-		$item->setGuid('s');
-		$item->setTitle('hey');
-		$item->setPubDate(333);
-		$item->setBody('come over');
-		$item->setEnclosureMime('mime');
-		$item->setEnclosureLink('lin');
-		$item->setUnread();
-		$item->setUnstarred();
-		$item->setLastModified($this->time);
-
-		$json = $item->toExport(['feed3' => $feed]);
-		$json2 = $json;
-		$json2['feedLink'] = 'http://test.com'; // believe it or not this copies stuff :D
-
-		$items = [$json, $json2];
-
-		$insertFeed = new Feed();
-		$insertFeed->setLink('http://owncloud/nofeed');
-		$insertFeed->setUrl('http://owncloud/nofeed');
-		$insertFeed->setUserId($this->user);
-		$insertFeed->setTitle('Articles without feed');
-		$insertFeed->setAdded($this->time);
-		$insertFeed->setPreventUpdate(true);
-		$insertFeed->setFolderId(0);
-
-		$this->l10n->expects($this->once())
-			->method('t')
-			->will($this->returnValue('Articles without feed'));
-		$this->feedMapper->expects($this->once())
-			->method('findAllFromUser')
-			->with($this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-		$this->feedMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($insertFeed))
-			->will($this->returnValue($insertFeed));
-
-
-		$this->itemMapper->expects($this->at(0))
-			->method('findByGuidHash')
-			->will($this->throwException(new DoesNotExistException('yo')));
-		$this->purifier->expects($this->once())
-			->method('purify')
-			->with($this->equalTo($item->getBody()))
-			->will($this->returnValue($item->getBody()));
-		$this->itemMapper->expects($this->at(1))
-			->method('insert')
-			->with($this->equalTo($item));
-			
-		$this->itemMapper->expects($this->at(2))
-			->method('findByGuidHash')
-			->will($this->returnValue($item));
-		$this->itemMapper->expects($this->at(3))
-			->method('update')
-			->with($this->equalTo($item));
-
-		$this->feedMapper->expects($this->once())
-			->method('findByUrlHash')
-			->will($this->returnValue($feed));
-
-		$result = $this->feedBusinessLayer->importArticles($items, $this->user);
-
-		$this->assertEquals($feed, $result);
-	}
-
-
-	public function testMarkDeleted() {
-		$id = 3;
-		$feed = new Feed();
-		$feed2 = new Feed();
-		$feed2->setDeletedAt($this->time);
-
-		$this->feedMapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($id), $this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->feedMapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($feed2));
-
-		$this->feedBusinessLayer->markDeleted($id, $this->user);
-	}
-
-
-	public function testUnmarkDeleted() {
-		$id = 3;
-		$feed = new Feed();
-		$feed2 = new Feed();
-		$feed2->setDeletedAt(0);
-
-		$this->feedMapper->expects($this->once())
-			->method('find')
-			->with($this->equalTo($id), $this->equalTo($this->user))
-			->will($this->returnValue($feed));
-		$this->feedMapper->expects($this->once())
-			->method('update')
-			->with($this->equalTo($feed2));
-
-		$this->feedBusinessLayer->unmarkDeleted($id, $this->user);
-	}
-
-
-	public function testPurgeDeleted(){
-		$feed1 = new Feed();
-		$feed1->setId(3);
-		$feed2 = new Feed();
-		$feed2->setId(5);
-		$feeds = [$feed1, $feed2];
-
-		$time = $this->time - $this->autoPurgeMinimumInterval;
-		$this->feedMapper->expects($this->once())
-			->method('getToDelete')
-			->with($this->equalTo($time), $this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-		$this->feedMapper->expects($this->at(1))
-			->method('delete')
-			->with($this->equalTo($feed1));
-		$this->feedMapper->expects($this->at(2))
-			->method('delete')
-			->with($this->equalTo($feed2));
-
-		$this->feedBusinessLayer->purgeDeleted($this->user);
-	}
-
-
-	public function testPurgeDeletedWithoutInterval(){
-		$feed1 = new Feed();
-		$feed1->setId(3);
-		$feed2 = new Feed();
-		$feed2->setId(5);
-		$feeds = [$feed1, $feed2];
-
-		$this->feedMapper->expects($this->once())
-			->method('getToDelete')
-			->with($this->equalTo(null), $this->equalTo($this->user))
-			->will($this->returnValue($feeds));
-		$this->feedMapper->expects($this->at(1))
-			->method('delete')
-			->with($this->equalTo($feed1));
-		$this->feedMapper->expects($this->at(2))
-			->method('delete')
-			->with($this->equalTo($feed2));
-
-		$this->feedBusinessLayer->purgeDeleted($this->user, false);
-	}
-
-
-	public function testfindAllFromAllUsers() {
-		$expected = 'hi';
-		$this->feedMapper->expects($this->once())
-			->method('findAll')
-			->will($this->returnValue($expected));
-		$result = $this->feedBusinessLayer->findAllFromAllUsers();
-		$this->assertEquals($expected, $result);
-	}
-
-
-	public function testDeleteUser() {
-		$this->feedMapper->expects($this->once())
-			->method('deleteUser')
-			->will($this->returnValue($this->user));
-
-		$this->feedBusinessLayer->deleteUser($this->user);
-	}
-
-
-}
-
diff --git a/tests/unit/businesslayer/FolderBusinessLayerTest.php b/tests/unit/businesslayer/FolderBusinessLayerTest.php
deleted file mode 100644
index bf3cae569..000000000
--- a/tests/unit/businesslayer/FolderBusinessLayerTest.php
+++ /dev/null
@@ -1,275 +0,0 @@
-<?php
-/**
- * ownCloud - News
- *
- * This file is licensed under the Affero General Public License version 3 or
- * later. See the COPYING file.
- *
- * @author Alessandro Cosentino <cosenal@gmail.com>
- * @author Bernhard Posselt <dev@bernhard-posselt.com>
- * @copyright Alessandro Cosentino 2012
- * @copyright Bernhard Posselt 2012, 2014
- */
-
-namespace OCA\News\BusinessLayer;
-
-require_once(__DIR__ . "/../../classloader.php");
-
-
-use \OCA\News\Db\Folder;
-
-
-class FolderBusinessLayerTest extends \PHPUnit_Framework_TestCase {
-
-	private $folderMapper;
-	private $folderBusinessLayer;
-	private $time;
-	private $user;
-	private $autoPurgeMinimumInterval;
-	private $l10n;
-
-	protected function setUp(){
-		$this->l10n = $this->getMockBuilder('\OCP\IL10N')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->time = 222;
-		$timeFactory = $this->getMock('TimeFactory', ['getTime']);
-		$timeFactory->expects($this->any())
-			->method('getTime')
-			->will($this->returnValue($this->time));
-		$this->folderMapper = $this->getMockBuilder(
-			'\OCA\News\Db\FolderMapper')
-			->disableOriginalConstructor()
-			->getMock();
-		$this->autoPurgeMinimumInterval = 10;
-		$config = $this->getMockBuilder(
-			'\OCA\News\Utility\Config')
-			->disableOriginalConstructor()
-			->getMock();
-		$config->expects($this->any())
-			->method('getAutoPurgeMinimumInterval')
-			->will($this->returnValue($this->autoPurgeMinimumInterval));
-		$this->folderBusinessLayer = new FolderBusinessLayer(
-			$this->folderMapper, $this->l10n, $timeFactory, $config);
-		$this->user = 'hi';
-	}
-
-
-	function testFindAll(){
-		$userId = 'jack';
-		$return = 'hi';
-		$this->folderMapper->expects($this->once())
-			->method('findAllFromUser')
-			->with($this->equalTo($userId))
-			->will($this->returnValue($return));
-
-		$result = $this->folderBusinessLayer->findAll($userId);
-
-		$this->assertEquals($return, $result);
-	}
-
-
-	public function testCreate(){
-		$folder = new Folder();
-		$folder->setName('hey');
-		$folder->setParentId(5);
-		$folder->setUserId('john');
-		$folder->setOpened(true);
-
-		$this->folderMapper->expects($this->once())
-			->method('insert')
-			->with($this->equalTo($folder))
-			->will($this->returnValue($folder));
-
-		$result = $this->folderBusinessLayer->create('hey', 'john', 5);
-
-		$this->assertEquals($folder, $result);
-	}
-
-
-	public function testCreateThrowsExWhenFolderNameExists(){
-		$folderName = 'hihi';
-		$rows = [['id' =>