mirror-fastadminnet/framework
1
0
Fork 0
mirror of https://gitee.com/fastadminnet/framework.git synced 2026-07-09 16:12:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

增加model类单元测试文件；单条规则返回值为数组时改成与$this->error合并； 增加验证规则条件是否为正则的判断。

Browse Source
This commit is contained in:
oldrind
2016-03-01 20:42:42 +08:00
parent 8de6671a62
commit 4404027016
1 changed files with 20 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
tests/thinkphp/library/think/modelTest.php
View File

@@ -19,9 +19,21 @@ use think\Model;
class modelTest extends \PHPUnit_Framework_TestCase class modelTest extends \PHPUnit_Framework_TestCase
{ {
public function getConfig()
{
static $config;
if (!isset($config)) {
$config = \think\Input::get('database');
$config['database'] = 'test';
$config['username'] = 'root';
$config['password'] = '';
}
return $config;
}
public function testValidate() public function testValidate()
{ {
$model = new Model(); $model = new Model('', $this->getConfig());
$data = [ $data = [
'username' => 'username', 'username' => 'username',
'nickname' => 'nickname', 'nickname' => 'nickname',
@@ -34,7 +46,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
'code' => '1234', 'code' => '1234',
]; ];
$config = [ $validate = [
'__pattern__' => [ '__pattern__' => [
'mobile' => '/^1(?:[358]\d|7[6-8])\d{8}$/', 'mobile' => '/^1(?:[358]\d|7[6-8])\d{8}$/',
'require' => '/.+/', 'require' => '/.+/',
@@ -61,7 +73,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
], ],
], ],
]; ];
\think\Config::set('validate', $config); \think\Config::set('validate', $validate);
$result = $model->validate('user.add')->create($data); $result = $model->validate('user.add')->create($data);
$this->assertEquals('', $model->getError()); $this->assertEquals('', $model->getError());
@@ -117,7 +129,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
public function testFill() public function testFill()
{ {
$model = new Model(); $model = new Model('', $this->getConfig());
$data = [ $data = [
'username' => '', 'username' => '',
'nickname' => 'nickname', 'nickname' => 'nickname',
@@ -125,7 +137,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
'hobby' => ['1', '2'], 'hobby' => ['1', '2'],
'cityid' => '1', 'cityid' => '1',
]; ];
$config = [ $auto = [
'user' => [ 'user' => [
'__option__' => [ '__option__' => [
'value_fill' => ['username', 'password', 'phone'], 'value_fill' => ['username', 'password', 'phone'],
@@ -143,7 +155,7 @@ class modelTest extends \PHPUnit_Framework_TestCase
['login_time', function($value, $data) {return $data['reg_time'];}], ['login_time', function($value, $data) {return $data['reg_time'];}],
], ],
]; ];
\think\Config::set('auto', $config); \think\Config::set('auto', $auto);
$result = $model->auto('user')->create($data); $result = $model->auto('user')->create($data);
$data['nickname'] = 'cn_nickname'; $data['nickname'] = 'cn_nickname';
$data['phone'] = '123456'; $data['phone'] = '123456';
@@ -171,11 +183,11 @@ class modelTest extends \PHPUnit_Framework_TestCase
] ]
] ]
]; ];
$auto = [ $test = [
'name.*' => 'name', 'name.*' => 'name',
'goods.*.*.price' => 100, 'goods.*.*.price' => 100,
]; ];
$result = $model->auto($auto)->create($data); $result = $model->auto($test)->create($data);
$data['name']['a'] = $data['name']['b'] = 'name'; $data['name']['a'] = $data['name']['b'] = 'name';
$data['goods'][0][0]['price'] = 100; $data['goods'][0][0]['price'] = 100;
$data['goods'][0][1]['price'] = 100; $data['goods'][0][1]['price'] = 100;