3 files changed, 14 insertions, 9 deletions
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);
 		}
 	}
 }