diff --git a/module/doc/test/model/updatedocfile.php b/module/doc/test/model/updatedocfile.php index d799b6fec4..093e2fb5e3 100755 --- a/module/doc/test/model/updatedocfile.php +++ b/module/doc/test/model/updatedocfile.php @@ -23,10 +23,13 @@ $docTable = zenData('doc'); $docTable->version->range('1'); $docTable->gen(5); +$now = helper::now(); $doccontentTable = zenData('doccontent'); $doccontentTable->doc->range('1-5'); $doccontentTable->version->range('1'); $doccontentTable->files->range('`1,2`,`3,4`,`5,6`,`7,8`,`9,10`'); +$doccontentTable->addedDate->range("`$now`"); +$doccontentTable->editedDate->range("`$now`"); $doccontentTable->gen(5); $docID = 1; diff --git a/module/programplan/test/tao/yaml/syncparentdata/module.yaml b/module/programplan/test/tao/yaml/syncparentdata/module.yaml index a5bbaf3d8c..e041437a24 100644 --- a/module/programplan/test/tao/yaml/syncparentdata/module.yaml +++ b/module/programplan/test/tao/yaml/syncparentdata/module.yaml @@ -5,6 +5,6 @@ fields: - field: id range: 1-100 - field: root - range: '2,5' + range: '2,5,0{10}' - field: type range: 'task{2},doc{2}' diff --git a/module/search/test/model/getlist.php b/module/search/test/model/getlist.php index fd655a3e22..5fd1935315 100755 --- a/module/search/test/model/getlist.php +++ b/module/search/test/model/getlist.php @@ -34,7 +34,7 @@ title=测试 searchModel->getList(); timeout=0 cid=1 -- 测试在全部类型中搜索带有任务字体的条数 @12 +- 测试在全部类型中搜索带有bug字体的条数 @12 - 测试在任务类型中搜索带有任务字体的条数 @10 - 测试在bug类型中搜索带有bug字体的条数 @10 - 测试在用例类型中搜索带有用例字体的条数 @10 @@ -79,7 +79,7 @@ $searchType[] = array('story'); $searchWords = array('任务','bug','用例','文档','待办','版本','用例库','产品','发布','测试单','测试套件','测试报告','计划','项目集','项目','迭代','需求'); -r($search->getListTest($searchWords[0], $searchType[0])) && p() && e('12'); //测试在全部类型中搜索带有任务字体的条数 +r($search->getListTest($searchWords[1], $searchType[0])) && p() && e('12'); //测试在全部类型中搜索带有bug字体的条数 r($search->getListTest($searchWords[0], $searchType[1])) && p() && e('10'); //测试在任务类型中搜索带有任务字体的条数 r($search->getListTest($searchWords[1], $searchType[2])) && p() && e('10'); //测试在bug类型中搜索带有bug字体的条数 r($search->getListTest($searchWords[2], $searchType[3])) && p() && e('10'); //测试在用例类型中搜索带有用例字体的条数 diff --git a/module/task/test/model/computedelay.php b/module/task/test/model/computedelay.php index 0288c9c674..bea0b47d1e 100755 --- a/module/task/test/model/computedelay.php +++ b/module/task/test/model/computedelay.php @@ -19,10 +19,11 @@ include dirname(__FILE__, 2) . '/lib/task.unittest.class.php'; zenData('user')->gen(5); su('admin'); +$today = helper::today(); $taskTable = zenData('task')->loadYaml('task'); -$taskTable->status->range('wait,doing,done,cancel,close'); -$taskTable->deadline->range('null{2},`2025-06-03`,null{2}'); -$taskTable->finishedDate->range('null{2},`2025-06-09`,null{2}'); +$taskTable->status->range('wait,doing,done,cancel,closed'); +$taskTable->deadline->range("`$today`{2},`2025-06-03`,`$today`{2}"); +$taskTable->finishedDate->range("`$today`{2},`2025-06-09`,`$today`{2}"); $taskTable->gen(5); $taskIdList = range(1, 5); diff --git a/module/task/test/model/computemultiplehours.php b/module/task/test/model/computemultiplehours.php index 35fd87807d..ad16c8f4b8 100755 --- a/module/task/test/model/computemultiplehours.php +++ b/module/task/test/model/computemultiplehours.php @@ -118,7 +118,7 @@ cid=1 - taskID 2 有传入task 传入members计算多人工时 - 属性id @2 - 属性assignedTo @user1 - - 属性status @doing + - 属性status @done - 属性estimate @3 - 属性left @3 - taskID 1 有传入task 传入members 不自动更新状态计算多人工时 @@ -145,6 +145,6 @@ r($task->computeMultipleHoursTest($oldTasks[4])) r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0])) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,5,4'); // taskID 1 有传入task计算多人工时 r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1])) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,13,0'); // taskID 2 有传入task计算多人工时 r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0])) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,3,3'); // taskID 1 有传入task 传入members计算多人工时 -r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1])) && p('id,assignedTo,status,estimate,left') && e('2,user1,doing,3,3'); // taskID 2 有传入task 传入members计算多人工时 +r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1])) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members计算多人工时 r($task->computeMultipleHoursTest($oldTasks[0], $tasks[0], $members[0], false)) && p('id,assignedTo,status,estimate,left') && e('1,admin,doing,3,3'); // taskID 1 有传入task 传入members 不自动更新状态计算多人工时 -r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1], false)) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members 不自动更新状态计算多人工时 \ No newline at end of file +r($task->computeMultipleHoursTest($oldTasks[1], $tasks[1], $members[1], false)) && p('id,assignedTo,status,estimate,left') && e('2,user1,done,3,3'); // taskID 2 有传入task 传入members 不自动更新状态计算多人工时