update tests, change visibility from protected to private for queryProcessor property

Author: igor

ArrayQuery.php

@@ -32,14 +32,14 @@ class ArrayQuery extends Component
     /**
      * @var QueryProcessor
      */
-    protected $queryProcessor;
+    private $_queryProcessor;
 
     /**
      * @inheritdoc
      */
     public function init()
     {
-        $this->queryProcessor = Yii::createObject($this->queryProcessorClass);
+        $this->_queryProcessor = Yii::createObject($this->queryProcessorClass);
 
         parent::init();
     }
@@ -112,7 +112,7 @@ public function from(array $data)
      */
     protected function fetchData()
     {
-        return $this->queryProcessor->process($this);
+        return $this->_queryProcessor->process($this);
     }
 
     /**

tests/ArrayQueryTest.php

@@ -11,11 +11,12 @@
 class ArrayQueryTest extends TestCase
 {
     /**
-     * @return array
+     * @param array $config
+     * @return ArrayQuery array query instance.
      */
-    protected function getTestData()
+    protected function createArrayQuery($config = [])
     {
-        return [
+        return (new ArrayQuery($config))->from([
             [
                 'id' => 1,
                 'username' => 'admin',
@@ -31,144 +32,132 @@ protected function getTestData()
                 'username' => 'guest',
                 'email' => '[email protected]'
             ],
-        ];
+        ]);
     }
 
     // Tests :
 
     public function testWhereCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['username' => 'admin']);
-
         $rows = $query->all();
+
         $this->assertEquals('admin', $rows[0]['username']);
     }
 
     public function testLikeCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['like', 'email', 'test']);
-
         $rows = $query->all();
+
         $this->assertEquals('test', $rows[0]['username']);
     }
 
     public function testNotLikeCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['not like', 'username', 'admin']);
-
         $rows = $query->all();
+
         $this->assertEquals('guest', $rows[1]['username']);
         $this->assertCount(2, $rows);
     }
 
     public function testApplyLimit()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['like', 'email', 'example.com']);
         $query->limit(2);
-
         $rows = $query->all();
-        $this->assertEquals(2, count($rows));
+
+        $this->assertCount(2, $rows);
         $this->assertEquals('admin', $rows[0]['username']);
         $this->assertEquals('test', $rows[1]['username']);
     }
 
     public function testFetchFirstRow()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
-
+        $query = $this->createArrayQuery();
         $row = $query->one();
+
         $this->assertEquals('admin', $row['username']);
     }
 
     public function testOrCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['or', ['username' => 'admin'], ['id' => 3]]);
-
         $rows = $query->all();
-        $this->assertEquals(2, count($rows));
+
+        $this->assertCount(2, $rows);
         $this->assertEquals('admin', $rows[0]['username']);
         $this->assertEquals(3, $rows[1]['id']);
     }
 
     public function testBetweenCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['between', 'id', 1, 2]);
-
         $rows = $query->all();
-        $this->assertEquals(2, count($rows));
+
+        $this->assertCount(2, $rows);
         $this->assertEquals('admin', $rows[0]['username']);
         $this->assertEquals('test', $rows[1]['username']);
     }
 
     public function testNotCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['not', ['username' => 'admin']]);
-
         $rows = $query->all();
-        $this->assertEquals(2, count($rows));
+
+        $this->assertCount(2, $rows);
         $this->assertEquals('test', $rows[0]['username']);
         $this->assertEquals('guest', $rows[1]['username']);
     }
 
     public function testInCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['in', 'id', [1, 3]]);
-
         $rows = $query->all();
-        $this->assertEquals(2, count($rows));
+
+        $this->assertCount(2, $rows);
         $this->assertEquals('admin', $rows[0]['username']);
         $this->assertEquals('guest', $rows[1]['username']);
     }
 
     public function testExistsCondition()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->where(['username' => 'admin']);
 
         $this->assertTrue($query->exists());
     }
 
     public function testOrderByASC()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->orderBy('email');
-
         $rows = $query->all();
+
         $this->assertEquals('admin', $rows[0]['username']);
     }
 
     public function testOrderByDESC()
     {
-        $query = new ArrayQuery();
-        $query->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->orderBy(['email' => SORT_DESC]);
-
         $rows = $query->all();
+
         $this->assertEquals('test', $rows[0]['username']);
     }
 
     public function testFilterWhereCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['username' => 'admin']);
         $rows = $query->all();
 
@@ -178,7 +167,7 @@ public function testFilterWhereCondition()
 
     public function testFilterAndCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['username' => 'guest']);
         $query->andFilterWhere(['email' => '[email protected]']);
         $rows = $query->all();
@@ -189,7 +178,7 @@ public function testFilterAndCondition()
 
     public function testFilterOrCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['username' => 'guest']);
         $query->orFilterWhere(['username' => 'admin']);
         $rows = $query->all();
@@ -201,7 +190,7 @@ public function testFilterOrCondition()
 
     public function testFilterNotCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['not', ['username' => 'guest']]);
         $rows = $query->all();
 
@@ -212,7 +201,7 @@ public function testFilterNotCondition()
 
     public function testFilterBetweenCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['between', 'id', 2, 3]);
         $rows = $query->all();
 
@@ -223,7 +212,7 @@ public function testFilterBetweenCondition()
 
     public function testFilterInCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['in', 'id', [1, 2, 3]]);
         $rows = $query->all();
 
@@ -235,23 +224,24 @@ public function testFilterInCondition()
 
     public function testFilterLikeCondition()
     {
-        $query = (new ArrayQuery())->from($this->getTestData());
+        $query = $this->createArrayQuery();
         $query->filterWhere(['like', 'username', 'gu']);
         $query->orFilterWhere(['like', 'username', 'ad']);
         $rows = $query->all();
 
-
         $this->assertEquals('guest', $rows[0]['username']);
         $this->assertEquals('admin', $rows[1]['username']);
         $this->assertCount(2, $rows);
     }
 
     public function testSetCustomPrimaryKey()
     {
-        $query = (new ArrayQuery(['primaryKeyName' => 'username']))->from($this->getTestData());
+        $query = $this->createArrayQuery(['primaryKeyName' => 'username']);
         $query->where(['not', ['username' => 'admin']]);
         $rows = $query->all();
 
         $this->assertCount(2, $rows);
+        $this->assertEquals('username', $query->primaryKeyName);
+
     }
 }