From afda76605ee7d095f9235c48c2c13cfbcb592c93 Mon Sep 17 00:00:00 2001 From: tianshujie Date: Wed, 22 Nov 2023 14:27:55 +0800 Subject: [PATCH] * Refactor custom::updateURAndSR unit test. --- module/custom/test/custom.class.php | 28 +++++++--------------- module/custom/test/model/updateurandsr.php | 27 +++++++++------------ 2 files changed, 19 insertions(+), 36 deletions(-) diff --git a/module/custom/test/custom.class.php b/module/custom/test/custom.class.php index ccb61c37ea..ed6410e8b7 100644 --- a/module/custom/test/custom.class.php +++ b/module/custom/test/custom.class.php @@ -299,35 +299,23 @@ class customTest } /** + * 编辑需求概念。 * Test edit UR and SR concept. * * @param int $key - * @param string $SRName + * @param array $data * @access public - * @return object + * @return array */ - public function updateURAndSRTest($key = 0, $SRName = '') + public function updateURAndSRTest(int $key = 0, array $data = array()): array { - global $app, $tester; - - $_POST['URName'] = '用户需求'; - $_POST['SRName'] = $SRName; - $this->objectModel->updateURAndSR($key); - + $this->objectModel->updateURAndSR($key, '', $data); if(dao::isError()) return dao::getError(); - $lang = $app->getClientLang(); + $concept = $this->objectModel->getURSRConcept($key); - $objects = $tester->dao->select('`value`')->from(TABLE_LANG) - ->where('`key`')->eq($key) - ->andWhere('section')->eq('URSRList') - ->andWhere('lang')->eq($lang) - ->andWhere('module')->eq('custom') - ->fetch(); - - unset($_POST); - - return $objects; + if(!$concept) return array(); + return json_decode($concept, true); } public function setStoryRequirementTest() diff --git a/module/custom/test/model/updateurandsr.php b/module/custom/test/model/updateurandsr.php index f955cd73f6..4d7605302d 100755 --- a/module/custom/test/model/updateurandsr.php +++ b/module/custom/test/model/updateurandsr.php @@ -8,25 +8,20 @@ su('admin'); title=测试 customModel->updateURAndSR(); cid=1 -pid=1 - -测试修改key为1，SRName值更改为空 >> {"SRName":"\u8f6f\u4ef6\u9700\u6c42","URName":"\u7528\u6237\u9700\u6c42"} -测试修改key为1，SRName值更改为软件需求 >> {"SRName":"\u8f6f\u4ef6\u9700\u6c42","URName":"\u7528\u6237\u9700\u6c42"} -测试修改key为1，SRName值更改为软件需求1 >> {"SRName":"\u8f6f\u4ef6\u9700\u6c421","URName":"\u7528\u6237\u9700\u6c42"} -测试修改key为0，SRName值更改为空 >> 0 -测试修改key为0，SRName值更改为软件需求 >> 0 -测试修改key为0，SRName值更改为软件需求1 >> 0 */ + $key = array(1, 0); $SRName = array('', '软件需求', '软件需求1'); -$custom = new customTest(); - -r($custom->updateURAndSRTest($key[0], $SRName[0])) && p('value') && e('{"SRName":"\u8f6f\u4ef6\u9700\u6c42","URName":"\u7528\u6237\u9700\u6c42"}'); //测试修改key为1，SRName值更改为空 -r($custom->updateURAndSRTest($key[0], $SRName[1])) && p('value') && e('{"SRName":"\u8f6f\u4ef6\u9700\u6c42","URName":"\u7528\u6237\u9700\u6c42"}'); //测试修改key为1，SRName值更改为软件需求 -r($custom->updateURAndSRTest($key[0], $SRName[2])) && p('value') && e('{"SRName":"\u8f6f\u4ef6\u9700\u6c421","URName":"\u7528\u6237\u9700\u6c42"}'); //测试修改key为1，SRName值更改为软件需求1 -r($custom->updateURAndSRTest($key[1], $SRName[0])) && p() && e('0'); //测试修改key为0，SRName值更改为空 -r($custom->updateURAndSRTest($key[1], $SRName[1])) && p() && e('0'); //测试修改key为0，SRName值更改为软件需求 -r($custom->updateURAndSRTest($key[1], $SRName[2])) && p() && e('0'); //测试修改key为0，SRName值更改为软件需求1 +$dataList[] = array('SRName' => $SRName[0], 'URName' => '用户需求'); +$dataList[] = array('SRName' => $SRName[1], 'URName' => '用户需求'); +$dataList[] = array('SRName' => $SRName[2], 'URName' => '用户需求'); +$customTester = new customTest(); +r($customTester->updateURAndSRTest($key[0], $dataList[2])) && p('SRName') && e('软件需求1'); // 测试修改key为1，SRName值更改为软件需求1 +r($customTester->updateURAndSRTest($key[0], $dataList[1])) && p('SRName') && e('软件需求'); // 测试修改key为1，SRName值更改为软件需求 +r($customTester->updateURAndSRTest($key[0], $dataList[0])) && p('SRName') && e('软件需求'); // 测试修改key为1，SRName值更改为空 +r($customTester->updateURAndSRTest($key[1], $dataList[2])) && p() && e('0'); // 测试修改key为0，SRName值更改为软件需求1 +r($customTester->updateURAndSRTest($key[1], $dataList[1])) && p() && e('0'); // 测试修改key为0，SRName值更改为软件需求 +r($customTester->updateURAndSRTest($key[1], $dataList[0])) && p() && e('0'); // 测试修改key为0，SRName值更改为空