Добавлены тесты

Author: Smoren

commands/WithController.php

@@ -25,24 +25,24 @@ class WithController extends Controller
      */
     public function actionCity()
     {
-        $cities = City::select('c')
+        $result = City::select('c')
             ->with('addresses', 'a')
             ->with('places', 'p', 'a')
             ->all();
 
-        print_r($cities);
+        print_r($result);
     }
 
     /**
      * Выбираем адреса с городом, местами и комментариями, оценка которых не ниже трех
      * Используем упрощенный синтаксис with
      * Метод City::select() добавлен в класс с помощью трейта ActiveRecordTrait
-     * @see \Smoren\Yii2\QueryRelationManager\ActiveRecord\ActiveRecordTrait
+     * @see \Smoren\Yii2\QueryRelationManager\Yii2\ActiveRecordTrait
      * @throws QueryRelationManagerException
      */
     public function actionAddress()
     {
-        $cities = Address::select('a')
+        $result = Address::select('a')
             ->with('city', 'c')
             ->with('places', 'p')
             ->with(
@@ -51,6 +51,6 @@ public function actionAddress()
             )
             ->all();
 
-        print_r($cities);
+        print_r($result);
     }
 }

tests/unit/DataProviderTest.php

@@ -125,6 +125,11 @@ public function testCity()
         expect_that($this->compareResultWithCorrectMap($result, []));
     }
 
+    /**
+     * @param array $result
+     * @param array $correctMap
+     * @return bool
+     */
     protected function compareResultWithCorrectMap(array $result, array $correctMap)
     {
         $resultMap = [];

tests/unit/WithSyntaxTest.php

@@ -0,0 +1,103 @@
+<?php
+
+namespace app\tests\unit;
+
+
+use app\models\Address;
+use app\models\City;
+use Smoren\Yii2\QueryRelationManager\Base\QueryRelationManagerException;
+use Smoren\Yii2\QueryRelationManager\Yii2\QueryRelationDataProvider;
+use Smoren\Yii2\QueryRelationManager\Yii2\QueryRelationManager;
+use Yii;
+use yii\helpers\ArrayHelper;
+
+class WithSyntaxTest extends \Codeception\Test\Unit
+{
+    /**
+     * @throws QueryRelationManagerException
+     */
+    public function testCity()
+    {
+        $result = City::select('c')
+            ->with('addresses', 'a')
+            ->with('places', 'p', 'a')
+            ->all();
+
+        expect_that($this->compareCityResultWithCorrectMap($result, [
+            1 => [
+                1 => [1, 2],
+                2 => [3],
+            ],
+            2 => [
+                3 => [4, 5],
+                4 => [6],
+            ],
+            3 => [],
+            4 => [],
+            5 => [],
+        ]));
+    }
+
+    /**
+     * @throws QueryRelationManagerException
+     */
+    public function testAddress()
+    {
+        $result = Address::select('a')
+            ->with('city', 'c')
+            ->with('places', 'p')
+            ->with(
+                'comments', 'cm', 'p',
+                'left', 'and cm.mark >= :mark', [':mark' => 3]
+            )
+            ->all();
+
+        $addressIds = ArrayHelper::getColumn($result, 'id');
+        sort($addressIds);
+        expect_that($addressIds == [1, 2, 3, 4]);
+
+        $cityIds = ArrayHelper::getColumn($result, 'city.id');
+        sort($cityIds);
+        expect_that($cityIds == [1, 1, 2, 2]);
+
+        $placeIdToCommentMarkMap = [
+            1 => [3, 5],
+            2 => [],
+            3 => [5],
+            4 => [],
+            5 => [4],
+            6 => [3],
+        ];
+
+        foreach($result as $address) {
+            foreach($address['places'] as $place) {
+                $placeMarks = ArrayHelper::getColumn($place['comments'], 'mark');
+                expect_that($placeIdToCommentMarkMap[$place['id']] == $placeMarks);
+            }
+        }
+    }
+
+    /**
+     * @param array $result
+     * @param array $correctMap
+     * @return bool
+     */
+    protected function compareCityResultWithCorrectMap(array $result, array $correctMap)
+    {
+        $resultMap = [];
+        foreach($result as $city) {
+            $resultMap[$city['id']] = [];
+            foreach($city['addresses'] as $address) {
+                $resultMap[$city['id']][$address['id']] = [];
+                foreach($address['places'] as $place) {
+                    $resultMap[$city['id']][$address['id']][] = $place['id'];
+                }
+                sort($resultMap[$city['id']][$address['id']]);
+            }
+            ksort($resultMap[$city['id']]);
+        }
+        ksort($resultMap);
+
+        return $resultMap == $correctMap;
+    }
+}