Move to new directory structure

9 files changed, 0 insertions, 1911 deletions

diff --git a/tests/unit/db/FeedMapperTest.php b/tests/unit/db/FeedMapperTest.php
deleted file mode 100644
index 7e2f8d777..000000000
--- a/tests/unit/db/FeedMapperTest.php
+++ /dev/null
@@ -1,306 +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\Db;
-
-
-use OCA\News\Utility\Time;
-
-class FeedMapperTest extends \OCA\News\Tests\Unit\Db\MapperTestUtility {
-
-    private $mapper;
-    private $feeds;
-
-    protected function setUp(){
-        parent::setUp();
-
-        $this->mapper = new FeedMapper($this->db, new Time());
-
-        // create mock feeds
-        $feed1 = new Feed();
-        $feed2 = new Feed();
-
-        $this->feeds = [$feed1, $feed2];
-        $this->user = 'herman';
-    }
-
-
-    public function testFind(){
-        $userId = 'john';
-        $id = 3;
-        $rows = [
-          ['id' => $this->feeds[0]->getId()],
-        ];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`id` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $params = [$id, $userId];
-        $this->setMapperResult($sql, $params, $rows);
-
-        $result = $this->mapper->find($id, $userId);
-        $this->assertEquals($this->feeds[0], $result);
-
-    }
-
-
-    public function testFindNotFound(){
-        $userId = 'john';
-        $id = 3;
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`id` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $params = [$id, $userId];
-        $this->setMapperResult($sql, $params);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\DoesNotExistException'
-        );
-        $this->mapper->find($id, $userId);
-    }
-
-
-    public function testFindMoreThanOneResultFound(){
-        $userId = 'john';
-        $id = 3;
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`id` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $params = [$id, $userId];
-        $this->setMapperResult($sql, $params, $rows);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\MultipleObjectsReturnedException'
-        );
-        $this->mapper->find($id, $userId);
-    }
-
-
-    public function testFindAll(){
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '.
-                'ON `feeds`.`folder_id` = `folders`.`id` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE (`feeds`.`folder_id` = 0 ' .
-                'OR `folders`.`deleted_at` = 0' .
-            ')' .
-            'AND `feeds`.`deleted_at` = 0 ' .
-            'GROUP BY `feeds`.`id`';
-
-        $this->setMapperResult($sql, [], $rows);
-
-        $result = $this->mapper->findAll();
-        $this->assertEquals($this->feeds, $result);
-    }
-
-
-    public function testFindAllFromUser(){
-        $userId = 'john';
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` '.
-                'ON `feeds`.`folder_id` = `folders`.`id` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`user_id` = ? ' .
-            'AND (`feeds`.`folder_id` = 0 ' .
-                'OR `folders`.`deleted_at` = 0' .
-            ')' .
-            'AND `feeds`.`deleted_at` = 0 ' .
-            'GROUP BY `feeds`.`id`';
-        $this->setMapperResult($sql, [$userId], $rows);
-
-        $result = $this->mapper->findAllFromUser($userId);
-        $this->assertEquals($this->feeds, $result);
-    }
-
-
-    public function testFindByUrlHash(){
-        $urlHash = md5('hihi');
-        $row = [['id' => $this->feeds[0]->getId()]];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`url_hash` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $this->setMapperResult($sql, [$urlHash, $this->user], $row);
-
-        $result = $this->mapper->findByUrlHash($urlHash, $this->user);
-        $this->assertEquals($this->feeds[0], $result);
-    }
-
-
-    public function testFindByUrlHashNotFound(){
-        $urlHash = md5('hihi');
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`url_hash` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $this->setMapperResult($sql, [$urlHash, $this->user]);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\DoesNotExistException'
-        );
-        $this->mapper->findByUrlHash($urlHash, $this->user);
-    }
-
-
-    public function testFindByUrlHashMoreThanOneResultFound(){
-        $urlHash = md5('hihi');
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $sql = 'SELECT `feeds`.*, COUNT(`items`.`id`) AS `unread_count` ' .
-            'FROM `*PREFIX*news_feeds` `feeds` ' .
-            'LEFT JOIN `*PREFIX*news_items` `items` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` ' .
-                'AND (`items`.`status` & ' . StatusFlag::UNREAD . ') = ' .
-                StatusFlag::UNREAD . ' ' .
-            'WHERE `feeds`.`url_hash` = ? ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'GROUP BY `feeds`.`id`';
-        $this->setMapperResult($sql, [$urlHash, $this->user], $rows);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\MultipleObjectsReturnedException'
-        );
-        $this->mapper->findByUrlHash($urlHash, $this->user);
-    }
-
-
-    public function testDelete(){
-        $feed = new Feed();
-        $feed->setId(3);
-
-        $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `id` = ?';
-        $arguments = [$feed->getId()];
-
-        $sql2 = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` = ?';
-        $arguments2 = [$feed->getId()];
-
-        $pdoResult = $this->getMock('Result', ['fetch']);
-        $pdoResult->expects($this->any())->method('fetch');
-
-        $this->setMapperResult($sql, $arguments);
-        $this->setMapperResult($sql2, $arguments2);
-
-        $this->mapper->delete($feed);
-
-    }
-
-
-    public function testGetPurgeDeleted(){
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $deleteOlderThan = 110;
-        $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `deleted_at` < ? ';
-        $this->setMapperResult($sql, [$deleteOlderThan], $rows);
-        $result = $this->mapper->getToDelete($deleteOlderThan);
-
-        $this->assertEquals($this->feeds, $result);
-    }
-
-
-    public function testGetPurgeDeletedFromUser(){
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-        $deleteOlderThan = 110;
-        $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `deleted_at` < ? ' .
-            'AND `user_id` = ?';
-        $this->setMapperResult($sql, [$deleteOlderThan, $this->user], $rows);
-        $result = $this->mapper->getToDelete($deleteOlderThan, $this->user);
-
-        $this->assertEquals($this->feeds, $result);
-    }
-
-
-    public function testGetAllPurgeDeletedFromUser(){
-        $rows = [
-            ['id' => $this->feeds[0]->getId()],
-            ['id' => $this->feeds[1]->getId()]
-        ];
-
-        $sql = 'SELECT * FROM `*PREFIX*news_feeds` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `user_id` = ?';
-        $this->setMapperResult($sql, [$this->user], $rows);
-        $result = $this->mapper->getToDelete(null, $this->user);
-
-        $this->assertEquals($this->feeds, $result);
-    }
-
-
-    public function testDeleteFromUser(){
-        $userId = 'john';
-        $sql = 'DELETE FROM `*PREFIX*news_feeds` WHERE `user_id` = ?';
-
-        $this->setMapperResult($sql, [$userId]);
-
-        $this->mapper->deleteUser($userId);
-    }
-
-
-}
diff --git a/tests/unit/db/FeedTest.php b/tests/unit/db/FeedTest.php
deleted file mode 100644
index 25d2e4be2..000000000
--- a/tests/unit/db/FeedTest.php
+++ /dev/null
@@ -1,116 +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\Db;
-
-
-class FeedTest extends \PHPUnit_Framework_TestCase {
-
-
-    private function createFeed() {
-        $feed = new Feed();
-        $feed->setId(3);
-        $feed->setHttpLastModified(44);
-        $feed->setHttpEtag(45);
-        $feed->setUrl('http://google.com/some/weird/path');
-        $feed->setTitle('title');
-        $feed->setFaviconLink('favicon');
-        $feed->setAdded(123);
-        $feed->setFolderId(1);
-        $feed->setUnreadCount(321);
-        $feed->setLink('https://www.google.com/some/weird/path');
-        $feed->setLocation('http://google.at');
-        $feed->setOrdering(2);
-        $feed->setFullTextEnabled(true);
-        $feed->setPinned(true);
-        $feed->setUpdateMode(1);
-        $feed->setUpdateErrorCount(2);
-        $feed->setLastUpdateError('hi');
-        $feed->setBasicAuthUser('user');
-        $feed->setBasicAuthPassword('password');
-        return $feed;
-    }
-
-    public function testToAPI() {
-        $feed = $this->createFeed();
-
-        $this->assertEquals([
-            'id' => 3,
-            'url' => 'http://google.com/some/weird/path',
-            'title' => 'title',
-            'faviconLink' => 'favicon',
-            'added' => 123,
-            'folderId' => 1,
-            'unreadCount' => 321,
-            'ordering' => 2,
-            'pinned' => true,
-            'link' => 'https://www.google.com/some/weird/path',
-            'updateErrorCount' => 2,
-            'lastUpdateError' => 'hi'
-        ], $feed->toAPI());
-    }
-
-
-    public function testSerialize() {
-        $feed = $this->createFeed();
-
-        $this->assertEquals([
-            'id' => 3,
-            'url' => 'http://google.com/some/weird/path',
-            'title' => 'title',
-            'faviconLink' => 'favicon',
-            'added' => 123,
-            'folderId' => 1,
-            'unreadCount' => 321,
-            'link' => 'https://www.google.com/some/weird/path',
-            'userId' => null,
-            'urlHash' => '44168618f55392b145629d6b3922e84b',
-            'preventUpdate' => null,
-            'deletedAt' => null,
-            'articlesPerUpdate' => null,
-            'cssClass' => 'custom-google-com',
-            'location' => 'http://google.at',
-            'ordering' => 2,
-            'fullTextEnabled' => true,
-            'pinned' => true,
-            'updateMode' => 1,
-            'updateErrorCount' => 2,
-            'lastUpdateError' => 'hi',
-            'basicAuthUser' => 'user',
-            'basicAuthPassword' => 'password'
-        ], $feed->jsonSerialize());
-    }
-
-
-    public function testSetXSSUrl() {
-        $feed = new Feed();
-        $feed->setUrl('javascript:alert()');
-        $this->assertEquals('', $feed->getUrl());
-    }
-
-
-    public function testSetUrlUpdatesHash() {
-        $feed = new Feed();
-        $feed->setUrl('http://test');
-        $this->assertEquals(md5('http://test'), $feed->getUrlHash());
-    }
-
-
-    public function testSetXSSLink() {
-        $feed = new Feed();
-        $feed->setLink('javascript:alert()');
-        $this->assertEquals('', $feed->getLink());
-    }
-
-
-}
diff --git a/tests/unit/db/FolderMapperTest.php b/tests/unit/db/FolderMapperTest.php
deleted file mode 100644
index fcb82e7e1..000000000
--- a/tests/unit/db/FolderMapperTest.php
+++ /dev/null
@@ -1,196 +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\Db;
-
-
-use OCA\News\Utility\Time;
-
-class FolderMapperTest extends \OCA\News\Tests\Unit\Db\MapperTestUtility {
-
-    private $folderMapper;
-    private $folders;
-    private $user;
-
-    protected function setUp(){
-        parent::setUp();
-
-        $this->folderMapper = new FolderMapper($this->db, new Time());
-
-        // create mock folders
-        $folder1 = new Folder();
-        $folder2 = new Folder();
-
-        $this->folders = [$folder1, $folder2];
-        $this->user = 'hh';
-        $this->twoRows = [
-            ['id' => $this->folders[0]->getId()],
-            ['id' => $this->folders[1]->getId()]
-        ];
-    }
-
-
-    public function testFind(){
-        $userId = 'john';
-        $id = 3;
-        $rows = [['id' => $this->folders[0]->getId()]];
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `id` = ? ' .
-            'AND `user_id` = ?';
-
-        $this->setMapperResult($sql, [$id, $userId], $rows);
-
-        $result = $this->folderMapper->find($id, $userId);
-        $this->assertEquals($this->folders[0], $result);
-
-    }
-
-
-    public function testFindNotFound(){
-        $userId = 'john';
-        $id = 3;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `id` = ? ' .
-            'AND `user_id` = ?';
-
-        $this->setMapperResult($sql, [$id, $userId]);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\DoesNotExistException'
-        );
-        $this->folderMapper->find($id, $userId);
-    }
-
-
-    public function testFindMoreThanOneResultFound(){
-        $userId = 'john';
-        $id = 3;
-        $rows = $this->twoRows;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `id` = ? ' .
-            'AND `user_id` = ?';
-
-        $this->setMapperResult($sql, [$id, $userId], $rows);
-
-        $this->setExpectedException(
-            '\OCP\AppFramework\Db\MultipleObjectsReturnedException'
-        );
-        $this->folderMapper->find($id, $userId);
-    }
-
-
-
-    public function testFindAllFromUser(){
-        $userId = 'john';
-        $rows = $this->twoRows;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `user_id` = ? ' .
-            'AND `deleted_at` = 0';
-
-        $this->setMapperResult($sql, [$userId], $rows);
-
-        $result = $this->folderMapper->findAllFromUser($userId);
-        $this->assertEquals($this->folders, $result);
-    }
-
-
-    public function testFindByName(){
-        $folderName = 'heheh';
-        $userId = 'john';
-        $rows = $this->twoRows;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `name` = ? ' .
-            'AND `user_id` = ?';
-
-        $this->setMapperResult($sql, [$folderName, $userId], $rows);
-
-        $result = $this->folderMapper->findByName($folderName, $userId);
-        $this->assertEquals($this->folders, $result);
-    }
-
-
-    public function testDelete(){
-        $folder = new Folder();
-        $folder->setId(3);
-
-        $sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `id` = ?';
-        $arguments = [$folder->getId()];
-
-        $sql2 = 'DELETE FROM `*PREFIX*news_feeds` WHERE `folder_id` = ?';
-        $arguments2 = [$folder->getId()];
-
-        $sql3 = 'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` NOT IN '.
-            '(SELECT `feeds`.`id` FROM `*PREFIX*news_feeds` `feeds`)';
-
-        $this->setMapperResult($sql, $arguments, [], null, null, true);
-        $this->setMapperResult($sql2, $arguments2, [], null, null, true);
-        $this->setMapperResult($sql3, [], [], null, null, true);
-
-        $this->folderMapper->delete($folder);
-    }
-
-
-    public function testGetPurgeDeleted(){
-        $rows = $this->twoRows;
-        $deleteOlderThan = 110;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `deleted_at` < ? ';
-        $this->setMapperResult($sql, [$deleteOlderThan], $rows);
-        $result = $this->folderMapper->getToDelete($deleteOlderThan);
-
-        $this->assertEquals($this->folders, $result);
-    }
-
-
-
-    public function testGetPurgeDeletedUser(){
-        $rows = $this->twoRows;
-        $deleteOlderThan = 110;
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `deleted_at` < ? ' .
-            'AND `user_id` = ?';
-        $this->setMapperResult($sql, [$deleteOlderThan, $this->user], $rows);
-        $result = $this->folderMapper->getToDelete(
-            $deleteOlderThan, $this->user
-        );
-
-        $this->assertEquals($this->folders, $result);
-    }
-
-
-    public function testGetAllPurgeDeletedUser(){
-        $rows = $this->twoRows;
-
-        $sql = 'SELECT * FROM `*PREFIX*news_folders` ' .
-            'WHERE `deleted_at` > 0 ' .
-            'AND `user_id` = ?';
-        $this->setMapperResult($sql, [$this->user], $rows);
-        $result = $this->folderMapper->getToDelete(null, $this->user);
-
-        $this->assertEquals($this->folders, $result);
-    }
-
-
-    public function testDeleteFromUser(){
-        $userId = 'john';
-        $sql = 'DELETE FROM `*PREFIX*news_folders` WHERE `user_id` = ?';
-
-        $this->setMapperResult($sql, [$userId]);
-
-        $this->folderMapper->deleteUser($userId);
-    }
-
-
-}
\ No newline at end of file
diff --git a/tests/unit/db/FolderTest.php b/tests/unit/db/FolderTest.php
deleted file mode 100644
index 9d55035f1..000000000
--- a/tests/unit/db/FolderTest.php
+++ /dev/null
@@ -1,50 +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\Db;
-
-
-class FolderTest extends \PHPUnit_Framework_TestCase {
-
-
-    public function testToAPI() {
-        $folder = new Folder();
-        $folder->setId(3);
-        $folder->setName('name');
-
-        $this->assertEquals([
-            'id' => 3,
-            'name' => 'name'
-            ], $folder->toAPI());
-    }
-
-
-    public function testSerialize() {
-        $folder = new Folder();
-        $folder->setId(3);
-        $folder->setName('john');
-        $folder->setParentId(4);
-        $folder->setUserId('abc');
-        $folder->setOpened(true);
-        $folder->setDeletedAt(9);
-
-        $this->assertEquals([
-            'id' => 3,
-            'parentId' => 4,
-            'name' => 'john',
-            'userId' => 'abc',
-            'opened' => true,
-            'deletedAt' => 9,
-        ], $folder->jsonSerialize());
-    }
-}
\ No newline at end of file
diff --git a/tests/unit/db/ItemMapperTest.php b/tests/unit/db/ItemMapperTest.php
deleted file mode 100644
index 7b11b7862..000000000
--- a/tests/unit/db/ItemMapperTest.php
+++ /dev/null
@@ -1,550 +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\Db;
-
-
-use OCA\News\Utility\Time;
-
-class ItemMapperTest extends  \OCA\News\Tests\Unit\Db\MapperTestUtility {
-
-    private $mapper;
-    private $items;
-    private $newestItemId;
-    private $limit;
-    private $user;
-    private $offset;
-    private $updatedSince;
-    private $status;
-
-
-    public function setUp() {
-        parent::setup();
-
-        $this->mapper = new ItemMapper($this->db, new Time());
-
-        // create mock items
-        $item1 = new Item();
-        $item2 = new Item();
-
-        $this->items = [
-            $item1,
-            $item2
-        ];
-
-        $this->userId = 'john';
-        $this->id = 3;
-        $this->folderId = 2;
-
-        $this->row = [
-            ['id' => $this->items[0]->getId()],
-        ];
-
-        $this->rows = [
-            ['id' => $this->items[0]->getId()],
-            ['id' => $this->items[1]->getId()]
-        ];
-
-        $this->user = 'john';
-        $this->limit = 10;
-        $this->offset = 3;
-        $this->id = 11;
-        $this->status = 333;
-        $this->updatedSince = 323;
-        $this->newestItemId = 2;
-
-    }
-
-
-    private function makeSelectQuery($prependTo, $oldestFirst=false){
-        if ($oldestFirst) {
-            $ordering = 'ASC';
-        } else {
-            $ordering = 'DESC';
-        }
-
-        return 'SELECT `items`.* FROM `*PREFIX*news_items` `items` '.
-            'JOIN `*PREFIX*news_feeds` `feeds` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` '.
-                'AND `feeds`.`deleted_at` = 0 ' .
-                'AND `feeds`.`user_id` = ? ' .
-                $prependTo .
-            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
-                'ON `folders`.`id` = `feeds`.`folder_id` ' .
-            'WHERE `feeds`.`folder_id` = 0 ' .
-                'OR `folders`.`deleted_at` = 0 ' .
-            'ORDER BY `items`.`id` ' . $ordering;
-    }
-
-    private function makeSelectQueryStatus($prependTo, $status,
-                                           $oldestFirst=false, $search=[]) {
-        $status = (int) $status;
-
-        // WARNING: Potential SQL injection if you change this carelessly
-        $sql = 'AND ((`items`.`status` & ' . $status . ') = ' . $status . ') ';
-
-        foreach ($search as $_) {
-            $sql .= 'AND `items`.`search_index` LIKE ? ';
-        }
-
-        $sql .= $prependTo;
-
-        return $this->makeSelectQuery($sql, $oldestFirst);
-    }
-
-
-    public function testFind(){
-        $sql = $this->makeSelectQuery('AND `items`.`id` = ? ');
-
-        $this->setMapperResult(
-            $sql, [$this->userId, $this->id], $this->row
-        );
-
-        $result = $this->mapper->find($this->id, $this->userId);
-        $this->assertEquals($this->items[0], $result);
-    }
-
-
-    public function testGetStarredCount(){
-        $userId = 'john';
-        $row = [['size' => 9]];
-        $sql = 'SELECT COUNT(*) AS size FROM `*PREFIX*news_items` `items` '.
-            'JOIN `*PREFIX*news_feeds` `feeds` ' .
-                'ON `feeds`.`id` = `items`.`feed_id` '.
-                'AND `feeds`.`deleted_at` = 0 ' .
-                'AND `feeds`.`user_id` = ? ' .
-                'AND ((`items`.`status` & ' . StatusFlag::STARRED . ') = ' .
-                StatusFlag::STARRED . ')' .
-            'LEFT OUTER JOIN `*PREFIX*news_folders` `folders` ' .
-                'ON `folders`.`id` = `feeds`.`folder_id` ' .
-            'WHERE `feeds`.`folder_id` = 0 ' .
-                'OR `folders`.`deleted_at` = 0';
-
-        $this->setMapperResult($sql, [$userId], $row);
-
-        $result = $this->mapper->starredCount($userId);
-        $this->assertEquals($row[0]['size'], $result);
-    }
-
-
-    public function testReadAll(){
-        $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
-            ', `last_modified` = ? ' .
-            'WHERE `feed_id` IN (' .
-                'SELECT `id` FROM `*PREFIX*news_feeds` ' .
-                    'WHERE `user_id` = ? ' .
-                ') '.
-            'AND `id` <= ?';
-        $params = [~StatusFlag::UNREAD, $this->updatedSince, $this->user, 3];
-        $this->setMapperResult($sql, $params);
-        $this->mapper->readAll(3, $this->updatedSince, $this->user);
-    }
-
-
-    public function testReadFolder(){
-        $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
-            ', `last_modified` = ? ' .
-            'WHERE `feed_id` IN (' .
-                'SELECT `id` FROM `*PREFIX*news_feeds` ' .
-                    'WHERE `folder_id` = ? ' .
-                    'AND `user_id` = ? ' .
-                ') '.
-            'AND `id` <= ?';
-        $params = [~StatusFlag::UNREAD, $this->updatedSince, 3, $this->user, 6];
-        $this->setMapperResult($sql, $params);
-        $this->mapper->readFolder(3, 6, $this->updatedSince, $this->user);
-    }
-
-
-    public function testReadFeed(){
-        $sql = 'UPDATE `*PREFIX*news_items` ' .
-            'SET `status` = `status` & ? ' .
-            ', `last_modified` = ? ' .
-                'WHERE `feed_id` = ? ' .
-                'AND `id` <= ? ' .
-                'AND EXISTS (' .
-                    'SELECT * FROM `*PREFIX*news_feeds` ' .
-                    'WHERE `user_id` = ? ' .
-                    'AND `id` = ? ) ';
-        $params = [
-            ~StatusFlag::UNREAD, $this->updatedSince, 3, 6, $this->user, 3
-        ];
-        $this->setMapperResult($sql, $params);