From d8f112280c49d428de71d705b177537617eb5a06 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 18 Sep 2023 16:02:31 +0800
Subject: [PATCH] * Modify unit test of testcaseModel::update.

---
 module/testcase/test/model/update.php   | 25 ++++++-------------------
 module/testcase/test/testcase.class.php |  6 +++---
 2 files changed, 9 insertions(+), 22 deletions(-)

diff --git a/module/testcase/test/model/update.php b/module/testcase/test/model/update.php
index b90523fd68..277ccebb15 100755
--- a/module/testcase/test/model/update.php
+++ b/module/testcase/test/model/update.php
@@ -2,6 +2,11 @@
 <?php
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/testcase.class.php';
+
+zdTable('case')->gen('5');
+zdTable('casestep')->gen('5');
+zdTable('user')->gen('1');
+
 su('admin');
 
 /**
@@ -10,24 +15,6 @@ title=测试 testcaseModel->update();
 timeout=0
 cid=1
 
-- 测试更新用例名称
- - 第0条的field属性 @title
- - 第0条的old属性 @这个是测试用例1
- - 第0条的new属性 @修改后的用例
-
-- 测试名称不能为空第title条的0属性 @『用例名称』不能为空。
-
-- 测试更新用例类型
- - 第0条的field属性 @type
- - 第0条的old属性 @feature
- - 第0条的new属性 @install
-
-- 测试类型不能为空第type条的0属性 @『类型』不能为空。
-
-- 测试更新用例步骤
- - 第0条的field属性 @steps
- - 第0条的new属性 @步骤1 EXPECT:预期1
-
 */
 
 $changeTitle        = array('title' => '修改后的名称');
@@ -48,4 +35,4 @@ r($testcase->updateTest($testcaseIdList[0], $title))      && p('0:field,old,new'
 r($testcase->updateTest($testcaseIdList[0], $emptyTitle)) && p('title:0')         && e('『用例名称』不能为空。');             // 测试名称不能为空
 r($testcase->updateTest($testcaseIdList[0], $type))       && p('0:field,old,new') && e('type,feature,install');               // 测试更新用例类型
 r($testcase->updateTest($testcaseIdList[0], $emptyType))  && p('type:0')          && e('『类型』不能为空。');                 // 测试类型不能为空
-r($testcase->updateTest($testcaseIdList[0], $steps))      && p('0:field,new') && e('steps,步骤1 EXPECT:预期1');               // 测试更新用例步骤
\ No newline at end of file
+r($testcase->updateTest($testcaseIdList[0], $steps))      && p('0:field,new')     && e('steps,步骤1 EXPECT:预期1');           // 测试更新用例步骤
diff --git a/module/testcase/test/testcase.class.php b/module/testcase/test/testcase.class.php
index ea2ffb2d2f..51144894a2 100755
--- a/module/testcase/test/testcase.class.php
+++ b/module/testcase/test/testcase.class.php
@@ -545,16 +545,15 @@ class testcaseTest
         $oldCase = $this->objectModel->getByID($caseID);
 
         $case = new stdclass();
+        $case->id             = $caseID;
         $case->title          = $oldCase->title;
         $case->color          = $oldCase->color;
         $case->precondition   = $oldCase->precondition;
         $case->steps          = array('用例步骤描述1');
-        $case->stepType       = array('step');
-        $case->expects        = array('这是用例预期结果1');
         $case->comment        = '';
-        $case->labels         = '';
         $case->lastEditedDate = $oldCase->lastEditedDate;
         $case->product        = $oldCase->product;
+        $case->branch         = $oldCase->branch;
         $case->module         = $oldCase->module;
         $case->story          = $oldCase->story;
         $case->type           = $oldCase->type;
@@ -563,6 +562,7 @@ class testcaseTest
         $case->status         = $oldCase->status;
         $case->keywords       = $oldCase->keywords;
         $case->linkBug        = array();
+        $case->stepChanged    = isset($param['steps']);
 
         foreach($param as $field => $value) $case->$field = $value;