merge mongo with master
This commit is contained in:
@ -54,13 +54,13 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
public function testIdentify()
|
||||
{
|
||||
$param = 'param';
|
||||
$this->assertEquals($param, $this->model->identify($param));
|
||||
$this->assertSame($param, $this->model->identify($param));
|
||||
}
|
||||
|
||||
public function testQuote()
|
||||
{
|
||||
$param = 'param';
|
||||
$this->assertEquals($param, $this->model->quote($param));
|
||||
$this->assertSame($param, $this->model->quote($param));
|
||||
}
|
||||
|
||||
public function testGet()
|
||||
@ -75,12 +75,12 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
|
||||
public function testUpdate()
|
||||
{
|
||||
$this->assertEquals('mock', $this->model->update(array('var' => 'val'), 1));
|
||||
$this->assertSame('mock', $this->model->update(array('var' => 'val'), 1));
|
||||
}
|
||||
|
||||
public function testDelete()
|
||||
{
|
||||
$this->assertEquals('mock', $this->model->delete(1));
|
||||
$this->assertSame('mock', $this->model->delete(1));
|
||||
}
|
||||
|
||||
public function testOrder()
|
||||
@ -88,14 +88,14 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
$model = new ReflectionClass('SqlModel');
|
||||
$method = $model->getMethod('order');
|
||||
$method->setAccessible(true);
|
||||
$this->assertEquals(' ORDER BY id DESC', $method->invoke($this->model, array('sort' => 'id', 'order' => 'desc')));
|
||||
$this->assertEquals(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name'), array('id', 'name')));
|
||||
$this->assertSame(' ORDER BY id DESC', $method->invoke($this->model, array('sort' => 'id', 'order' => 'desc')));
|
||||
$this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name'), array('id', 'name')));
|
||||
$this->assertEmpty($method->invoke($this->model, array()));
|
||||
|
||||
/**
|
||||
* @TODO: Model::order - check DESC condition - make case insensitive
|
||||
*/
|
||||
$this->assertEquals(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name', 'order' => 'DESC'), array('id', 'name')));
|
||||
$this->assertSame(' ORDER BY name ASC', $method->invoke($this->model, array('sort' => 'name', 'order' => 'DESC'), array('id', 'name')));
|
||||
}
|
||||
|
||||
public function testSearch()
|
||||
@ -105,7 +105,7 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
$method->setAccessible(true);
|
||||
$this->assertEmpty($method->invoke($this->model, array()));
|
||||
$this->assertEmpty($method->invoke($this->model, array('q' => 'in', 'qt' => 'name')));
|
||||
$this->assertEquals('test.name LIKE %on%', $method->invoke($this->model, array('qt' => 'name', 'q' => 'on'), array('name'), 'test'));
|
||||
$this->assertSame('test.name LIKE %on%', $method->invoke($this->model, array('qt' => 'name', 'q' => 'on'), array('name'), 'test'));
|
||||
}
|
||||
|
||||
public function testFetch()
|
||||
@ -113,9 +113,8 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
$model = new ReflectionClass('SqlModel');
|
||||
$method = $model->getMethod('fetch');
|
||||
$method->setAccessible(true);
|
||||
|
||||
$key = $this->getCacheKeyMockGetSet();
|
||||
$this->assertEquals('field', $method->invoke($this->model, 'SELECT', array(), $key));
|
||||
$this->assertTrue(true, $method->invoke($this->model, 'SELECT', array(), $key));
|
||||
}
|
||||
|
||||
public function testFetchField()
|
||||
@ -125,7 +124,7 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
$method->setAccessible(true);
|
||||
|
||||
$key = $this->getCacheKeyMockGetSet();
|
||||
$this->assertEquals('field', $method->invoke($this->model, 'SELECT', array(), 'field', $key));
|
||||
$this->assertSame('field', $method->invoke($this->model, 'SELECT', array(), 'field', $key));
|
||||
}
|
||||
|
||||
public function testFetchAll()
|
||||
@ -135,7 +134,7 @@ class SqlModelTest extends PHPUnit_Framework_TestCase
|
||||
$method->setAccessible(true);
|
||||
|
||||
$key = $this->getCacheKeyMockGetSet();
|
||||
$this->assertEquals('field', $method->invoke($this->model, 'SELECT', array(), $key));
|
||||
$this->assertTrue(true, $method->invoke($this->model, 'SELECT', array(), $key));
|
||||
}
|
||||
|
||||
public function testGetCache()
|
||||
|
Reference in New Issue
Block a user