Skip to content

Y
yii2
Commit c572c23c by Carsten Brandt
Options

adjusted tests

parent 51eabf52
Showing with 31 additions and 31 deletions
tests/unit/extensions/elasticsearch/QueryTest.php
...@@ -151,7 +151,7 @@ class QueryTest extends ElasticSearchTestCase ...@@ -151,7 +151,7 @@ class QueryTest extends ElasticSearchTestCase
} }
public function testFilter() public function testFilterWhere()
{ {
// should work with hash format // should work with hash format
$query = new Query; $query = new Query;
...@@ -162,10 +162,10 @@ class QueryTest extends ElasticSearchTestCase ...@@ -162,10 +162,10 @@ class QueryTest extends ElasticSearchTestCase
]); ]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->andFilter(['status' => null]); $query->andFilterWhere(['status' => null]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->orFilter(['name' => '']); $query->orFilterWhere(['name' => '']);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
} }
......
tests/unit/extensions/mongodb/QueryTest.php
...@@ -68,7 +68,7 @@ class QueryTest extends MongoDbTestCase ...@@ -68,7 +68,7 @@ class QueryTest extends MongoDbTestCase
); );
} }
public function testFilter() public function testFilterWhere()
{ {
// should work with hash format // should work with hash format
$query = new Query; $query = new Query;
...@@ -79,10 +79,10 @@ class QueryTest extends MongoDbTestCase ...@@ -79,10 +79,10 @@ class QueryTest extends MongoDbTestCase
]); ]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->andFilter(['status' => null]); $query->andFilterWhere(['status' => null]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->orFilter(['name' => '']); $query->orFilterWhere(['name' => '']);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
} }
......
tests/unit/extensions/sphinx/QueryTest.php
...@@ -60,7 +60,7 @@ class QueryTest extends SphinxTestCase ...@@ -60,7 +60,7 @@ class QueryTest extends SphinxTestCase
$this->assertEquals([':id' => 1, ':name' => 'something', ':age' => '30'], $query->params); $this->assertEquals([':id' => 1, ':name' => 'something', ':age' => '30'], $query->params);
} }
public function testFilter() public function testFilterWhere()
{ {
// should just call where() when string is passed // should just call where() when string is passed
$query = new Query; $query = new Query;
...@@ -77,10 +77,10 @@ class QueryTest extends SphinxTestCase ...@@ -77,10 +77,10 @@ class QueryTest extends SphinxTestCase
]); ]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->andFilter(['status' => null]); $query->andFilterWhere(['status' => null]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->orFilter(['name' => '']); $query->orFilterWhere(['name' => '']);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
// should work with operator format // should work with operator format
...@@ -89,35 +89,35 @@ class QueryTest extends SphinxTestCase ...@@ -89,35 +89,35 @@ class QueryTest extends SphinxTestCase
$query->filterWhere($condition); $query->filterWhere($condition);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['between', 'id', null, null]); $query->andFilterWhere(['between', 'id', null, null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->orFilter(['not between', 'id', null, null]); $query->orFilterWhere(['not between', 'id', null, null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['in', 'id', []]); $query->andFilterWhere(['in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not in', 'id', []]); $query->andFilterWhere(['not in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not in', 'id', []]); $query->andFilterWhere(['not in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['like', 'id', '']); $query->andFilterWhere(['like', 'id', '']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['or like', 'id', '']); $query->andFilterWhere(['or like', 'id', '']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not like', 'id', ' ']); $query->andFilterWhere(['not like', 'id', ' ']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['or not like', 'id', null]); $query->andFilterWhere(['or not like', 'id', null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
} }
public function testFilterRecursively() public function testFilterWhereRecursively()
{ {
$query = new Query(); $query = new Query();
$query->filterWhere(['and', ['like', 'name', ''], ['like', 'title', ''], ['id' => 1], ['not', ['like', 'name', '']]]); $query->filterWhere(['and', ['like', 'name', ''], ['like', 'title', ''], ['id' => 1], ['not', ['like', 'name', '']]]);
......
tests/unit/framework/db/QueryTest.php
...@@ -49,7 +49,7 @@ class QueryTest extends DatabaseTestCase ...@@ -49,7 +49,7 @@ class QueryTest extends DatabaseTestCase
$this->assertEquals([':id' => 1, ':name' => 'something', ':age' => '30'], $query->params); $this->assertEquals([':id' => 1, ':name' => 'something', ':age' => '30'], $query->params);
} }
public function testFilter() public function testFilterWhere()
{ {
// should just call where() when string is passed // should just call where() when string is passed
$query = new Query; $query = new Query;
...@@ -66,10 +66,10 @@ class QueryTest extends DatabaseTestCase ...@@ -66,10 +66,10 @@ class QueryTest extends DatabaseTestCase
]); ]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->andFilter(['status' => null]); $query->andFilterWhere(['status' => null]);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
$query->orFilter(['name' => '']); $query->orFilterWhere(['name' => '']);
$this->assertEquals(['id' => 0], $query->where); $this->assertEquals(['id' => 0], $query->where);
// should work with operator format // should work with operator format
...@@ -78,31 +78,31 @@ class QueryTest extends DatabaseTestCase ...@@ -78,31 +78,31 @@ class QueryTest extends DatabaseTestCase
$query->filterWhere($condition); $query->filterWhere($condition);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['between', 'id', null, null]); $query->andFilterWhere(['between', 'id', null, null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->orFilter(['not between', 'id', null, null]); $query->orFilterWhere(['not between', 'id', null, null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['in', 'id', []]); $query->andFilterWhere(['in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not in', 'id', []]); $query->andFilterWhere(['not in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not in', 'id', []]); $query->andFilterWhere(['not in', 'id', []]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['like', 'id', '']); $query->andFilterWhere(['like', 'id', '']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['or like', 'id', '']); $query->andFilterWhere(['or like', 'id', '']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['not like', 'id', ' ']); $query->andFilterWhere(['not like', 'id', ' ']);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
$query->andFilter(['or not like', 'id', null]); $query->andFilterWhere(['or not like', 'id', null]);
$this->assertEquals($condition, $query->where); $this->assertEquals($condition, $query->where);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment