From a93c94f338a9e3188639015346ac01f08a36b44e Mon Sep 17 00:00:00 2001 From: Valentin Popov Date: Wed, 22 Jul 2020 12:36:00 +0400 Subject: Fixed bugs and updated tests Signed-off-by: Valentin Popov --- src/Parsers/IntegerParser.php | 36 --------------------------- src/Repositories/CategoryRepository.php | 4 +-- src/Repositories/GenreRepository.php | 2 +- tests/Entities/ChannelEntityTest.php | 2 +- tests/Parsers/IntegerParserTest.php | 36 --------------------------- tests/Repositories/CategoryRepositoryTest.php | 9 ++++--- tests/Repositories/ChannelRepositoryTest.php | 5 +++- tests/Repositories/GenreRepositoryTest.php | 9 ++++--- 8 files changed, 18 insertions(+), 85 deletions(-) delete mode 100644 src/Parsers/IntegerParser.php delete mode 100644 tests/Parsers/IntegerParserTest.php diff --git a/src/Parsers/IntegerParser.php b/src/Parsers/IntegerParser.php deleted file mode 100644 index ba89315..0000000 --- a/src/Parsers/IntegerParser.php +++ /dev/null @@ -1,36 +0,0 @@ - - * @license http://www.apache.org/licenses/LICENSE-2.0 - * @package EPGService\Parsers - */ -final class IntegerParser implements BaseParser { - /** - * @param mixed $value - * - * @return int - */ - public static function get($value): int { - return filter_var($value, FILTER_VALIDATE_INT); - } -} diff --git a/src/Repositories/CategoryRepository.php b/src/Repositories/CategoryRepository.php index 6139168..546ad2c 100644 --- a/src/Repositories/CategoryRepository.php +++ b/src/Repositories/CategoryRepository.php @@ -21,7 +21,6 @@ namespace EPGService\Repositories; use EPGService\Entities\CategoryEntity; use EPGService\Environments\ServiceEnvironment; -use EPGService\Parsers\IntegerParser; use EPGService\Parsers\StringParser; use GuzzleHttp\Client; use RuntimeException; @@ -35,6 +34,7 @@ use function simplexml_load_string; * @package EPGService\Repositories */ final class CategoryRepository implements BaseRepository { + /** * @var string */ @@ -92,7 +92,7 @@ final class CategoryRepository implements BaseRepository { } $result[] = CategoryEntity::create([ - 'id' => IntegerParser::get($element['id']), + 'id' => StringParser::get($element['id']), 'lang' => StringParser::get($element->name['lang']), 'name' => StringParser::get($element->name), 'version' => StringParser::get($element['version']), diff --git a/src/Repositories/GenreRepository.php b/src/Repositories/GenreRepository.php index 67c9a4e..8b1284b 100644 --- a/src/Repositories/GenreRepository.php +++ b/src/Repositories/GenreRepository.php @@ -91,7 +91,7 @@ final class GenreRepository implements BaseRepository { } $result[] = GenreEntity::create([ - 'id' => IntegerParser::get($element['id']), + 'id' => StringParser::get($element['id']), 'lang' => StringParser::get($element->name['lang']), 'name' => StringParser::get($element->name), 'version' => StringParser::get($element['version']), diff --git a/tests/Entities/ChannelEntityTest.php b/tests/Entities/ChannelEntityTest.php index e3c2733..ace9388 100644 --- a/tests/Entities/ChannelEntityTest.php +++ b/tests/Entities/ChannelEntityTest.php @@ -41,7 +41,7 @@ final class ChannelEntityTest extends TestCase { $id = $faker->unique()->sha256; $lang = $faker->unique()->sha256; $name = $faker->unique()->sha256; - $update_at = $faker->unique()->sha256; + $update_at = $faker->unique()->dateTime; $week = $faker->unique()->sha256; $entity = ChannelEntity::create(compact( diff --git a/tests/Parsers/IntegerParserTest.php b/tests/Parsers/IntegerParserTest.php deleted file mode 100644 index 56c13ce..0000000 --- a/tests/Parsers/IntegerParserTest.php +++ /dev/null @@ -1,36 +0,0 @@ - - * @license http://www.apache.org/licenses/LICENSE-2.0 - * @package Tests\Parsers - */ -final class IntegerParserTest extends TestCase { - public function testValid(): void { - $number = Faker::create()->numberBetween(100, 200); - self::assertEquals($number, IntegerParser::get((string) $number)); - } -} diff --git a/tests/Repositories/CategoryRepositoryTest.php b/tests/Repositories/CategoryRepositoryTest.php index 25dbdd8..d43269f 100644 --- a/tests/Repositories/CategoryRepositoryTest.php +++ b/tests/Repositories/CategoryRepositoryTest.php @@ -29,6 +29,7 @@ use Tests\Utilities\GetServiceEnvironment; * @package Tests\Repositories */ final class CategoryRepositoryTest extends TestCase { + /** * @throws \GuzzleHttp\Exception\GuzzleException * @throws \RuntimeException @@ -40,10 +41,10 @@ final class CategoryRepositoryTest extends TestCase { foreach (CategoryRepository::create($env)->get() as $category) { /** @var \EPGService\Entities\CategoryEntity $category */ - self::assertIsInt($category->id); - self::assertIsString($category->lang); - self::assertIsString($category->name); - self::assertIsString($category->version); + self::assertNotEmpty($category->id); + self::assertNotEmpty($category->lang); + self::assertNotEmpty($category->name); + self::assertNotEmpty($category->version); } } } diff --git a/tests/Repositories/ChannelRepositoryTest.php b/tests/Repositories/ChannelRepositoryTest.php index b9d9116..ac599a4 100644 --- a/tests/Repositories/ChannelRepositoryTest.php +++ b/tests/Repositories/ChannelRepositoryTest.php @@ -30,6 +30,7 @@ use Tests\Utilities\GetServiceEnvironment; * @package Tests\Repositories */ final class ChannelRepositoryTest extends TestCase { + /** * @throws \GuzzleHttp\Exception\GuzzleException * @throws \RuntimeException @@ -41,13 +42,15 @@ final class ChannelRepositoryTest extends TestCase { foreach (ChannelRepository::create($env)->get() as $channel) { /** @var \EPGService\Entities\ChannelEntity $channel */ + self::assertIsString($channel->id); + self::assertNotEmpty($channel->id); + self::assertIsString($channel->base_id); self::assertIsString($channel->base_name); self::assertIsString($channel->epg_id); self::assertIsString($channel->geo_data); self::assertIsString($channel->href); self::assertIsString($channel->icon); - self::assertIsString($channel->id); self::assertIsString($channel->lang); self::assertIsString($channel->name); self::assertIsString($channel->week); diff --git a/tests/Repositories/GenreRepositoryTest.php b/tests/Repositories/GenreRepositoryTest.php index 8afe351..2574059 100644 --- a/tests/Repositories/GenreRepositoryTest.php +++ b/tests/Repositories/GenreRepositoryTest.php @@ -29,6 +29,7 @@ use Tests\Utilities\GetServiceEnvironment; * @package Tests\Repositories */ final class GenreRepositoryTest extends TestCase { + /** * @throws \GuzzleHttp\Exception\GuzzleException * @throws \RuntimeException @@ -40,10 +41,10 @@ final class GenreRepositoryTest extends TestCase { foreach (GenreRepository::create($env)->get() as $genre) { /** @var \EPGService\Entities\GenreEntity $genre */ - self::assertIsInt($genre->id); - self::assertIsString($genre->lang); - self::assertIsString($genre->name); - self::assertIsString($genre->version); + self::assertNotEmpty($genre->id); + self::assertNotEmpty($genre->lang); + self::assertNotEmpty($genre->name); + self::assertNotEmpty($genre->version); } } } -- cgit v1.2.3