summaryrefslogtreecommitdiffstats
path: root/tests/Integration
diff options
context:
space:
mode:
Diffstat (limited to 'tests/Integration')
-rw-r--r--tests/Integration/Db/ItemMapperTest.php32
-rw-r--r--tests/Integration/Fixtures/FeedFixture.php47
-rw-r--r--tests/Integration/Fixtures/Fixture.php3
-rw-r--r--tests/Integration/Fixtures/FolderFixture.php20
-rw-r--r--tests/Integration/Fixtures/ItemFixture.php35
-rw-r--r--tests/Integration/IntegrationTest.php25
6 files changed, 62 insertions, 100 deletions
diff --git a/tests/Integration/Db/ItemMapperTest.php b/tests/Integration/Db/ItemMapperTest.php
index 28a6c3e11..ea7f306df 100644
--- a/tests/Integration/Db/ItemMapperTest.php
+++ b/tests/Integration/Db/ItemMapperTest.php
@@ -150,38 +150,6 @@ class ItemMapperTest extends IntegrationTest
}
- public function testReadFolder()
- {
- $this->loadFixtures('default');
-
- $folderId = $this->findFolderByName('first folder')->getId();
- $this->itemMapper->readFolder(
- $folderId, PHP_INT_MAX, 10, $this->user
- );
-
- $items = $this->itemMapper->findAllItems(
- 30, 0, 0, false, false, $this->user
- );
-
- $this->assertEquals(1, count($items));
-
- $item = $this->findItemByTitle('a title1');
- $item = $this->itemMapper->find($this->user, $item->getId());
-
- $this->assertEquals(10, $item->getLastModified());
-
- $item = $this->findItemByTitle('a title3');
- $item = $this->itemMapper->find($this->user, $item->getId());
-
- $this->assertEquals(10, $item->getLastModified());
-
- $item = $this->findItemByTitle('a title9');
- $item = $this->itemMapper->find($this->user, $item->getId());
-
- $this->assertTrue($item->isUnread());
- }
-
-
public function testReadFeed()
{
$this->loadFixtures('default');
diff --git a/tests/Integration/Fixtures/FeedFixture.php b/tests/Integration/Fixtures/FeedFixture.php
index 77abd3ee0..0c1e31af9 100644
--- a/tests/Integration/Fixtures/FeedFixture.php
+++ b/tests/Integration/Fixtures/FeedFixture.php
@@ -12,7 +12,6 @@
namespace OCA\News\Tests\Integration\Fixtures;
-
use OCA\News\Db\Feed;
class FeedFixture extends Feed
@@ -20,31 +19,33 @@ class FeedFixture extends Feed
use Fixture;
- public function __construct(array $defaults=[])
+ public function __construct(array $defaults = [])
{
+ parent::__construct();
$defaults = array_merge(
[
- 'userId' => 'test',
- 'urlHash' => 'urlHash',
- 'url' => 'http://the.url.com',
- 'title' => 'title',
- 'faviconLink' => 'http://feed.com/favicon.ico',
- 'added' => 3000,
- 'folderId' => null,
- 'link' => 'http://feed.com/rss',
- 'preventUpdate' => false,
- 'deletedAt' => 0,
- 'articlesPerUpdate' => 40,
- 'httpLastModified' => 10,
- 'httpEtag' => '',
- 'location' => 'http://feed.com/rss',
- 'ordering' => 0,
- 'fullTextEnabled' => false,
- 'pinned' => false,
- 'updateMode' => 0,
- 'updateErrorCount' => 0,
- 'lastUpdateError' => '',
- ], $defaults
+ 'userId' => 'test',
+ 'urlHash' => 'urlHash',
+ 'url' => 'http://the.url.com',
+ 'title' => 'title',
+ 'faviconLink' => 'http://feed.com/favicon.ico',
+ 'added' => 3000,
+ 'folderId' => null,
+ 'link' => 'http://feed.com/rss',
+ 'preventUpdate' => false,
+ 'deletedAt' => 0,
+ 'articlesPerUpdate' => 40,
+ 'httpLastModified' => 10,
+ 'httpEtag' => '',
+ 'location' => 'http://feed.com/rss',
+ 'ordering' => 0,
+ 'fullTextEnabled' => false,
+ 'pinned' => false,
+ 'updateMode' => 0,
+ 'updateErrorCount' => 0,
+ 'lastUpdateError' => '',
+ ],
+ $defaults
);
unset($defaults['items']);
$this->fillDefaults($defaults);
diff --git a/tests/Integration/Fixtures/Fixture.php b/tests/Integration/Fixtures/Fixture.php
index 1874c8102..366c93228 100644
--- a/tests/Integration/Fixtures/Fixture.php
+++ b/tests/Integration/Fixtures/Fixture.php
@@ -15,8 +15,7 @@ namespace OCA\News\Tests\Integration\Fixtures;
trait Fixture
{
-
- protected function fillDefaults(array $defaults=[])
+ protected function fillDefaults(array $defaults = [])
{
foreach ($defaults as $key => $value) {
$method = 'set' . ucfirst($key);
diff --git a/tests/Integration/Fixtures/FolderFixture.php b/tests/Integration/Fixtures/FolderFixture.php
index 09c03e5de..ffd6042c0 100644
--- a/tests/Integration/Fixtures/FolderFixture.php
+++ b/tests/Integration/Fixtures/FolderFixture.php
@@ -12,24 +12,26 @@
namespace OCA\News\Tests\Integration\Fixtures;
-
use OCA\News\Db\Folder;
class FolderFixture extends Folder
{
use Fixture;
- public function __construct(array $defaults=[])
+ public function __construct(array $defaults = [])
{
+ parent::__construct();
+
$defaults = array_merge(
[
- 'parentId' => null,
- 'name' => 'folder',
- 'userId' => 'test',
- 'opened' => true,
- 'deletedAt' => 0,
- 'lastModified' => 9
- ], $defaults
+ 'parentId' => null,
+ 'name' => 'folder',
+ 'userId' => 'test',
+ 'opened' => true,
+ 'deletedAt' => 0,
+ 'lastModified' => 9
+ ],
+ $defaults
);
unset($defaults['feeds']);
$this->fillDefaults($defaults);
diff --git a/tests/Integration/Fixtures/ItemFixture.php b/tests/Integration/Fixtures/ItemFixture.php
index e84b4250b..978b12b55 100644
--- a/tests/Integration/Fixtures/ItemFixture.php
+++ b/tests/Integration/Fixtures/ItemFixture.php
@@ -12,32 +12,33 @@
namespace OCA\News\Tests\Integration\Fixtures;
-
use OCA\News\Db\Item;
class ItemFixture extends Item
{
use Fixture;
- public function __construct(array $defaults=[])
+ public function __construct(array $defaults = [])
{
+ parent::__construct();
$defaults = array_merge(
[
- 'url' => 'http://google.de',
- 'title' => 'title',
- 'author' => 'my author',
- 'pubDate' => 2323,
- 'body' => 'this is a body',
- 'enclosureMime' => 'video/mpeg',
- 'enclosureLink' => 'http://google.de/web.webm',
- 'mediaThumbnail' => 'https://i3.ytimg.com/vi/Zgge1O9wdPY/hqdefault.jpg',
- 'mediaDescription' => 'The best video ever',
- 'feedId' => 0,
- 'unread' => true,
- 'starred' => false,
- 'lastModified' => 113,
- 'rtl' => false,
- ], $defaults
+ 'url' => 'http://google.de',
+ 'title' => 'title',
+ 'author' => 'my author',
+ 'pubDate' => 2323,
+ 'body' => 'this is a body',
+ 'enclosureMime' => 'video/mpeg',
+ 'enclosureLink' => 'http://google.de/web.webm',
+ 'mediaThumbnail' => 'https://i3.ytimg.com/vi/Zgge1O9wdPY/hqdefault.jpg',
+ 'mediaDescription' => 'The best video ever',
+ 'feedId' => 0,
+ 'unread' => true,
+ 'starred' => false,
+ 'lastModified' => 113,
+ 'rtl' => false,
+ ],
+ $defaults
);
if (!array_key_exists('guid', $defaults)) {
diff --git a/tests/Integration/IntegrationTest.php b/tests/Integration/IntegrationTest.php
index 6ecc3404c..bc309b339 100644
--- a/tests/Integration/IntegrationTest.php
+++ b/tests/Integration/IntegrationTest.php
@@ -12,6 +12,7 @@
namespace OCA\News\Tests\Integration;
+use OCA\News\Db\FolderMapperV2;
use OCA\News\Db\Item;
use OCP\AppFramework\Db\Entity;
use OCP\AppFramework\IAppContainer;
@@ -44,7 +45,7 @@ abstract class IntegrationTest extends \Test\TestCase
protected $feedMapper;
/**
- * @var FolderMapper
+ * @var FolderMapperV2
*/
protected $folderMapper;
@@ -64,7 +65,7 @@ abstract class IntegrationTest extends \Test\TestCase
// set up database layers
$this->itemMapper = $this->container->get(ItemMapper::class);
$this->feedMapper = $this->container->get(FeedMapper::class);
- $this->folderMapper = $this->container->get(FolderMapper::class);
+ $this->folderMapper = $this->container->get(FolderMapperV2::class);
}
protected function findItemByTitle($title)
@@ -92,16 +93,6 @@ abstract class IntegrationTest extends \Test\TestCase
return $result;
}
- protected function findFolderByName($name)
- {
- return $this->folderMapper->where(
- [
- 'userId' => $this->user,
- 'name' => $name
- ]
- )[0];
- }
-
protected function findFeedByTitle($title)
{
return $this->feedMapper->where(
@@ -115,7 +106,7 @@ abstract class IntegrationTest extends \Test\TestCase
/**
* @param string $name loads fixtures from a given file
*/
- protected function loadFixtures($name)
+ protected function loadFixtures(string $name)
{
$fixtures = include __DIR__ . '/Fixtures/data/' . $name . '.php';
if (array_key_exists('folders', $fixtures)) {
@@ -184,7 +175,7 @@ abstract class IntegrationTest extends \Test\TestCase
*/
protected function setupUser($user, $password)
{
- $userManager = $this->container->query(IUserManager::class);
+ $userManager = $this->container->get(IUserManager::class);
$userManager->createUser($user, $password);
$this->loginAsUser($user);
@@ -197,7 +188,7 @@ abstract class IntegrationTest extends \Test\TestCase
*/
protected function tearDownUser($user)
{
- $userManager = $this->container->query(IUserManager::class);
+ $userManager = $this->container->get(IUserManager::class);
if ($userManager->userExists($user)) {
$userManager->get($user)->delete();
@@ -211,7 +202,7 @@ abstract class IntegrationTest extends \Test\TestCase
*
* @param string $user
*/
- protected function clearUserNewsDatabase($user)
+ protected function clearUserNewsDatabase(string $user)
{
$sql = [
'DELETE FROM `*PREFIX*news_items` WHERE `feed_id` IN
@@ -220,7 +211,7 @@ abstract class IntegrationTest extends \Test\TestCase
'DELETE FROM `*PREFIX*news_folders` WHERE `user_id` = ?'
];
- $db = $this->container->query(IDBConnection::class);
+ $db = $this->container->get(IDBConnection::class);
foreach ($sql as $query) {
$db->prepare($query)->execute([$user]);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-05 15:05:52 +0000