From 570ad2c2bf518b7b23123346fe160beb145f1154 Mon Sep 17 00:00:00 2001
From: Alexander Kochetov <creocoder@gmail.com>
Date: Sat, 3 Jan 2015 20:09:41 +0300
Subject: [PATCH] Added new cases to unit tests

---
 tests/NestedSetsQueryBehaviorTest.php | 36 +++++++++++++++++++++++++--
 1 file changed, 34 insertions(+), 2 deletions(-)

diff --git a/tests/NestedSetsQueryBehaviorTest.php b/tests/NestedSetsQueryBehaviorTest.php
index dedfc56..6c0341e 100644
--- a/tests/NestedSetsQueryBehaviorTest.php
+++ b/tests/NestedSetsQueryBehaviorTest.php
@@ -7,6 +7,10 @@
 
 namespace tests;
 
+use tests\models\MultipleRootsTree;
+use tests\models\Tree;
+use yii\helpers\ArrayHelper;
+
 /**
  * NestedSetsQueryBehaviorTest
  */
@@ -17,7 +21,21 @@ class NestedSetsQueryBehaviorTest extends DatabaseTestCase
      */
     public function testRoots()
     {
-        $this->markTestSkipped();
+        $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree.xml');
+        $this->getDatabaseTester()->setDataSet($dataSet);
+        $this->getDatabaseTester()->onSetUp();
+        $models = Tree::find()->roots()->all();
+        $dataSet = new ArrayDataSet(['tree' => ArrayHelper::toArray($models)]);
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-query-roots.xml');
+        $this->assertDataSetsEqual($expectedDataSet, $dataSet);
+
+        $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree.xml');
+        $this->getDatabaseTester()->setDataSet($dataSet);
+        $this->getDatabaseTester()->onSetUp();
+        $models = MultipleRootsTree::find()->roots()->all();
+        $dataSet = new ArrayDataSet(['multiple_roots_tree' => ArrayHelper::toArray($models)]);
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-query-roots.xml');
+        $this->assertDataSetsEqual($expectedDataSet, $dataSet);
     }
 
     /**
@@ -25,6 +43,20 @@ class NestedSetsQueryBehaviorTest extends DatabaseTestCase
      */
     public function testLeaf()
     {
-        $this->markTestSkipped();
+        $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree.xml');
+        $this->getDatabaseTester()->setDataSet($dataSet);
+        $this->getDatabaseTester()->onSetUp();
+        $models = Tree::find()->leaf()->all();
+        $dataSet = new ArrayDataSet(['tree' => ArrayHelper::toArray($models)]);
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/tree-query-leaf.xml');
+        $this->assertDataSetsEqual($expectedDataSet, $dataSet);
+
+        $dataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree.xml');
+        $this->getDatabaseTester()->setDataSet($dataSet);
+        $this->getDatabaseTester()->onSetUp();
+        $models = MultipleRootsTree::find()->leaf()->all();
+        $dataSet = new ArrayDataSet(['multiple_roots_tree' => ArrayHelper::toArray($models)]);
+        $expectedDataSet = $this->createFlatXMLDataSet(__DIR__ . '/datasets/multiple-roots-tree-query-leaf.xml');
+        $this->assertDataSetsEqual($expectedDataSet, $dataSet);
     }
 }