From 6f1332c5590fe2023f0f5e73e780bd1d4d310236 Mon Sep 17 00:00:00 2001 From: "J. King" Date: Wed, 20 Apr 2022 19:11:04 -0400 Subject: [PATCH] Start to shore up testing --- tests/cases/Database/SeriesArticle.php | 2 ++ tests/cases/Misc/TestContext.php | 44 +++++++++++++++++++++++++- 2 files changed, 45 insertions(+), 1 deletion(-) diff --git a/tests/cases/Database/SeriesArticle.php b/tests/cases/Database/SeriesArticle.php index a1eafda5..2a4aa511 100644 --- a/tests/cases/Database/SeriesArticle.php +++ b/tests/cases/Database/SeriesArticle.php @@ -526,6 +526,8 @@ trait SeriesArticle { 'Excluding entire folder tree' => [(new Context)->not->folder(0), []], 'Excluding multiple folder trees' => [(new Context)->not->folders([1,5]), [1,2,3,4]], 'Excluding multiple folder trees including root' => [(new Context)->not->folders([0,1,5]), []], + 'Before article 3' => [(new Context)->not->articleRange(3, null), [1,2]], + 'Before article 19' => [(new Context)->not->articleRange(null, 19), [20]], ]; } diff --git a/tests/cases/Misc/TestContext.php b/tests/cases/Misc/TestContext.php index a05cab63..fa053483 100644 --- a/tests/cases/Misc/TestContext.php +++ b/tests/cases/Misc/TestContext.php @@ -9,7 +9,10 @@ namespace JKingWeb\Arsse\TestCase\Misc; use JKingWeb\Arsse\Context\Context; use JKingWeb\Arsse\Misc\ValueInfo; -/** @covers \JKingWeb\Arsse\Context\Context */ +/** + * @covers \JKingWeb\Arsse\Context\Context + * @covers \JKingWeb\Arsse\Context\ExclusionContext + */ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest { protected $ranges = ['modifiedRange', 'markedRange', 'articleRange', 'editionRange']; @@ -79,6 +82,45 @@ class TestContext extends \JKingWeb\Arsse\Test\AbstractTest { } } + public function provideContextOptions(): iterable { + return [ + 'reverse' => [[true], true], + 'limit' => [[10], 10], + 'offset' => [[5], 5], + 'folder' => [[42], 42], + 'folders' => [[[12,22]], [12,22]], + 'folderShallow' => [[42], 42], + 'foldersShallow' => [[[0,1]], [0,1]], + 'tag' => [[44], 44], + 'tags' => [[[44, 2112]], [44, 2112]], + 'tagName' => [["XLIV"], "XLIV"], + 'tagNames' => [[["XLIV", "MMCXII"]], ["XLIV", "MMCXII"]], + 'subscription' => [[2112], 2112], + 'subscriptions' => [[[44, 2112]], [44, 2112]], + 'article' => [[255], 255], + 'edition' => [[65535], 65535], + 'unread' => [[true], true], + 'starred' => [[true], true], + 'hidden' => [[true], true], + 'editions' => [[[1,2]], [1,2]], + 'articles' => [[[1,2]], [1,2]], + 'label' => [[2112], 2112], + 'labels' => [[[2112, 1984]], [2112, 1984]], + 'labelName' => [["Rush"], "Rush"], + 'labelNames' => [[["Rush", "Orwell"]], ["Rush", "Orwell"]], + 'labelled' => [[true], true], + 'annotated' => [[true], true], + 'searchTerms' => [[["foo", "bar"]], ["foo", "bar"]], + 'annotationTerms' => [[["foo", "bar"]], ["foo", "bar"]], + 'titleTerms' => [[["foo", "bar"]], ["foo", "bar"]], + 'authorTerms' => [[["foo", "bar"]], ["foo", "bar"]], + 'modifiedRange' => [["2020-03-06T22:08:03Z", "2022-12-31T06:33:12Z"], ["2020-03-06T22:08:03Z", "2022-12-31T06:33:12Z"]], + 'markedRange' => [["2020-03-06T22:08:03Z", "2022-12-31T06:33:12Z"], ["2020-03-06T22:08:03Z", "2022-12-31T06:33:12Z"]], + 'articleRange' => [[1, 100], [1, 100]], + 'editionRange' => [[1, 100], [1, 100]], + ]; + } + public function testCleanIdArrayValues(): void { $methods = ["articles", "editions", "tags", "labels", "subscriptions"]; $in = [1, "2", 3.5, 4.0, 4, "ook", 0, -20, true, false, null, new \DateTime(), -1.0];