Commit b6681ab7 authored by Адлан Шамавов's avatar Адлан Шамавов
Browse files

tests: Поправлены тесты

parent 9a8157be
Loading
Loading
Loading
Loading
+16 −9
Original line number Diff line number Diff line
@@ -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
+12 −7
Original line number Diff line number Diff line
@@ -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);
    }
}
+12 −7
Original line number Diff line number Diff line
@@ -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);
    }
}
+8 −5
Original line number Diff line number Diff line
@@ -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);
    }
}
+16 −9
Original line number Diff line number Diff line
@@ -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
Loading