From 97a9bd11ddd3338595bc8c9e5138de740b7b3140 Mon Sep 17 00:00:00 2001
From: thinkphp <thinkphp@qq.com>
Date: Tue, 22 Mar 2016 11:47:45 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84modelTest?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/thinkphp/library/think/modelTest.php | 76 +++++++---------------
 1 file changed, 22 insertions(+), 54 deletions(-)

diff --git a/tests/thinkphp/library/think/modelTest.php b/tests/thinkphp/library/think/modelTest.php
index d5dfa1f3..22c3075a 100644
--- a/tests/thinkphp/library/think/modelTest.php
+++ b/tests/thinkphp/library/think/modelTest.php
@@ -36,62 +36,30 @@ class modelTest extends \PHPUnit_Framework_TestCase
 
     public function testValidate()
     {
-        /*
-    $model = new Model('', $this->getConfig());
-    $data  = $_POST  = [
-    'username'   => 'username',
-    'nickname'   => 'nickname',
-    'password'   => '123456',
-    'repassword' => '123456',
-    'mobile'     => '13800000000',
-    'email'      => 'abc@abc.com',
-    'sex'        => '0',
-    'age'        => '20',
-    'code'       => '1234',
-    ];
+        $model = new Model('', $this->getConfig());
+        $data  = [
+            'username'   => 'username',
+            'nickname'   => 'nickname',
+            'password'   => '123456',
+            'repassword' => '123456',
+            'email'      => 'abc@abc.com',
+            'sex'        => '0',
+            'age'        => '20',
+            'code'       => '1234',
+        ];
 
-    $validate = [
-    '__pattern__' => [
-    'mobile'  => '/^1(?:[358]\d|7[6-8])\d{8}$/',
-    'require' => '/.+/',
-    ],
-    '__all__'     => [
-    'code' => function ($value, $data) {
-    return '1234' != $value ? 'code error' : true;
-    },
-    ],
-    'user'        => [
-    ['username', [ & $this, 'checkName'], '用户名长度为5到15个字符', 'callback', 'username'],
-    ['username', function ($value, $data) {
-    return 'admin' == $value ? '此用户名已被使用' : true;
-    }],
-    'nickname'   => ['require', '请填昵称'],
-    'password'   => ['[\w-]{6,15}', '密码长度为6到15个字符'],
-    'repassword' => ['password', '两次密码不一到致', 'confirm'],
-    'mobile'     => ['mobile', '手机号错误'],
-    'email'      => ['validate_email', '邮箱格式错误', 'filter'],
-    'sex'        => ['0,1', '性别只能为为男或女', 'in'],
-    'age'        => ['1,80', '年龄只能在10-80之间', 'between'],
-    '__option__' => [
-    'scene'           => [
-    'add'  => 'username,nickname,password,repassword,mobile,email,age,code',
-    'edit' => 'nickname,password,repassword,mobile,email,sex,age,code',
-    ],
-    'value_validate'  => 'email',
-    'exists_validate' => 'password,repassword,code',
-    'patch'           => true,
-    ],
-    ],
-    ];
-    Config::set('validate', $validate);
-    $result = $model->validate('user.add')->create();
-    $this->assertEmpty($model->getError());
+        $validate = [
+            ['username', 'length:5,15|unique:user', '用户名长度为5到15个字符|用户名已经存在'],
+            ['nickname', 'require', '请填昵称'],
+            ['password', '[\w-]{6,15}', '密码长度为6到15个字符'],
+            ['repassword', 'confirm:password', '两次密码不一到致'],
+            ['email', 'filter:validate_email', '邮箱格式错误'],
+            ['sex', 'in:0,1', '性别只能为为男或女'],
+            ['age', 'between:1,80', '年龄只能在10-80之间'],
+        ];
+        $result = $model->validate($validate)->create($data);
+        $this->assertEmpty($model->getError());
 
-    unset($data['password'], $data['repassword']);
-    $data['email'] = '';
-    $result        = $model->validate('user.edit')->create($data);
-    $this->assertEmpty($model->getError());
-     */
     }
 
     public function checkName($value, $field)