From 743a34b10dfbc13787cbf2be403c2b9bff09c6da Mon Sep 17 00:00:00 2001
From: oldrind <1401019000@qq.com>
Date: Sat, 5 Mar 2016 18:44:17 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9model=E7=B1=BB=E5=8D=95?=
 =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 tests/thinkphp/library/think/modelTest.php | 64 +++++++++++-----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/tests/thinkphp/library/think/modelTest.php b/tests/thinkphp/library/think/modelTest.php
index c1b3b823..c54ab2d7 100644
--- a/tests/thinkphp/library/think/modelTest.php
+++ b/tests/thinkphp/library/think/modelTest.php
@@ -586,37 +586,37 @@ EOF;
 
     public function testDelete()
     {
-//        $config = $this->getConfig();
-//
-//        $order_model     = new Model('order', $config);
-//        $order_model->id = 2;
-//        $flag            = $order_model->delete();
-//        $this->assertEquals(1, $flag);
-//
-//        $flag = $order_model->delete('1');
-//        $this->assertEquals(1, $flag);
-//
-//        $address_model = new Model('user_address', $config);
-//        $flag          = $address_model->delete(['1', '2']);
-//        $this->assertEquals(2, $flag);
-//
-//        $user_model = new Model('user', $config);
-//        $flag       = $user_model->using([''])->where('1=1')->delete();
-//        $this->assertEquals(2, $flag);
-//
-//        $ru_model = new Model('role_user', $config);
-//        $flag     = $ru_model->delete(['1', '1']);
-//        $this->assertEquals(1, $flag);
-//
-//        $sql   = <<<EOF
-//DROP TABLE IF EXISTS `tp_user`;
-//DROP TABLE IF EXISTS `tp_order`;
-//DROP TABLE IF EXISTS `tp_user_address`;
-//DROP TABLE IF EXISTS `tp_role_user`;
-//EOF;
-//        $model = new Model('', $this->getConfig());
-//        $model->execute($sql);
-//        $flag = $model->db(0, null);
-//        $this->assertNull($flag);
+        $config = $this->getConfig();
+
+        $order_model     = new Model('order', $config);
+        $order_model->id = 2;
+        $flag            = $order_model->delete();
+        $this->assertEquals(1, $flag);
+
+        $flag = $order_model->delete('1');
+        $this->assertEquals(1, $flag);
+
+        $address_model = new Model('user_address', $config);
+        $flag          = $address_model->delete(['1', '2']);
+        $this->assertEquals(2, $flag);
+
+        $user_model = new Model('user', $config);
+        $flag       = $user_model->using([''])->where('1=1')->delete();
+        $this->assertEquals(2, $flag);
+
+        $ru_model = new Model('role_user', $config);
+        $flag     = $ru_model->delete(['1', '1']);
+        $this->assertEquals(1, $flag);
+
+        $sql   = <<<EOF
+DROP TABLE IF EXISTS `tp_user`;
+DROP TABLE IF EXISTS `tp_order`;
+DROP TABLE IF EXISTS `tp_user_address`;
+DROP TABLE IF EXISTS `tp_role_user`;
+EOF;
+        $model = new Model('', $this->getConfig());
+        $model->execute($sql);
+        $flag = $model->db(0, null);
+        $this->assertNull($flag);
     }
 }