Article content 1
"], @@ -1185,6 +1623,14 @@ trait SeriesArticle { $this->assertResult($exp, Arsse::$db->articleList("jill.doe@example.com", (new Context)->subscription(15), ["id", "content"])); } + /** + * @covers \JKingWeb\Arsse\Database::articleList + * @covers \JKingWeb\Arsse\Database::articleQuery + * @covers \JKingWeb\Arsse\Database::articleValidateId + * @covers \JKingWeb\Arsse\Database::articleValidateEdition + * @covers \JKingWeb\Arsse\Database::articleColumns + * @covers \JKingWeb\Arsse\Database::articleFilter + */ public function testSearchScrapedContent(): void { $exp = [ ['id' => 101, 'content' => "Scraped content 1
"], diff --git a/tests/cases/Database/SeriesCleanup.php b/tests/cases/Database/SeriesCleanup.php index 3ec32ace..7d745a06 100644 --- a/tests/cases/Database/SeriesCleanup.php +++ b/tests/cases/Database/SeriesCleanup.php @@ -170,6 +170,7 @@ trait SeriesCleanup { unset($this->data); } + /** @covers \JKingWeb\Arsse\Database::feedCleanup */ public function testCleanUpOrphanedFeeds(): void { Arsse::$db->feedCleanup(); $now = gmdate("Y-m-d H:i:s"); @@ -182,6 +183,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedCleanup */ public function testCleanUpOrphanedFeedsWithUnlimitedRetention(): void { Arsse::$conf->import([ 'purgeFeeds' => null, @@ -196,6 +198,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::iconCleanup */ public function testCleanUpOrphanedIcons(): void { Arsse::$db->iconCleanup(); $now = gmdate("Y-m-d H:i:s"); @@ -208,6 +211,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::iconCleanup */ public function testCleanUpOrphanedIconsWithUnlimitedRetention(): void { Arsse::$conf->import([ 'purgeFeeds' => null, @@ -222,6 +226,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::articleCleanup */ public function testCleanUpOldArticlesWithStandardRetention(): void { Arsse::$db->articleCleanup(); $state = $this->primeExpectations($this->data, [ @@ -233,6 +238,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::articleCleanup */ public function testCleanUpOldArticlesWithUnlimitedReadRetention(): void { Arsse::$conf->import([ 'purgeArticlesRead' => null, @@ -247,6 +253,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::articleCleanup */ public function testCleanUpOldArticlesWithUnlimitedUnreadRetention(): void { Arsse::$conf->import([ 'purgeArticlesUnread' => null, @@ -261,6 +268,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::articleCleanup */ public function testCleanUpOldArticlesWithUnlimitedRetention(): void { Arsse::$conf->import([ 'purgeArticlesRead' => null, @@ -273,6 +281,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::sessionCleanup */ public function testCleanUpExpiredSessions(): void { Arsse::$db->sessionCleanup(); $state = $this->primeExpectations($this->data, [ @@ -284,6 +293,7 @@ trait SeriesCleanup { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::tokenCleanup */ public function testCleanUpExpiredTokens(): void { Arsse::$db->tokenCleanup(); $state = $this->primeExpectations($this->data, [ diff --git a/tests/cases/Database/SeriesFeed.php b/tests/cases/Database/SeriesFeed.php index f80e4b04..4e18c774 100644 --- a/tests/cases/Database/SeriesFeed.php +++ b/tests/cases/Database/SeriesFeed.php @@ -192,10 +192,12 @@ trait SeriesFeed { unset($this->data, $this->matches); } + /** @covers \JKingWeb\Arsse\Database::feedMatchLatest */ public function testListLatestItems(): void { $this->assertResult($this->matches, Arsse::$db->feedMatchLatest(1, 2)); } + /** @covers \JKingWeb\Arsse\Database::feedMatchIds */ public function testMatchItemsById(): void { $this->assertResult($this->matches, Arsse::$db->feedMatchIds(1, ['804e517d623390e71497982c77cf6823180342ebcd2e7d5e32da1e55b09dd180','db3e736c2c492f5def5c5da33ddcbea1824040e9ced2142069276b0a6e291a41'])); foreach ($this->matches as $m) { @@ -207,7 +209,10 @@ trait SeriesFeed { $this->assertResult([['id' => 1]], Arsse::$db->feedMatchIds(1, ['e433653cef2e572eee4215fa299a4a5af9137b2cefd6283c85bd69a32915beda'])); // this ID appears in both feed 1 and feed 2; only one result should be returned } - /** @dataProvider provideFilterRules */ + /** + * @dataProvider provideFilterRules + * @covers \JKingWeb\Arsse\Database::feedRulesGet + */ public function testGetRules(int $in, array $exp): void { $this->assertSame($exp, Arsse::$db->feedRulesGet($in)); } @@ -222,6 +227,7 @@ trait SeriesFeed { ]; } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testUpdateAFeed(): void { // update a valid feed with both new and changed items Arsse::$db->feedUpdate(1); @@ -263,21 +269,25 @@ trait SeriesFeed { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testUpdateAMissingFeed(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->feedUpdate(2112); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testUpdateAnInvalidFeed(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->feedUpdate(-1); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testUpdateAFeedThrowingExceptions(): void { $this->assertException("invalidUrl", "Feed"); Arsse::$db->feedUpdate(3, true); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testUpdateAFeedWithEnclosuresAndCategories(): void { Arsse::$db->feedUpdate(5); $state = $this->primeExpectations($this->data, [ @@ -298,6 +308,7 @@ trait SeriesFeed { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedListStale */ public function testListStaleFeeds(): void { $this->assertEquals([1,3,4], Arsse::$db->feedListStale()); Arsse::$db->feedUpdate(3); @@ -305,6 +316,7 @@ trait SeriesFeed { $this->assertEquals([1], Arsse::$db->feedListStale()); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testCheckIconDuringFeedUpdate(): void { Arsse::$db->feedUpdate(6); $state = $this->primeExpectations($this->data, [ @@ -314,6 +326,7 @@ trait SeriesFeed { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testAssignIconDuringFeedUpdate(): void { Arsse::$db->feedUpdate(7); $state = $this->primeExpectations($this->data, [ @@ -324,6 +337,7 @@ trait SeriesFeed { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testChangeIconDuringFeedUpdate(): void { Arsse::$db->feedUpdate(8); $state = $this->primeExpectations($this->data, [ @@ -334,6 +348,7 @@ trait SeriesFeed { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ public function testAddIconDuringFeedUpdate(): void { Arsse::$db->feedUpdate(9); $state = $this->primeExpectations($this->data, [ @@ -344,4 +359,21 @@ trait SeriesFeed { $state['arsse_icons']['rows'][] = [4,'http://localhost:8000/Icon/SVG2','image/svg+xml','']; $this->compareExpectations(static::$drv, $state); } + + /** @covers \JKingWeb\Arsse\Database::feedUpdate */ + public function testUpdateUnmodifiedFeed(): void { + $this->markTestIncomplete("FIXME: there is a bug here around calculation of nextFetch date"); + $state = $this->primeExpectations($this->data, [ + 'arsse_icons' => ["id", "url", "type", "data"], + 'arsse_feeds' => ["id", "url", "title", "err_count", "err_msg", "modified", "next_fetch", "size", "icon"], + 'arsse_subscriptions' => ["id", "owner", "feed", "keep_rule", "block_rule"], + 'arsse_articles' => ["id", "feed", "url", "title", "author", "published", "edited", "content", "guid", "url_title_hash", "url_content_hash", "title_content_hash", "modified"], + 'arsse_editions' => ["id", "article", "modified"], + 'arsse_marks' => ["article", "subscription", "read", "starred", "hidden", "modified"], + 'arsse_enclosures' => ["article", "url", "type"], + 'arsse_categories' => ["article", "name"], + ]); + Arsse::$db->feedUpdate(4); + $this->compareExpectations(static::$drv, $state); + } } diff --git a/tests/cases/Database/SeriesFolder.php b/tests/cases/Database/SeriesFolder.php index 6b0a0f56..ea0946e1 100644 --- a/tests/cases/Database/SeriesFolder.php +++ b/tests/cases/Database/SeriesFolder.php @@ -99,6 +99,11 @@ trait SeriesFolder { unset($this->data); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddARootFolder(): void { $user = "john.doe@example.com"; $folderID = $this->nextID("arsse_folders"); @@ -108,11 +113,21 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddADuplicateRootFolder(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => "Politics"]); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddANestedFolder(): void { $user = "john.doe@example.com"; $folderID = $this->nextID("arsse_folders"); @@ -122,36 +137,70 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddANestedFolderToAMissingParent(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => "Sociology", 'parent' => 2112]); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddANestedFolderToAnInvalidParent(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => "Sociology", 'parent' => "stringFolderId"]); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddANestedFolderForTheWrongOwner(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => "Sociology", 'parent' => 4]); // folder ID 4 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddAFolderWithAMissingName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", []); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddAFolderWithABlankName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => ""]); } + /** + * @covers \JKingWeb\Arsse\Database::folderAdd + * @covers \JKingWeb\Arsse\Database::folderValidateId + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testAddAFolderWithAWhitespaceName(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); Arsse::$db->folderAdd("john.doe@example.com", ['name' => " "]); } + /** + * @covers \JKingWeb\Arsse\Database::folderList + * @covers \JKingWeb\Arsse\Database::folderValidateId + */ public function testListRootFolders(): void { $exp = [ ['id' => 5, 'name' => "Politics", 'parent' => null, 'children' => 0, 'feeds' => 2], @@ -166,6 +215,10 @@ trait SeriesFolder { $this->assertResult($exp, Arsse::$db->folderList("admin@example.net", null, false)); } + /** + * @covers \JKingWeb\Arsse\Database::folderList + * @covers \JKingWeb\Arsse\Database::folderValidateId + */ public function testListFoldersRecursively(): void { $exp = [ ['id' => 5, 'name' => "Politics", 'parent' => null, 'children' => 0, 'feeds' => 2], @@ -185,16 +238,25 @@ trait SeriesFolder { $this->assertResult($exp, Arsse::$db->folderList("jane.doe@example.com", 4, true)); } + /** + * @covers \JKingWeb\Arsse\Database::folderList + * @covers \JKingWeb\Arsse\Database::folderValidateId + */ public function testListFoldersOfAMissingParent(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderList("john.doe@example.com", 2112); } + /** + * @covers \JKingWeb\Arsse\Database::folderList + * @covers \JKingWeb\Arsse\Database::folderValidateId + */ public function testListFoldersOfTheWrongOwner(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderList("john.doe@example.com", 4); // folder ID 4 belongs to Jane } + /** @covers \JKingWeb\Arsse\Database::folderRemove */ public function testRemoveAFolder(): void { $this->assertTrue(Arsse::$db->folderRemove("john.doe@example.com", 6)); $state = $this->primeExpectations($this->data, ['arsse_folders' => ['id','owner', 'parent', 'name']]); @@ -202,6 +264,7 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::folderRemove */ public function testRemoveAFolderTree(): void { $this->assertTrue(Arsse::$db->folderRemove("john.doe@example.com", 1)); $state = $this->primeExpectations($this->data, ['arsse_folders' => ['id','owner', 'parent', 'name']]); @@ -211,21 +274,25 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::folderRemove */ public function testRemoveAMissingFolder(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderRemove("john.doe@example.com", 2112); } + /** @covers \JKingWeb\Arsse\Database::folderRemove */ public function testRemoveAnInvalidFolder(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->folderRemove("john.doe@example.com", -1); } + /** @covers \JKingWeb\Arsse\Database::folderRemove */ public function testRemoveAFolderOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderRemove("john.doe@example.com", 4); // folder ID 4 belongs to Jane } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesGet */ public function testGetThePropertiesOfAFolder(): void { $exp = [ 'id' => 6, @@ -235,25 +302,33 @@ trait SeriesFolder { $this->assertArraySubset($exp, Arsse::$db->folderPropertiesGet("john.doe@example.com", 6)); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesGet */ public function testGetThePropertiesOfAMissingFolder(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesGet("john.doe@example.com", 2112); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesGet */ public function testGetThePropertiesOfAnInvalidFolder(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesGet("john.doe@example.com", -1); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesGet */ public function testGetThePropertiesOfAFolderOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesGet("john.doe@example.com", 4); // folder ID 4 belongs to Jane } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesSet */ public function testMakeNoChangesToAFolder(): void { $this->assertFalse(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, [])); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testRenameAFolder(): void { $this->assertTrue(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['name' => "Opinion"])); $state = $this->primeExpectations($this->data, ['arsse_folders' => ['id','owner', 'parent', 'name']]); @@ -261,25 +336,45 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testRenameTheRootFolder(): void { $this->assertFalse(Arsse::$db->folderPropertiesSet("john.doe@example.com", null, ['name' => "Opinion"])); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testRenameAFolderToTheEmptyString(): void { $this->assertException("missing", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['name' => ""])); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testRenameAFolderToWhitespaceOnly(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['name' => " "])); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + */ public function testRenameAFolderToAnInvalidValue(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['name' => []])); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveAFolder(): void { $this->assertTrue(Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['parent' => 5])); $state = $this->primeExpectations($this->data, ['arsse_folders' => ['id','owner', 'parent', 'name']]); @@ -287,51 +382,83 @@ trait SeriesFolder { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveTheRootFolder(): void { $this->assertException("circularDependence", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 0, ['parent' => 1]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveAFolderToItsDescendant(): void { $this->assertException("circularDependence", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 1, ['parent' => 3]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveAFolderToItself(): void { $this->assertException("circularDependence", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 1, ['parent' => 1]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveAFolderToAMissingParent(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 1, ['parent' => 2112]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testMoveAFolderToAnInvalidParent(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 1, ['parent' => "ThisFolderDoesNotExist"]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testCauseAFolderCollision(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 6, ['parent' => null]); } + /** + * @covers \JKingWeb\Arsse\Database::folderPropertiesSet + * @covers \JKingWeb\Arsse\Database::folderValidateName + * @covers \JKingWeb\Arsse\Database::folderValidateMove + */ public function testCauseACompoundFolderCollision(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 3, ['parent' => null, 'name' => "Technology"]); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesSet */ public function testSetThePropertiesOfAMissingFolder(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 2112, ['parent' => null]); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesSet */ public function testSetThePropertiesOfAnInvalidFolder(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", -1, ['parent' => null]); } + /** @covers \JKingWeb\Arsse\Database::folderPropertiesSet */ public function testSetThePropertiesOfAFolderForTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->folderPropertiesSet("john.doe@example.com", 4, ['parent' => null]); // folder ID 4 belongs to Jane diff --git a/tests/cases/Database/SeriesIcon.php b/tests/cases/Database/SeriesIcon.php index 31faf17d..361a0280 100644 --- a/tests/cases/Database/SeriesIcon.php +++ b/tests/cases/Database/SeriesIcon.php @@ -83,6 +83,7 @@ trait SeriesIcon { unset($this->data); } + /** @covers \JKingWeb\Arsse\Database::iconList */ public function testListTheIconsOfAUser() { $exp = [ ['id' => 1,'url' => 'http://localhost:8000/Icon/PNG', 'type' => 'image/png', 'data' => base64_decode("iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAYAAAAfFcSJAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAAZdEVYdFNvZnR3YXJlAHBhaW50Lm5ldCA0LjAuMjHxIGmVAAAADUlEQVQYV2NgYGBgAAAABQABijPjAAAAAABJRU5ErkJggg==")], diff --git a/tests/cases/Database/SeriesLabel.php b/tests/cases/Database/SeriesLabel.php index 2c6f9156..4170376c 100644 --- a/tests/cases/Database/SeriesLabel.php +++ b/tests/cases/Database/SeriesLabel.php @@ -255,6 +255,10 @@ trait SeriesLabel { unset($this->data, $this->checkLabels, $this->checkMembers, $this->user); } + /** + * @covers \JKingWeb\Arsse\Database::labelAdd + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testAddALabel(): void { $user = "john.doe@example.com"; $labelID = $this->nextID("arsse_labels"); @@ -264,26 +268,43 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelAdd + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testAddADuplicateLabel(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->labelAdd("john.doe@example.com", ['name' => "Interesting"]); } + /** + * @covers \JKingWeb\Arsse\Database::labelAdd + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testAddALabelWithAMissingName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->labelAdd("john.doe@example.com", []); } + /** + * @covers \JKingWeb\Arsse\Database::labelAdd + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testAddALabelWithABlankName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->labelAdd("john.doe@example.com", ['name' => ""]); } + /** + * @covers \JKingWeb\Arsse\Database::labelAdd + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testAddALabelWithAWhitespaceName(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); Arsse::$db->labelAdd("john.doe@example.com", ['name' => " "]); } + /** @covers \JKingWeb\Arsse\Database::labelList */ public function testListLabels(): void { $exp = [ ['id' => 2, 'name' => "Fascinating", 'articles' => 3, 'read' => 1], @@ -299,6 +320,10 @@ trait SeriesLabel { $this->assertResult($exp, Arsse::$db->labelList("jane.doe@example.com", false)); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveALabel(): void { $this->assertTrue(Arsse::$db->labelRemove("john.doe@example.com", 1)); $state = $this->primeExpectations($this->data, $this->checkLabels); @@ -306,6 +331,10 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveALabelByName(): void { $this->assertTrue(Arsse::$db->labelRemove("john.doe@example.com", "Interesting", true)); $state = $this->primeExpectations($this->data, $this->checkLabels); @@ -313,26 +342,46 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveAMissingLabel(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelRemove("john.doe@example.com", 2112); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveAnInvalidLabel(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelRemove("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveAnInvalidLabelByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelRemove("john.doe@example.com", [], true); } + /** + * @covers \JKingWeb\Arsse\Database::labelRemove + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testRemoveALabelOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelRemove("john.doe@example.com", 3); // label ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testGetThePropertiesOfALabel(): void { $exp = [ 'id' => 2, @@ -344,30 +393,56 @@ trait SeriesLabel { $this->assertArraySubset($exp, Arsse::$db->labelPropertiesGet("john.doe@example.com", "Fascinating", true)); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testGetThePropertiesOfAMissingLabel(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesGet("john.doe@example.com", 2112); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testGetThePropertiesOfAnInvalidLabel(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesGet("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testGetThePropertiesOfAnInvalidLabelByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesGet("john.doe@example.com", [], true); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testGetThePropertiesOfALabelOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesGet("john.doe@example.com", 3); // label ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testMakeNoChangesToALabel(): void { $this->assertFalse(Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, [])); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testRenameALabel(): void { $this->assertTrue(Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, ['name' => "Curious"])); $state = $this->primeExpectations($this->data, $this->checkLabels); @@ -375,6 +450,11 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testRenameALabelByName(): void { $this->assertTrue(Arsse::$db->labelPropertiesSet("john.doe@example.com", "Interesting", ['name' => "Curious"], true)); $state = $this->primeExpectations($this->data, $this->checkLabels); @@ -382,46 +462,90 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testRenameALabelToTheEmptyString(): void { $this->assertException("missing", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, ['name' => ""])); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testRenameALabelToWhitespaceOnly(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, ['name' => " "])); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testRenameALabelToAnInvalidValue(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, ['name' => []])); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testCauseALabelCollision(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesSet("john.doe@example.com", 1, ['name' => "Fascinating"]); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testSetThePropertiesOfAMissingLabel(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesSet("john.doe@example.com", 2112, ['name' => "Exciting"]); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testSetThePropertiesOfAnInvalidLabel(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesSet("john.doe@example.com", -1, ['name' => "Exciting"]); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testSetThePropertiesOfAnInvalidLabelByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesSet("john.doe@example.com", [], ['name' => "Exciting"], true); } + /** + * @covers \JKingWeb\Arsse\Database::labelPropertiesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + * @covers \JKingWeb\Arsse\Database::labelValidateName + */ public function testSetThePropertiesOfALabelForTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelPropertiesSet("john.doe@example.com", 3, ['name' => "Exciting"]); // label ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testListLabelledArticles(): void { $exp = [1,19]; $this->assertEquals($exp, Arsse::$db->labelArticlesGet("john.doe@example.com", 1)); @@ -434,16 +558,28 @@ trait SeriesLabel { $this->assertEquals($exp, Arsse::$db->labelArticlesGet("john.doe@example.com", "Lonely", true)); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testListLabelledArticlesForAMissingLabel(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->labelArticlesGet("john.doe@example.com", 3); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesGet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testListLabelledArticlesForAnInvalidLabel(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->labelArticlesGet("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testApplyALabelToArticles(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([2,5])); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -452,6 +588,10 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testClearALabelFromArticles(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([1,5]), Database::ASSOC_REMOVE); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -459,6 +599,10 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testApplyALabelToArticlesByName(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", "Interesting", (new Context)->articles([2,5]), Database::ASSOC_ADD, true); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -467,6 +611,10 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testClearALabelFromArticlesByName(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", "Interesting", (new Context)->articles([1,5]), Database::ASSOC_REMOVE, true); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -474,18 +622,30 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testApplyALabelToNoArticles(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([10000])); $state = $this->primeExpectations($this->data, $this->checkMembers); $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testClearALabelFromNoArticles(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([10000]), Database::ASSOC_REMOVE); $state = $this->primeExpectations($this->data, $this->checkMembers); $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testReplaceArticlesOfALabel(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([2,5]), Database::ASSOC_REPLACE); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -496,6 +656,10 @@ trait SeriesLabel { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::labelArticlesSet + * @covers \JKingWeb\Arsse\Database::labelValidateId + */ public function testPurgeArticlesOfALabel(): void { Arsse::$db->labelArticlesSet("john.doe@example.com", 1, (new Context)->articles([10000]), Database::ASSOC_REPLACE); $state = $this->primeExpectations($this->data, $this->checkMembers); diff --git a/tests/cases/Database/SeriesMeta.php b/tests/cases/Database/SeriesMeta.php index 8037dcbb..5507e060 100644 --- a/tests/cases/Database/SeriesMeta.php +++ b/tests/cases/Database/SeriesMeta.php @@ -36,6 +36,7 @@ trait SeriesMeta { unset($this->data); } + /** @covers \JKingWeb\Arsse\Database::metaSet */ public function testAddANewValue(): void { $this->assertTrue(Arsse::$db->metaSet("favourite", "Cygnus X-1")); $state = $this->primeExpectations($this->data, ['arsse_meta' => ['key','value']]); @@ -43,6 +44,7 @@ trait SeriesMeta { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::metaSet */ public function testAddANewTypedValue(): void { $this->assertTrue(Arsse::$db->metaSet("answer", 42, "int")); $this->assertTrue(Arsse::$db->metaSet("true", true, "bool")); @@ -56,6 +58,7 @@ trait SeriesMeta { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::metaSet */ public function testChangeAnExistingValue(): void { $this->assertTrue(Arsse::$db->metaSet("album", "Hemispheres")); $state = $this->primeExpectations($this->data, ['arsse_meta' => ['key','value']]); @@ -63,6 +66,7 @@ trait SeriesMeta { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::metaRemove */ public function testRemoveAValue(): void { $this->assertTrue(Arsse::$db->metaRemove("album")); $this->assertFalse(Arsse::$db->metaRemove("album")); @@ -71,6 +75,7 @@ trait SeriesMeta { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::metaGet */ public function testRetrieveAValue(): void { $this->assertSame("".Database::SCHEMA_VERSION, Arsse::$db->metaGet("schema_version")); $this->assertSame("A Farewell to Kings", Arsse::$db->metaGet("album")); diff --git a/tests/cases/Database/SeriesMiscellany.php b/tests/cases/Database/SeriesMiscellany.php index 102f56a7..0decc917 100644 --- a/tests/cases/Database/SeriesMiscellany.php +++ b/tests/cases/Database/SeriesMiscellany.php @@ -20,12 +20,22 @@ trait SeriesMiscellany { protected function tearDownSeriesMiscellany(): void { } + /** + * @covers \JKingWeb\Arsse\Database::__construct + * @covers \JKingWeb\Arsse\Database::driverSchemaVersion + * @covers \JKingWeb\Arsse\Database::driverSchemaUpdate + */ public function testInitializeDatabase(): void { static::dbRaze(static::$drv); $d = new Database(true); $this->assertSame(Database::SCHEMA_VERSION, $d->driverSchemaVersion()); } + /** + * @covers \JKingWeb\Arsse\Database::__construct + * @covers \JKingWeb\Arsse\Database::driverSchemaVersion + * @covers \JKingWeb\Arsse\Database::driverSchemaUpdate + */ public function testManuallyInitializeDatabase(): void { static::dbRaze(static::$drv); $d = new Database(false); @@ -35,10 +45,12 @@ trait SeriesMiscellany { $this->assertFalse($d->driverSchemaUpdate()); } + /** @covers \JKingWeb\Arsse\Database::driverCharsetAcceptable */ public function testCheckCharacterSetAcceptability(): void { $this->assertIsBool(Arsse::$db->driverCharsetAcceptable()); } + /** @covers \JKingWeb\Arsse\Database::driverMaintenance */ public function testPerformMaintenance(): void { $this->assertTrue(Arsse::$db->driverMaintenance()); } diff --git a/tests/cases/Database/SeriesSession.php b/tests/cases/Database/SeriesSession.php index a22c1d3a..4f24b3a2 100644 --- a/tests/cases/Database/SeriesSession.php +++ b/tests/cases/Database/SeriesSession.php @@ -55,6 +55,10 @@ trait SeriesSession { unset($this->data); } + /** + * @covers \JKingWeb\Arsse\Database::sessionResume + * @covers \JKingWeb\Arsse\Database::sessionExpiringSoon + */ public function testResumeAValidSession(): void { $exp1 = [ 'id' => "80fa94c1a11f11e78667001e673b2560", @@ -73,21 +77,34 @@ trait SeriesSession { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::sessionResume + * @covers \JKingWeb\Arsse\Database::sessionExpiringSoon + */ public function testResumeAMissingSession(): void { $this->assertException("invalid", "User", "ExceptionSession"); Arsse::$db->sessionResume("thisSessionDoesNotExist"); } + /** + * @covers \JKingWeb\Arsse\Database::sessionResume + * @covers \JKingWeb\Arsse\Database::sessionExpiringSoon + */ public function testResumeAnExpiredSession(): void { $this->assertException("invalid", "User", "ExceptionSession"); Arsse::$db->sessionResume("27c6de8da13311e78667001e673b2560"); } + /** + * @covers \JKingWeb\Arsse\Database::sessionResume + * @covers \JKingWeb\Arsse\Database::sessionExpiringSoon + */ public function testResumeAStaleSession(): void { $this->assertException("invalid", "User", "ExceptionSession"); Arsse::$db->sessionResume("ab3b3eb8a13311e78667001e673b2560"); } + /** @covers \JKingWeb\Arsse\Database::sessionCreate */ public function testCreateASession(): void { $user = "jane.doe@example.com"; $id = Arsse::$db->sessionCreate($user); @@ -97,6 +114,7 @@ trait SeriesSession { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::sessionDestroy */ public function testDestroyASession(): void { $user = "jane.doe@example.com"; $id = "80fa94c1a11f11e78667001e673b2560"; @@ -108,6 +126,7 @@ trait SeriesSession { $this->assertFalse(Arsse::$db->sessionDestroy($user, $id)); } + /** @covers \JKingWeb\Arsse\Database::sessionDestroy */ public function testDestroyAllSessions(): void { $user = "jane.doe@example.com"; $this->assertTrue(Arsse::$db->sessionDestroy($user)); @@ -118,6 +137,7 @@ trait SeriesSession { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::sessionDestroy */ public function testDestroyASessionForTheWrongUser(): void { $user = "john.doe@example.com"; $id = "80fa94c1a11f11e78667001e673b2560"; diff --git a/tests/cases/Database/SeriesSubscription.php b/tests/cases/Database/SeriesSubscription.php index f32102d3..1990a00a 100644 --- a/tests/cases/Database/SeriesSubscription.php +++ b/tests/cases/Database/SeriesSubscription.php @@ -204,6 +204,10 @@ trait SeriesSubscription { unset($this->data, $this->user); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddASubscriptionToAnExistingFeed(): void { $url = "http://example.com/feed1"; $subID = $this->nextID("arsse_subscriptions"); @@ -220,6 +224,10 @@ trait SeriesSubscription { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddASubscriptionToANewFeed(): void { $url = "http://example.org/feed1"; $feedID = $this->nextID("arsse_feeds"); @@ -238,6 +246,10 @@ trait SeriesSubscription { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddASubscriptionToANewFeedViaDiscovery(): void { $url = "http://localhost:8000/Feed/Discovery/Valid"; $discovered = "http://localhost:8000/Feed/Discovery/Feed"; @@ -257,6 +269,10 @@ trait SeriesSubscription { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddASubscriptionToAnInvalidFeed(): void { $url = "http://example.org/feed1"; $feedID = $this->nextID("arsse_feeds"); @@ -276,18 +292,30 @@ trait SeriesSubscription { } } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddADuplicateSubscription(): void { $url = "http://example.com/feed2"; $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->subscriptionAdd($this->user, $url); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddADuplicateSubscriptionWithEquivalentUrl(): void { $url = "http://EXAMPLE.COM/feed2"; $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->subscriptionAdd($this->user, $url); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionAdd + * @covers \JKingWeb\Arsse\Database::feedAdd + */ public function testAddADuplicateSubscriptionViaRedirection(): void { $url = "http://localhost:8000/Feed/Parsing/Valid"; Arsse::$db->subscriptionAdd($this->user, $url); @@ -296,6 +324,7 @@ trait SeriesSubscription { $this->assertSame($subID, Arsse::$db->subscriptionAdd($this->user, $url)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRemove */ public function testRemoveASubscription(): void { $this->assertTrue(Arsse::$db->subscriptionRemove($this->user, 1)); $state = $this->primeExpectations($this->data, [ @@ -306,22 +335,29 @@ trait SeriesSubscription { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRemove */ public function testRemoveAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionRemove($this->user, 2112); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRemove */ public function testRemoveAnInvalidSubscription(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->subscriptionRemove($this->user, -1); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRemove */ public function testRemoveASubscriptionForTheWrongOwner(): void { $this->user = "jane.doe@example.com"; $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionRemove($this->user, 1); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionList + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesGet + */ public function testListSubscriptions(): void { $exp = [ [ @@ -382,6 +418,7 @@ trait SeriesSubscription { $this->assertResult($exp, Arsse::$db->subscriptionList("jill.doe@example.com")); } + /** @covers \JKingWeb\Arsse\Database::subscriptionList */ public function testListSubscriptionsInAFolder(): void { $exp = [ [ @@ -397,6 +434,7 @@ trait SeriesSubscription { $this->assertResult($exp, Arsse::$db->subscriptionList($this->user, null, false)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionList */ public function testListSubscriptionsWithRecursion(): void { $exp = [ [ @@ -412,31 +450,41 @@ trait SeriesSubscription { $this->assertResult($exp, Arsse::$db->subscriptionList($this->user, 2)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionList */ public function testListSubscriptionsInAMissingFolder(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionList($this->user, 4); } + /** @covers \JKingWeb\Arsse\Database::subscriptionCount */ public function testCountSubscriptions(): void { $this->assertSame(3, Arsse::$db->subscriptionCount($this->user)); $this->assertSame(1, Arsse::$db->subscriptionCount($this->user, 2)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionCount */ public function testCountSubscriptionsInAMissingFolder(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionCount($this->user, 4); } + /** @covers \JKingWeb\Arsse\Database::subscriptionPropertiesGet */ public function testGetThePropertiesOfAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesGet($this->user, 2112); } + /** @covers \JKingWeb\Arsse\Database::subscriptionPropertiesGet */ public function testGetThePropertiesOfAnInvalidSubscription(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesGet($this->user, -1); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testSetThePropertiesOfASubscription(): void { Arsse::$db->subscriptionPropertiesSet($this->user, 1, [ 'title' => "Ook Ook", @@ -465,16 +513,31 @@ trait SeriesSubscription { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testMoveASubscriptionToAMissingFolder(): void { $this->assertException("idMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesSet($this->user, 1, ['folder' => 4]); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testMoveASubscriptionToTheRootFolder(): void { $this->assertTrue(Arsse::$db->subscriptionPropertiesSet($this->user, 3, ['folder' => null])); } - /** @dataProvider provideInvalidSubscriptionProperties */ + /** + * @dataProvider provideInvalidSubscriptionProperties + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testSetThePropertiesOfASubscriptionToInvalidValues(array $data, string $exp): void { $this->assertException($exp, "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesSet($this->user, 1, $data); @@ -492,20 +555,36 @@ trait SeriesSubscription { ]; } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testRenameASubscriptionToZero(): void { $this->assertTrue(Arsse::$db->subscriptionPropertiesSet($this->user, 1, ['title' => 0])); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testSetThePropertiesOfAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesSet($this->user, 2112, ['folder' => null]); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testSetThePropertiesOfAnInvalidSubscription(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->subscriptionPropertiesSet($this->user, -1, ['folder' => null]); } + /** @covers \JKingWeb\Arsse\Database::subscriptionIcon */ public function testRetrieveTheFaviconOfASubscription(): void { $exp = "http://example.com/favicon.ico"; $this->assertSame($exp, Arsse::$db->subscriptionIcon(null, 1)['url']); @@ -513,11 +592,13 @@ trait SeriesSubscription { $this->assertSame(null, Arsse::$db->subscriptionIcon(null, 6)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionIcon */ public function testRetrieveTheFaviconOfAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionIcon(null, -2112); } + /** @covers \JKingWeb\Arsse\Database::subscriptionIcon */ public function testRetrieveTheFaviconOfASubscriptionWithUser(): void { $exp = "http://example.com/favicon.ico"; $user = "john.doe@example.com"; @@ -527,12 +608,14 @@ trait SeriesSubscription { $this->assertSame($exp, Arsse::$db->subscriptionIcon($user, 2)['url']); } + /** @covers \JKingWeb\Arsse\Database::subscriptionIcon */ public function testRetrieveTheFaviconOfASubscriptionOfTheWrongUser(): void { $user = "john.doe@example.com"; $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionIcon($user, 2); } + /** @covers \JKingWeb\Arsse\Database::subscriptionTagsGet */ public function testListTheTagsOfASubscription(): void { $this->assertEquals([1,2], Arsse::$db->subscriptionTagsGet("john.doe@example.com", 1)); $this->assertEquals([2], Arsse::$db->subscriptionTagsGet("john.doe@example.com", 3)); @@ -540,22 +623,30 @@ trait SeriesSubscription { $this->assertEquals(["Fascinating"], Arsse::$db->subscriptionTagsGet("john.doe@example.com", 3, true)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionTagsGet */ public function testListTheTagsOfAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->subscriptionTagsGet($this->user, 101); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRefreshed */ public function testGetRefreshTimeOfASubscription(): void { $user = "john.doe@example.com"; $this->assertTime(strtotime("now + 1 hour"), Arsse::$db->subscriptionRefreshed($user)); $this->assertTime(strtotime("now - 1 hour"), Arsse::$db->subscriptionRefreshed($user, 1)); } + /** @covers \JKingWeb\Arsse\Database::subscriptionRefreshed */ public function testGetRefreshTimeOfAMissingSubscription(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); $this->assertTime(strtotime("now - 1 hour"), Arsse::$db->subscriptionRefreshed("john.doe@example.com", 2)); } + /** + * @covers \JKingWeb\Arsse\Database::subscriptionPropertiesSet + * @covers \JKingWeb\Arsse\Database::subscriptionValidateId + * @covers \JKingWeb\Arsse\Database::subscriptionRulesApply + */ public function testSetTheFilterRulesOfASubscriptionCheckingMarks(): void { Arsse::$db->subscriptionPropertiesSet("jack.doe@example.com", 5, ['keep_rule' => "1|B|3|D", 'block_rule' => "4"]); $state = $this->primeExpectations($this->data, ['arsse_marks' => ['article', 'subscription', 'hidden']]); diff --git a/tests/cases/Database/SeriesTag.php b/tests/cases/Database/SeriesTag.php index 0cbde3bb..5c653cdc 100644 --- a/tests/cases/Database/SeriesTag.php +++ b/tests/cases/Database/SeriesTag.php @@ -113,6 +113,10 @@ trait SeriesTag { unset($this->data, $this->checkTags, $this->checkMembers, $this->user); } + /** + * @covers \JKingWeb\Arsse\Database::tagAdd + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testAddATag(): void { $user = "john.doe@example.com"; $tagID = $this->nextID("arsse_tags"); @@ -122,26 +126,43 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagAdd + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testAddADuplicateTag(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->tagAdd("john.doe@example.com", ['name' => "Interesting"]); } + /** + * @covers \JKingWeb\Arsse\Database::tagAdd + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testAddATagWithAMissingName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->tagAdd("john.doe@example.com", []); } + /** + * @covers \JKingWeb\Arsse\Database::tagAdd + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testAddATagWithABlankName(): void { $this->assertException("missing", "Db", "ExceptionInput"); Arsse::$db->tagAdd("john.doe@example.com", ['name' => ""]); } + /** + * @covers \JKingWeb\Arsse\Database::tagAdd + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testAddATagWithAWhitespaceName(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); Arsse::$db->tagAdd("john.doe@example.com", ['name' => " "]); } + /** @covers \JKingWeb\Arsse\Database::tagList */ public function testListTags(): void { $exp = [ ['id' => 2, 'name' => "Fascinating"], @@ -157,6 +178,10 @@ trait SeriesTag { $this->assertResult($exp, Arsse::$db->tagList("jane.doe@example.com", false)); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveATag(): void { $this->assertTrue(Arsse::$db->tagRemove("john.doe@example.com", 1)); $state = $this->primeExpectations($this->data, $this->checkTags); @@ -164,6 +189,10 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveATagByName(): void { $this->assertTrue(Arsse::$db->tagRemove("john.doe@example.com", "Interesting", true)); $state = $this->primeExpectations($this->data, $this->checkTags); @@ -171,26 +200,46 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveAMissingTag(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagRemove("john.doe@example.com", 2112); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveAnInvalidTag(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagRemove("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveAnInvalidTagByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagRemove("john.doe@example.com", [], true); } + /** + * @covers \JKingWeb\Arsse\Database::tagRemove + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testRemoveATagOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagRemove("john.doe@example.com", 3); // tag ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testGetThePropertiesOfATag(): void { $exp = [ 'id' => 2, @@ -200,30 +249,56 @@ trait SeriesTag { $this->assertArraySubset($exp, Arsse::$db->tagPropertiesGet("john.doe@example.com", "Fascinating", true)); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testGetThePropertiesOfAMissingTag(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesGet("john.doe@example.com", 2112); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testGetThePropertiesOfAnInvalidTag(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesGet("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testGetThePropertiesOfAnInvalidTagByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesGet("john.doe@example.com", [], true); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testGetThePropertiesOfATagOfTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesGet("john.doe@example.com", 3); // tag ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testMakeNoChangesToATag(): void { $this->assertFalse(Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, [])); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testRenameATag(): void { $this->assertTrue(Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, ['name' => "Curious"])); $state = $this->primeExpectations($this->data, $this->checkTags); @@ -231,6 +306,11 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testRenameATagByName(): void { $this->assertTrue(Arsse::$db->tagPropertiesSet("john.doe@example.com", "Interesting", ['name' => "Curious"], true)); $state = $this->primeExpectations($this->data, $this->checkTags); @@ -238,46 +318,90 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testRenameATagToTheEmptyString(): void { $this->assertException("missing", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, ['name' => ""])); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testRenameATagToWhitespaceOnly(): void { $this->assertException("whitespace", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, ['name' => " "])); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testRenameATagToAnInvalidValue(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); $this->assertTrue(Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, ['name' => []])); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testCauseATagCollision(): void { $this->assertException("constraintViolation", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesSet("john.doe@example.com", 1, ['name' => "Fascinating"]); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testSetThePropertiesOfAMissingTag(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesSet("john.doe@example.com", 2112, ['name' => "Exciting"]); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testSetThePropertiesOfAnInvalidTag(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesSet("john.doe@example.com", -1, ['name' => "Exciting"]); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testSetThePropertiesOfAnInvalidTagByName(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesSet("john.doe@example.com", [], ['name' => "Exciting"], true); } + /** + * @covers \JKingWeb\Arsse\Database::tagPropertiesSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + * @covers \JKingWeb\Arsse\Database::tagValidateName + */ public function testSetThePropertiesOfATagForTheWrongOwner(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagPropertiesSet("john.doe@example.com", 3, ['name' => "Exciting"]); // tag ID 3 belongs to Jane } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testListTaggedSubscriptions(): void { $exp = [1,5]; $this->assertEquals($exp, Arsse::$db->tagSubscriptionsGet("john.doe@example.com", 1)); @@ -290,16 +414,28 @@ trait SeriesTag { $this->assertEquals($exp, Arsse::$db->tagSubscriptionsGet("john.doe@example.com", "Lonely", true)); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testListTaggedSubscriptionsForAMissingTag(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tagSubscriptionsGet("john.doe@example.com", 3); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsGet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testListTaggedSubscriptionsForAnInvalidTag(): void { $this->assertException("typeViolation", "Db", "ExceptionInput"); Arsse::$db->tagSubscriptionsGet("john.doe@example.com", -1); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testApplyATagToSubscriptions(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", 1, [3,4]); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -308,6 +444,10 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testClearATagFromSubscriptions(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", 1, [1,3], Database::ASSOC_REMOVE); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -315,6 +455,10 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testApplyATagToSubscriptionsByName(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", "Interesting", [3,4], Database::ASSOC_ADD, true); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -323,6 +467,10 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testClearATagFromSubscriptionsByName(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", "Interesting", [1,3], Database::ASSOC_REMOVE, true); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -330,18 +478,30 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testApplyATagToNoSubscriptionsByName(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", "Interesting", [], Database::ASSOC_ADD, true); $state = $this->primeExpectations($this->data, $this->checkMembers); $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testClearATagFromNoSubscriptionsByName(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", "Interesting", [], Database::ASSOC_REMOVE, true); $state = $this->primeExpectations($this->data, $this->checkMembers); $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testReplaceSubscriptionsOfATag(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", 1, [3,4], Database::ASSOC_REPLACE); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -352,6 +512,10 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** + * @covers \JKingWeb\Arsse\Database::tagSubscriptionsSet + * @covers \JKingWeb\Arsse\Database::tagValidateId + */ public function testPurgeSubscriptionsOfATag(): void { Arsse::$db->tagSubscriptionsSet("john.doe@example.com", 1, [], Database::ASSOC_REPLACE); $state = $this->primeExpectations($this->data, $this->checkMembers); @@ -360,6 +524,7 @@ trait SeriesTag { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::tagSummarize */ public function testSummarizeTags(): void { $exp = [ ['id' => 1, 'name' => "Interesting", 'subscription' => 1], diff --git a/tests/cases/Database/SeriesToken.php b/tests/cases/Database/SeriesToken.php index 249d2459..7a8073e4 100644 --- a/tests/cases/Database/SeriesToken.php +++ b/tests/cases/Database/SeriesToken.php @@ -53,6 +53,7 @@ trait SeriesToken { unset($this->data); } + /** @covers \JKingWeb\Arsse\Database::tokenLookup */ public function testLookUpAValidToken(): void { $exp1 = [ 'id' => "80fa94c1a11f11e78667001e673b2560", @@ -74,21 +75,25 @@ trait SeriesToken { $this->assertArraySubset($exp3, Arsse::$db->tokenLookup("class.class", "ab3b3eb8a13311e78667001e673b2560")); } + /** @covers \JKingWeb\Arsse\Database::tokenLookup */ public function testLookUpAMissingToken(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tokenLookup("class", "thisTokenDoesNotExist"); } + /** @covers \JKingWeb\Arsse\Database::tokenLookup */ public function testLookUpAnExpiredToken(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tokenLookup("fever.login", "27c6de8da13311e78667001e673b2560"); } + /** @covers \JKingWeb\Arsse\Database::tokenLookup */ public function testLookUpATokenOfTheWrongClass(): void { $this->assertException("subjectMissing", "Db", "ExceptionInput"); Arsse::$db->tokenLookup("some.class", "80fa94c1a11f11e78667001e673b2560"); } + /** @covers \JKingWeb\Arsse\Database::tokenCreate */ public function testCreateAToken(): void { $user = "jane.doe@example.com"; $state = $this->primeExpectations($this->data, ['arsse_tokens' => ["id", "class", "expires", "user"]]); @@ -103,11 +108,13 @@ trait SeriesToken { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::tokenCreate */ public function testCreateATokenForAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->tokenCreate("fever.login", "jane.doe@example.biz"); } + /** @covers \JKingWeb\Arsse\Database::tokenRevoke */ public function testRevokeAToken(): void { $user = "jane.doe@example.com"; $id = "80fa94c1a11f11e78667001e673b2560"; @@ -119,6 +126,7 @@ trait SeriesToken { $this->assertFalse(Arsse::$db->tokenRevoke($user, "fever.login", $id)); } + /** @covers \JKingWeb\Arsse\Database::tokenRevoke */ public function testRevokeAllTokens(): void { $user = "jane.doe@example.com"; $state = $this->primeExpectations($this->data, ['arsse_tokens' => ["id", "expires", "user"]]); @@ -133,6 +141,7 @@ trait SeriesToken { $this->assertFalse(Arsse::$db->tokenRevoke($user, "unknown.class")); } + /** @covers \JKingWeb\Arsse\Database::tokenList */ public function testListTokens(): void { $user = "jane.doe@example.com"; $exp = [ diff --git a/tests/cases/Database/SeriesUser.php b/tests/cases/Database/SeriesUser.php index 7c6d14ac..47b4acb7 100644 --- a/tests/cases/Database/SeriesUser.php +++ b/tests/cases/Database/SeriesUser.php @@ -48,23 +48,27 @@ trait SeriesUser { unset($this->data); } + /** @covers \JKingWeb\Arsse\Database::userExists */ public function testCheckThatAUserExists(): void { $this->assertTrue(Arsse::$db->userExists("jane.doe@example.com")); $this->assertFalse(Arsse::$db->userExists("jane.doe@example.org")); $this->compareExpectations(static::$drv, $this->data); } + /** @covers \JKingWeb\Arsse\Database::userPasswordGet */ public function testGetAPassword(): void { $hash = Arsse::$db->userPasswordGet("admin@example.net"); $this->assertSame('$2y$10$PbcG2ZR3Z8TuPzM7aHTF8.v61dtCjzjK78gdZJcp4UePE8T9jEgBW', $hash); $this->assertTrue(password_verify("secret", $hash)); } + /** @covers \JKingWeb\Arsse\Database::userPasswordGet */ public function testGetThePasswordOfAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userPasswordGet("john.doe@example.org"); } + /** @covers \JKingWeb\Arsse\Database::userAdd */ public function testAddANewUser(): void { $this->assertTrue(Arsse::$db->userAdd("john.doe@example.org", "")); $state = $this->primeExpectations($this->data, ['arsse_users' => ['id']]); @@ -72,11 +76,13 @@ trait SeriesUser { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::userAdd */ public function testAddAnExistingUser(): void { $this->assertException("alreadyExists", "User", "ExceptionConflict"); Arsse::$db->userAdd("john.doe@example.com", ""); } + /** @covers \JKingWeb\Arsse\Database::userRemove */ public function testRemoveAUser(): void { $this->assertTrue(Arsse::$db->userRemove("admin@example.net")); $state = $this->primeExpectations($this->data, ['arsse_users' => ['id']]); @@ -84,19 +90,19 @@ trait SeriesUser { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::userRemove */ public function testRemoveAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userRemove("john.doe@example.org"); } + /** @covers \JKingWeb\Arsse\Database::userList */ public function testListAllUsers(): void { $users = ["admin@example.net", "jane.doe@example.com", "john.doe@example.com"]; $this->assertSame($users, Arsse::$db->userList()); } - /** - * @depends testGetAPassword - */ + /** @covers \JKingWeb\Arsse\Database::userPasswordSet */ public function testSetAPassword(): void { $user = "john.doe@example.com"; $pass = "secret"; @@ -107,6 +113,7 @@ trait SeriesUser { $this->assertTrue(password_verify($pass, $hash), "Failed verifying password of $user '$pass' against hash '$hash'."); } + /** @covers \JKingWeb\Arsse\Database::userPasswordSet */ public function testUnsetAPassword(): void { $user = "john.doe@example.com"; $this->assertEquals("", Arsse::$db->userPasswordGet($user)); @@ -114,12 +121,16 @@ trait SeriesUser { $this->assertNull(Arsse::$db->userPasswordGet($user)); } + /** @covers \JKingWeb\Arsse\Database::userPasswordSet */ public function testSetThePasswordOfAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userPasswordSet("john.doe@example.org", "secret"); } - /** @dataProvider provideMetaData */ + /** + * @dataProvider provideMetaData + * @covers \JKingWeb\Arsse\Database::userPropertiesGet + */ public function testGetMetadata(string $user, bool $includeLarge, array $exp): void { $this->assertSame($exp, Arsse::$db->userPropertiesGet($user, $includeLarge)); } @@ -135,11 +146,13 @@ trait SeriesUser { ]; } + /** @covers \JKingWeb\Arsse\Database::userPropertiesGet */ public function testGetTheMetadataOfAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userPropertiesGet("john.doe@example.org"); } + /** @covers \JKingWeb\Arsse\Database::userPropertiesSet */ public function testSetMetadata(): void { $in = [ 'admin' => true, @@ -156,6 +169,7 @@ trait SeriesUser { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::userPropertiesSet */ public function testSetNoMetadata(): void { $in = [ 'num' => 2112, @@ -166,22 +180,26 @@ trait SeriesUser { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::userPropertiesSet */ public function testSetTheMetadataOfAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userPropertiesSet("john.doe@example.org", ['admin' => true]); } + /** @covers \JKingWeb\Arsse\Database::userLookup */ public function testLookUpAUserByNumber(): void { $this->assertSame("admin@example.net", Arsse::$db->userLookup(1)); $this->assertSame("jane.doe@example.com", Arsse::$db->userLookup(2)); $this->assertSame("john.doe@example.com", Arsse::$db->userLookup(3)); } + /** @covers \JKingWeb\Arsse\Database::userLookup */ public function testLookUpAMissingUserByNumber(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userLookup(2112); } + /** @covers \JKingWeb\Arsse\Database::userRename */ public function testRenameAUser(): void { $this->assertTrue(Arsse::$db->userRename("john.doe@example.com", "juan.doe@example.com")); $state = $this->primeExpectations($this->data, [ @@ -193,20 +211,24 @@ trait SeriesUser { $this->compareExpectations(static::$drv, $state); } + /** @covers \JKingWeb\Arsse\Database::userRename */ public function testRenameAUserToTheSameName(): void { $this->assertFalse(Arsse::$db->userRename("john.doe@example.com", "john.doe@example.com")); } + /** @covers \JKingWeb\Arsse\Database::userRename */ public function testRenameAMissingUser(): void { $this->assertException("doesNotExist", "User", "ExceptionConflict"); Arsse::$db->userRename("juan.doe@example.com", "john.doe@example.com"); } + /** @covers \JKingWeb\Arsse\Database::userRename */ public function testRenameAUserToADuplicateName(): void { $this->assertException("alreadyExists", "User", "ExceptionConflict"); Arsse::$db->userRename("john.doe@example.com", "jane.doe@example.com"); } + /** @covers \JKingWeb\Arsse\Database::userAdd */ public function testAddFirstUser(): void { // first truncate the users table static::$drv->exec("DELETE FROM arsse_users"); diff --git a/tests/cases/Database/TestDatabase.php b/tests/cases/Database/TestDatabase.php index 5c915eff..e013d081 100644 --- a/tests/cases/Database/TestDatabase.php +++ b/tests/cases/Database/TestDatabase.php @@ -8,8 +8,9 @@ declare(strict_types=1); namespace JKingWeb\Arsse\TestCase\Database; use JKingWeb\Arsse\Database; +use JKingWeb\Arsse\Db\Transaction; -/** @covers \JKingWeb\Arsse\Database */ +/** @coversNothing */ class TestDatabase extends \JKingWeb\Arsse\Test\AbstractTest { protected $db = null; @@ -34,7 +35,10 @@ class TestDatabase extends \JKingWeb\Arsse\Test\AbstractTest { return $m->invoke($this->db, ...$arg); } - /** @dataProvider provideInClauses */ + /** + * @dataProvider provideInClauses + * @covers \JKingWeb\Arsse\Database::generateIn + */ public function testGenerateInClause(string $clause, array $values, array $inV, string $inT): void { $types = array_fill(0, sizeof($values), $inT); $exp = [$clause, $types, $values]; @@ -68,7 +72,10 @@ class TestDatabase extends \JKingWeb\Arsse\Test\AbstractTest { ]; } - /** @dataProvider provideSearchClauses */ + /** + * @dataProvider provideSearchClauses + * @covers \JKingWeb\Arsse\Database::generateSearch + */ public function testGenerateSearchClause(string $clause, array $values, array $inV, array $inC, bool $inAny): void { // this is not an exhaustive test; integration tests already cover the ins and outs of the functionality $types = array_fill(0, sizeof($values), "str"); @@ -91,4 +98,36 @@ class TestDatabase extends \JKingWeb\Arsse\Test\AbstractTest { ["(".implode(" or ", $clause)." or test like ? escape '^')", ["%?%"], array_merge($terms, ["?"]), ["test"], true], ]; } + + /** @covers \JKingWeb\Arsse\Database::generateSet */ + public function testGenerateSetClause(): void { + $in = [ + 'ook' => true, + 'ack' => false, + 'bar' => "Nimoy", + 'foo' => "Shatner", + ]; + $valid = [ + 'ook' => "bool", + 'eek' => "int", + 'foo' => "str", + 'bar' => "str", + ]; + $exp = [ + '"ook" = ?, "foo" = ?, "bar" = ?', + ["bool", "str", "str"], + [true, "Shatner", "Nimoy"], + ]; + $this->assertSame($exp, $this->invoke("generateSet", $in, $valid)); + } + + /** @covers \JKingWeb\Arsse\Database::begin */ + public function testBeginATransaction(): void { + $this->assertInstanceOf(Transaction::class, $this->invoke("begin")); + } + + /** @covers \JKingWeb\Arsse\Database::caller */ + public function testReportCallingMethod(): void { + $this->assertSame("caller", $this->invoke("caller")); + } } diff --git a/tests/cases/Db/MySQL/TestDatabase.php b/tests/cases/Db/MySQL/TestDatabase.php index b7e8d8be..b2a45697 100644 --- a/tests/cases/Db/MySQL/TestDatabase.php +++ b/tests/cases/Db/MySQL/TestDatabase.php @@ -10,7 +10,7 @@ namespace JKingWeb\Arsse\TestCase\Db\MySQL; /** * @group slow * @group coverageOptional - * @covers \JKingWeb\Arsse\Database