From d73e5ea35a8c6b3ddcf3d983634defd37310b279 Mon Sep 17 00:00:00 2001 From: zenggang Date: Fri, 12 Aug 2022 09:34:05 +0000 Subject: [PATCH] * Adjust unit code --- test/model/custom/saverequiredfields.php | 6 +++--- test/model/datatable/printHead.php | 7 +++++-- test/model/dept/getdeptuserpairs.php | 4 ++-- test/model/dept/managechild.php | 2 +- test/model/design/batchcreate.php | 10 +++++++--- test/model/entry/getbycode.php | 2 -- test/model/entry/getbyid.php | 2 -- test/model/entry/getbykey.php | 2 -- test/model/entry/getlist.php | 2 -- test/model/entry/getlogs.php | 2 -- test/model/entry/updatecalltime.php | 2 +- 11 files changed, 19 insertions(+), 22 deletions(-) diff --git a/test/model/custom/saverequiredfields.php b/test/model/custom/saverequiredfields.php index dd02f2e4bc..890bdbc2fd 100755 --- a/test/model/custom/saverequiredfields.php +++ b/test/model/custom/saverequiredfields.php @@ -19,7 +19,7 @@ pid=1 测试moduleName为product，requiredFields中的create,edit各存在多个值 >> PO,RD,name,code 测试moduleName为release，requiredFields为空 >> name,date 测试moduleName为release，requiredFields中的create存在一个值 >> desc,name,date -测试moduleName为release，requiredFields中的rdit存在一个值 >> desc,name,date +测试moduleName为release，requiredFields中的edit存在一个值 >> desc,name,build,date 测试moduleName为release，requiredFields中的create,edit各存在一个值 >> desc,name,date 测试moduleName为execution，requiredFields为空 >> name,code,begin,end 测试moduleName为execution，requiredFields中的create存在一个值 >> desc,name,code,begin,end @@ -112,7 +112,7 @@ r($custom->saveRequiredFieldsTest($moduleName[0], $requiredFields['productFields r($custom->saveRequiredFieldsTest($moduleName[0], $requiredFields['productFields6'], $fieldsType[0])) && p('value') && e('PO,RD,name,code'); //测试moduleName为product，requiredFields中的create,edit各存在多个值 r($custom->saveRequiredFieldsTest($moduleName[1], $requiredFields['releaseFields1'], $fieldsType[0])) && p('value') && e('name,date'); //测试moduleName为release，requiredFields为空 r($custom->saveRequiredFieldsTest($moduleName[1], $requiredFields['releaseFields2'], $fieldsType[0])) && p('value') && e('desc,name,date'); //测试moduleName为release，requiredFields中的create存在一个值 -r($custom->saveRequiredFieldsTest($moduleName[1], $requiredFields['releaseFields3'], $fieldsType[1])) && p('value') && e('desc,name,date'); //测试moduleName为release，requiredFields中的rdit存在一个值 +r($custom->saveRequiredFieldsTest($moduleName[1], $requiredFields['releaseFields3'], $fieldsType[1])) && p('value') && e('desc,name,build,date'); //测试moduleName为release，requiredFields中的edit存在一个值 r($custom->saveRequiredFieldsTest($moduleName[1], $requiredFields['releaseFields4'], $fieldsType[0])) && p('value') && e('desc,name,date'); //测试moduleName为release，requiredFields中的create,edit各存在一个值 r($custom->saveRequiredFieldsTest($moduleName[2], $requiredFields['executionFields1'], $fieldsType[0])) && p('value') && e('name,code,begin,end'); //测试moduleName为execution，requiredFields为空 r($custom->saveRequiredFieldsTest($moduleName[2], $requiredFields['executionFields2'], $fieldsType[0])) && p('value') && e('desc,name,code,begin,end'); //测试moduleName为execution，requiredFields中的create存在一个值 @@ -147,4 +147,4 @@ r($custom->saveRequiredFieldsTest($moduleName[5], $requiredFields['testcaseField r($custom->saveRequiredFieldsTest($moduleName[5], $requiredFields['testcaseFields6'], $fieldsType[0])) && p('value') && e('stage,story,title,type'); //测试moduleName为testcase，requiredFields中的create,edit各存在多个值 r($custom->saveRequiredFieldsTest($moduleName[3], $requiredFields['taskFields6'], $fieldsType[2])) && p('value') && e('comment,realStarted,finishedDate,currentConsumed');//测试moduleName为task，requiredFields中的finish存在一个值 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB(); diff --git a/test/model/datatable/printHead.php b/test/model/datatable/printHead.php index 101dc591b6..e48162d59f 100755 --- a/test/model/datatable/printHead.php +++ b/test/model/datatable/printHead.php @@ -10,7 +10,10 @@ title=测试 datatableModel::printHead(); cid=1 pid=1 - +获取产品模块browse方法头部html >> 1 +获取产品模块browse方法头部html带排序 >> 1 +获取产品模块browse方法头部html带参数 >> 1 +获取产品模块browse方法头部html带checkbox >> 1 */ @@ -25,4 +28,4 @@ $data_check = array('cols' => $productSetting[0], 'orderBy' => 'id_asc', 'vars' r($datatable->printHeadTest($data)) && p() && e(1); //获取产品模块browse方法头部html r($datatable->printHeadTest($data_order)) && p() && e(1); //获取产品模块browse方法头部html带排序 r($datatable->printHeadTest($data_vars)) && p() && e(1); //获取产品模块browse方法头部html带参数 -r($datatable->printHeadTest($data_check)) && p() && e(1); //获取产品模块browse方法头部html带checkbox \ No newline at end of file +r($datatable->printHeadTest($data_check)) && p() && e(1); //获取产品模块browse方法头部html带checkbox diff --git a/test/model/dept/getdeptuserpairs.php b/test/model/dept/getdeptuserpairs.php index e34959b13b..0cf55ee774 100755 --- a/test/model/dept/getdeptuserpairs.php +++ b/test/model/dept/getdeptuserpairs.php @@ -23,7 +23,7 @@ type为out查询 >> 测试10 */ -$deptIDList = array('0', '2', '5'); +$deptIDList = array(0, '2', '5'); $key = array('id', 'account', 'out'); $type = array('inside', 'outside', 'out'); $count = array('0', '1'); @@ -39,4 +39,4 @@ r($dept->getDeptUserPairsTest($deptIDList[1], $count[0], $key[1], $type[2])) r($dept->getDeptUserPairsTest($deptIDList[0], $count[1], $key[0], $type[0])) && p() && e('999'); //查询所有内部用户统计 r($dept->getDeptUserPairsTest($deptIDList[0], $count[1], $key[0], $type[1])) && p() && e('1'); //查询所有外部用户统计 r($dept->getDeptUserPairsTest($deptIDList[1], $count[1], $key[0], $type[0])) && p() && e('30'); //根据部门查询用户统计 -r($dept->getDeptUserPairsTest($deptIDList[0], $count[1], $key[0], $type[0], $params)) && p() && e('1000'); //查询全部用户统计 \ No newline at end of file +r($dept->getDeptUserPairsTest($deptIDList[0], $count[1], $key[0], $type[0], $params)) && p() && e('1000'); //查询全部用户统计 diff --git a/test/model/dept/managechild.php b/test/model/dept/managechild.php index 89e9ce5e75..eb1968bedf 100755 --- a/test/model/dept/managechild.php +++ b/test/model/dept/managechild.php @@ -29,4 +29,4 @@ r($dept->manageChildTest('', $depts, $count[0])) && p('1') r($dept->manageChildTest('', $depts, $count[1])) && p() && e('3'); //无父级部门下添加子级部门统计 r($dept->manageChildTest($parentDeptID, $depts = array(), $count[0])) && p() && e('0'); //无部门名称 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB(); diff --git a/test/model/design/batchcreate.php b/test/model/design/batchcreate.php index bb4313873c..c84ab96ca7 100755 --- a/test/model/design/batchcreate.php +++ b/test/model/design/batchcreate.php @@ -17,6 +17,8 @@ pid=1 批量创建看板项目设计 >> 41 不输入类型 >> 『设计类型』不能为空。 不输入名字 >> 0 +不输入需求 >> 1 +不输入详情 >> 1 */ $projectIDList = array('12', '32', '62', '13', '71', '72', '73', '75'); @@ -37,9 +39,11 @@ r(count($design->batchCreateTest($projectIDList[7], $productIDList[0], $noDescDe r($design->batchCreateTest($projectIDList[0], $productIDList[0], $normalDesign)) && p('0:name') && e('设计一'); //批量创建敏捷项目设计 r($design->batchCreateTest($projectIDList[1], $productIDList[1], $normalDesign)) && p('0:project') && e('32'); //批量创建瀑布项目设计 r($design->batchCreateTest($projectIDList[2], $productIDList[2], $normalDesign)) && p('0:product') && e('41'); //批量创建看板项目设计 -r($design->batchCreateTest($projectIDList[3], $productIDList[0], $noStoryDesign)) && p('0:story') && e(''); //不输入需求 r($design->batchCreateTest($projectIDList[4], $productIDList[0], $noTypeDesign)) && p('type:0') && e('『设计类型』不能为空。');//不输入类型 r($design->batchCreateTest($projectIDList[5], $productIDList[0], $noNameDesign)) && p() && e('0'); //不输入名字 -r($design->batchCreateTest($projectIDList[6], $productIDList[0], $noDescDesign)) && p('0:desc') && e(''); //不输入详情 +$result = $design->batchCreateTest($projectIDList[3], $productIDList[0], $noStoryDesign); +r(empty($result[0]->story)) && p() && e(1); //不输入需求 +$result = $design->batchCreateTest($projectIDList[6], $productIDList[0], $noDescDesign); +r(empty($result[0]->desc)) && p('0:desc') && e(1); //不输入详情 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB(); diff --git a/test/model/entry/getbycode.php b/test/model/entry/getbycode.php index dd8513b642..9a80c0b22a 100755 --- a/test/model/entry/getbycode.php +++ b/test/model/entry/getbycode.php @@ -2,7 +2,6 @@ switchDB(); su('admin'); /** @@ -26,4 +25,3 @@ r($entry->getByCodeTest($entryCodeList[0])) && p('name') && e('这是应用名 r($entry->getByCodeTest($entryCodeList[0])) && p('account') && e('accountadmin'); // 查询code为code1的entry的account r($entry->getByCodeTest($entryCodeList[1])) && p('name') && e('0'); // 查询code为code2的entry的name r($entry->getByCodeTest($entryCodeList[1])) && p('account') && e('0'); // 查询code为code2的entry的account -$db->restoreDB(); \ No newline at end of file diff --git a/test/model/entry/getbyid.php b/test/model/entry/getbyid.php index 3ffd83cc18..b9c09940b2 100755 --- a/test/model/entry/getbyid.php +++ b/test/model/entry/getbyid.php @@ -2,7 +2,6 @@ switchDB(); su('admin'); /** @@ -26,4 +25,3 @@ r($entry->getByIdTest($entryIDList[0])) && p('name') && e('这是应用名称1') r($entry->getByIdTest($entryIDList[0])) && p('account') && e('accountadmin'); // 查询id为1的entry的account r($entry->getByIdTest($entryIDList[1])) && p('name') && e('0'); // 查询id为1000001的entry的name r($entry->getByIdTest($entryIDList[1])) && p('account') && e('0'); // 查询id为1000001的entry的account -$db->restoreDB(); \ No newline at end of file diff --git a/test/model/entry/getbykey.php b/test/model/entry/getbykey.php index d484eee883..7f5d7b7990 100755 --- a/test/model/entry/getbykey.php +++ b/test/model/entry/getbykey.php @@ -2,7 +2,6 @@ switchDB(); su('admin'); /** @@ -26,4 +25,3 @@ r($entry->getByKeyTest($entryKeyList[0])) && p('name') && e('这是应用名称1 r($entry->getByKeyTest($entryKeyList[0])) && p('account') && e('accountadmin'); // 查询key为792b9b972157d2d8531b43e04c0af021的entry的account r($entry->getByKeyTest($entryKeyList[1])) && p('name') && e('0'); // 查询key为空的entry的name r($entry->getByKeyTest($entryKeyList[1])) && p('account') && e('0'); // 查询key为空的entry的account -$db->restoreDB(); \ No newline at end of file diff --git a/test/model/entry/getlist.php b/test/model/entry/getlist.php index c685116ec5..6c723aa878 100755 --- a/test/model/entry/getlist.php +++ b/test/model/entry/getlist.php @@ -2,7 +2,6 @@ switchDB(); su('admin'); /** @@ -21,4 +20,3 @@ $list = $entry->getListTest(); r(count($list)) && p() && e('1'); //测试获取列表的个数，目前只有一个 r($list) && p('1:name') && e('这是应用名称1'); //测试获取列表某个应用的名称信息 -$db->restoreDB(); \ No newline at end of file diff --git a/test/model/entry/getlogs.php b/test/model/entry/getlogs.php index 1452ccd82f..b95f7a2b01 100755 --- a/test/model/entry/getlogs.php +++ b/test/model/entry/getlogs.php @@ -2,7 +2,6 @@ switchDB(); su('admin'); /** @@ -24,4 +23,3 @@ $list_1 = $entry->getLogsTest($entryIDList[0]); $list_1000001 = $entry->getLogsTest($entryIDList[1]); r(count($list_1)) && p() && e('1'); //测试获取列表的个数，ID为1的日志数为1 r(count($list_1000001)) && p() && e('0'); //测试获取列表个数，ID为100001的日志数为0 -$db->restoreDB(); \ No newline at end of file diff --git a/test/model/entry/updatecalltime.php b/test/model/entry/updatecalltime.php index 06b5359c03..f49f57c1d3 100755 --- a/test/model/entry/updatecalltime.php +++ b/test/model/entry/updatecalltime.php @@ -23,4 +23,4 @@ $entry = new entryTest(); r($entry->updateCalledTimeTest($code[0], $time)) && p('name') && e('这是应用名称1'); //测试更新entry代号存在的情况 r($entry->updateCalledTimeTest($code[1], $time)) && p() && e('0'); //测试更新entry代号不存在的情况 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB();