From b1170a138e40db071d87e744ce401eafc385165e Mon Sep 17 00:00:00 2001 From: tianshujie Date: Mon, 27 Nov 2023 17:13:19 +0800 Subject: [PATCH] * Fix unit test errors. --- .../test/model/appendstattoprojects.php | 56 ++++--------------- module/program/test/model/getbasedatalist.php | 20 +++---- module/program/test/model/getkanbangroup.php | 22 ++++---- 3 files changed, 30 insertions(+), 68 deletions(-) diff --git a/module/program/test/model/appendstattoprojects.php b/module/program/test/model/appendstattoprojects.php index 9511eb2465..365d8b42f4 100755 --- a/module/program/test/model/appendstattoprojects.php +++ b/module/program/test/model/appendstattoprojects.php @@ -1,17 +1,5 @@ #!/usr/bin/env php gen(5); -su('admin'); - -zdTable('project')->gen(50); -zdTable('team')->gen(0); - -$task = zdTable('task'); -$task->project->range('1-20'); -$task->gen(100); - /** title=测试 programModel::appendStatToProjects(); @@ -19,17 +7,18 @@ timeout=0 cid=1 */ +include dirname(__FILE__, 5) . '/test/lib/init.php'; + +zdTable('project')->config('program')->gen(20); +zdTable('task')->config('task')->gen(20); +zdTable('team')->config('team')->gen(30); +zdTable('user')->gen(5); +su('admin'); global $tester; $tester->loadModel('program'); $projectID = 11; -$hour = new stdclass(); -$hour->totalConsumed = 15; -$hour->totalEstimate = 30; -$hour->totalLeft = 10; -$hour->progress = 60; -$hours[$projectID] = $hour; $projects = $tester->program->dao->select('*')->from(TABLE_PROJECT)->where('id')->eq($projectID)->fetchAll('id'); $teams = $tester->program->dao->select('t1.root,t1.account')->from(TABLE_TEAM)->alias('t1') @@ -38,31 +27,8 @@ $teams = $tester->program->dao->select('t1.root,t1.account')->from(TABLE_TEAM ->andWhere('t1.type')->eq('project') ->andWhere('t2.deleted')->eq(0) ->fetchGroup('root', 'account'); -$leftTasks = $tester->program->dao->select('t2.parent as project, count(*) as tasks')->from(TABLE_TASK)->alias('t1') - ->leftJoin(TABLE_PROJECT)->alias('t2')->on('t1.project = t2.id') - ->where('t1.project')->eq($projectID) - ->andWhere('t1.status')->notIn('cancel,closed') - ->groupBy('t2.parent') - ->fetchAll('project'); -r($tester->program->appendStatToProjects(array())) && p() && e('0'); // 不传入任何数据 -r($tester->program->appendStatToProjects($projects)) && p('11:id') && e('11'); // 只传入项目数据 - -$stats = $tester->program->appendStatToProjects($projects, 'hours'); -r(isset($stats[$projectID]->hours)) && p() && e('0'); // 只传入项目数据和hours追加字段 - -$stats = $tester->program->appendStatToProjects($projects, 'teamCount', array('hours' => $hours, 'teams' => $teams, 'leftTasks' => $leftTasks)); -r(isset($stats[$projectID]->teamCount)) && p() && e('1'); // 只传入项目数据和teamCount追加字段 - -$stats = $tester->program->appendStatToProjects($projects, 'teamMembers'); -r(isset($stats[$projectID]->teamMembers)) && p() && e('0'); // 只传入项目数据和teamMembers追加字段 - -$stats = $tester->program->appendStatToProjects($projects, 'leftTasks'); -r(isset($stats[$projectID]->leftTasks)) && p() && e('0'); // 只传入项目数据和leftTasks追加字段 - -$stats = $tester->program->appendStatToProjects($projects, 'hours,teamCount,teamMembers,leftTasks', array('hours' => $hours, 'teams' => $teams, 'leftTasks' => $leftTasks)); -$stat = $stats[$projectID]; -r(isset($stat->hours)) && p() && e('1'); //正常传入数据，检查hours字段 -r(isset($stat->teamCount)) && p() && e('1'); //正常传入数据，检查teamCount字段 -r(isset($stat->teamMembers)) && p() && e('1'); //正常传入数据，检查teamMembers字段 -r(isset($stat->leftTasks)) && p() && e('1'); //正常传入数据，检查leftTasks字段 +$stats[] = $tester->program->appendStatToProjects($projects); +$stats[] = $tester->program->appendStatToProjects($projects, $teams); +r($stats[0]) && p('11:estimate,left,consumed,teamCount,progress') && e('0,0,0,4,0.00'); // 测试不传入团队数据 +r($stats[1]) && p('11:estimate,left,consumed,teamCount,progress') && e('0,0,0,4,0.00'); // 测试传入团队数据 diff --git a/module/program/test/model/getbasedatalist.php b/module/program/test/model/getbasedatalist.php index b03509c4bd..6100c83aca 100644 --- a/module/program/test/model/getbasedatalist.php +++ b/module/program/test/model/getbasedatalist.php @@ -1,5 +1,11 @@ #!/usr/bin/env php gen(5); zdTable('project')->config('program')->gen(40); su('admin'); -/** -title=测试programTao::getBaseDataList(); -timeout=0 -cid=1 - -*/ - $tester = new programTest(); - $programList = $tester->program->getBaseDataList(array(3,13,23,33,44)); -r($programList[3]->path) && p('') && e(',3,'); -r($programList[13]->path) && p('') && e(',3,13,'); -r($programList[23]->path) && p('') && e(',3,13,23,'); -r($programList[33]->path) && p('') && e(',3,13,23,33,'); - +r($programList) && p('3:path', ';') && e(',3,,,'); r(isset($programList[44])) && p('') && e('0'); diff --git a/module/program/test/model/getkanbangroup.php b/module/program/test/model/getkanbangroup.php index aac7dd1813..9a2bec75d0 100755 --- a/module/program/test/model/getkanbangroup.php +++ b/module/program/test/model/getkanbangroup.php @@ -1,8 +1,14 @@ #!/usr/bin/env php id->range('1-3'); @@ -23,18 +29,14 @@ zdTable('projectproduct')->gen(0); zdTable('productplan')->gen(0); zdTable('release')->gen(0); zdTable('team')->gen(0); +zdTable('user')->gen(5); +su('admin'); -/** - -title=测试 programModel::getKanbanGroup(); -timeout=0 -cid=1 - -*/ +global $app; +$app->rawModule = 'program'; $programTester = new programTest(); - -$kanbanGroup = $programTester->getKanbanGroupTest(); +$kanbanGroup = $programTester->getKanbanGroupTest(); r(count($kanbanGroup['my'])) && p('') && e('2'); //查看当前用户负责的项目集看板数量 r(count($kanbanGroup['others'])) && p('') && e('1'); //查看当前用户其他的项目集看板数量