test: increase coverage

Author: Goodmain

tests/EntityControlTraitTest.php

@@ -83,7 +83,7 @@ public function testWith()
         $this->assertEquals(['relation'], $attachedRelations);
     }
 
-    public function withCount()
+    public function testWithCount()
     {
         $this->testRepositoryClass->withCount('relation');
 
@@ -100,7 +100,7 @@ public function testAll()
             ->withTrashed()
             ->onlyTrashed()
             ->with('relation')
-            ->withCount('relation')
+            ->withCount(['relation', 'relation.child_relation'])
             ->force()
             ->all();
 

tests/SearchTraitTest.php

@@ -21,7 +21,6 @@ class SearchTraitTest extends HelpersTestCase
     protected ReflectionProperty $forceModeProperty;
     protected ReflectionProperty $attachedRelationsProperty;
     protected ReflectionProperty $attachedRelationsCountProperty;
-    protected ReflectionProperty $queryProperty;
     protected ReflectionProperty $shouldSettablePropertiesBeResetProperty;
 
     protected ReflectionMethod $setAdditionalReservedFiltersMethod;
@@ -58,9 +57,6 @@ public function setUp(): void
         );
         $this->shouldSettablePropertiesBeResetProperty->setAccessible(true);
 
-        $this->queryProperty = new ReflectionProperty(TestRepository::class, 'query');
-        $this->queryProperty->setAccessible(true);
-
         $reflectionClass = new ReflectionClass(TestRepository::class);
         $this->setAdditionalReservedFiltersMethod = $reflectionClass->getMethod('setAdditionalReservedFilters');
         $this->setAdditionalReservedFiltersMethod->setAccessible(true);
@@ -79,7 +75,7 @@ public function testSearchQuery()
                 'with_count' => ['relation']
             ]);
 
-        $sql = $this->queryProperty->getValue($this->testRepositoryClass)->toSql();
+        $sql = $this->testRepositoryClass->getSearchQuery()->toSql();
 
         $onlyTrashed = $this->onlyTrashedProperty->getValue($this->testRepositoryClass);
         $withTrashed = $this->withTrashedProperty->getValue($this->testRepositoryClass);
@@ -218,6 +214,7 @@ public function testSearchQueryWithRelations()
             ])
             ->filterByQuery(['query_field', 'relation.another_query_field'])
             ->filterBy('relation.name', 'relation_name')
+            ->filterBy('relation.another_name')
             ->getSearchResults();
     }
 

tests/support/Mock/ChildRelationModel.php

@@ -0,0 +1,9 @@
+<?php
+
+namespace RonasIT\Support\Tests\Support\Mock;
+
+use Illuminate\Database\Eloquent\Model;
+
+class ChildRelationModel extends Model
+{
+}

tests/support/Mock/RelationModel.php

@@ -3,7 +3,12 @@
 namespace RonasIT\Support\Tests\Support\Mock;
 
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 
 class RelationModel extends Model
 {
+    public function child_relation(): HasMany
+    {
+        return $this->hasMany(ChildRelationModel::class);
+    }
 }

tests/support/Traits/SqlMockTrait.php

@@ -20,7 +20,9 @@ protected function mockAll(array $selectResult): void
         );
 
         $this->mockSelect(
-            'select * from `relation_models` where `relation_models`.`test_model_id` in (1)'
+            'select `relation_models`.*, (select count(*) from `child_relation_models` '
+            . 'where `relation_models`.`id` = `child_relation_models`.`relation_model_id`) as `child_relation_count` '
+            . 'from `relation_models` where `relation_models`.`test_model_id` in (1)',
         );
     }