From b6681ab7e01ee9ccd013c961663d9cd9200f34c4 Mon Sep 17 00:00:00 2001 From: "a.shamavov" Date: Wed, 5 Mar 2025 10:58:19 +0500 Subject: [PATCH] =?UTF-8?q?tests:=20=D0=9F=D0=BE=D0=BF=D1=80=D0=B0=D0=B2?= =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D1=8B=20=D1=82=D0=B5=D1=81=D1=82=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- tests/FilterByDateRangeTest.php | 25 ++++++++++++++++--------- tests/FilterByDateTest.php | 19 ++++++++++++------- tests/FilterByInTest.php | 19 ++++++++++++------- tests/FilterByLikeTest.php | 13 ++++++++----- tests/FilterByRangeTest.php | 25 ++++++++++++++++--------- tests/FilterByWhereTest.php | 13 ++++++++----- 6 files changed, 72 insertions(+), 42 deletions(-) diff --git a/tests/FilterByDateRangeTest.php b/tests/FilterByDateRangeTest.php index acb4a4b..0ce4320 100644 --- a/tests/FilterByDateRangeTest.php +++ b/tests/FilterByDateRangeTest.php @@ -6,7 +6,6 @@ namespace IQDEV\Tests\Packages\DoctrineHttpFilter; use DateInterval; use DateTimeImmutable; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\DateRange; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -191,15 +190,17 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => DateRange::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateRangeWithNotDateParameterValue(): void @@ -207,9 +208,9 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => DateRange::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -218,6 +219,8 @@ class FilterByDateRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateRangeWithNotDateParameterValues(): void @@ -225,9 +228,9 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => DateRange::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -239,6 +242,8 @@ class FilterByDateRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateRangeWithDifferentKey(): void @@ -246,9 +251,9 @@ class FilterByDateRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => DateRange::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -257,6 +262,8 @@ class FilterByDateRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateRangeWithOnlyFromParameterValue(): void diff --git a/tests/FilterByDateTest.php b/tests/FilterByDateTest.php index deba304..506ecd2 100644 --- a/tests/FilterByDateTest.php +++ b/tests/FilterByDateTest.php @@ -6,7 +6,6 @@ namespace IQDEV\Tests\Packages\DoctrineHttpFilter; use DateInterval; use DateTimeImmutable; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\Date; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -178,15 +177,17 @@ class FilterByDateTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => Date::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateWithNotDateParameterValue(): void @@ -194,9 +195,9 @@ class FilterByDateTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => Date::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -205,6 +206,8 @@ class FilterByDateTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateWithDifferentKey(): void @@ -212,9 +215,9 @@ class FilterByDateTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => Date::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -223,5 +226,7 @@ class FilterByDateTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } } diff --git a/tests/FilterByInTest.php b/tests/FilterByInTest.php index d1bf6e5..3dfcd87 100644 --- a/tests/FilterByInTest.php +++ b/tests/FilterByInTest.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace IQDEV\Tests\Packages\DoctrineHttpFilter; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\In; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -131,15 +130,17 @@ class FilterByInTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => In::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterInWithNotArrayParameterValue(): void @@ -147,9 +148,9 @@ class FilterByInTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => In::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -158,6 +159,8 @@ class FilterByInTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterInWithDifferentKey(): void @@ -165,9 +168,9 @@ class FilterByInTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => In::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -176,5 +179,7 @@ class FilterByInTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } } diff --git a/tests/FilterByLikeTest.php b/tests/FilterByLikeTest.php index 9922b03..c030e7a 100644 --- a/tests/FilterByLikeTest.php +++ b/tests/FilterByLikeTest.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace IQDEV\Tests\Packages\DoctrineHttpFilter; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\Like; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -131,15 +130,17 @@ class FilterByLikeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => Like::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterDateWithDifferentKey(): void @@ -147,9 +148,9 @@ class FilterByLikeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => Like::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -158,5 +159,7 @@ class FilterByLikeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } } diff --git a/tests/FilterByRangeTest.php b/tests/FilterByRangeTest.php index f4826bc..4ae1ac0 100644 --- a/tests/FilterByRangeTest.php +++ b/tests/FilterByRangeTest.php @@ -5,7 +5,6 @@ declare(strict_types=1); namespace IQDEV\Tests\Packages\DoctrineHttpFilter; use DateTimeImmutable; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\Range; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -196,15 +195,17 @@ class FilterByRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'createdAt' => Range::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterRangeWithNotNumberParameterValue(): void @@ -212,9 +213,9 @@ class FilterByRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'countOfViews' => Range::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -223,6 +224,8 @@ class FilterByRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterRangeWithNotNumberParameterValues(): void @@ -230,9 +233,9 @@ class FilterByRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'countOfViews' => Range::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -244,6 +247,8 @@ class FilterByRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterRangeWithDifferentKey(): void @@ -251,9 +256,9 @@ class FilterByRangeTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'countOfViews' => Range::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -262,6 +267,8 @@ class FilterByRangeTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterRangeWithOnlyMinParameterValue(): void diff --git a/tests/FilterByWhereTest.php b/tests/FilterByWhereTest.php index cba1629..4bc3e3f 100644 --- a/tests/FilterByWhereTest.php +++ b/tests/FilterByWhereTest.php @@ -4,7 +4,6 @@ declare(strict_types=1); namespace IQDEV\Tests\Packages\DoctrineHttpFilter; -use IQDEV\Packages\DoctrineHttpFilter\Exception\FilterParameterValueIsNullException; use IQDEV\Packages\DoctrineHttpFilter\Filter\Where; use IQDEV\Packages\DoctrineHttpFilter\HttpFilter; use IQDEV\Tests\Packages\DoctrineHttpFilter\Entity\Post; @@ -117,15 +116,17 @@ class FilterByWhereTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => Where::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [], ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } public function testFilterWhereWithDifferentKey(): void @@ -133,9 +134,9 @@ class FilterByWhereTest extends TestCase /** @var PostRepository $postRepository */ $postRepository = $this->em->getRepository(Post::class); - $this->expectException(FilterParameterValueIsNullException::class); + $countPosts = $postRepository->count(); - $postRepository->createQueryByFilter([ + $result = $postRepository->createQueryByFilter([ 'title' => Where::class, ], new Request([ HttpFilter::REQUEST_FILTER_KEY => [ @@ -144,5 +145,7 @@ class FilterByWhereTest extends TestCase ])) ->getQuery() ->getResult(); + + $this->assertCount($countPosts, $result); } } -- GitLab