From c4f33ea471b6deaeed9bcd92448faca2e21e7ee3 Mon Sep 17 00:00:00 2001 From: daitingting Date: Wed, 16 Aug 2023 09:21:57 +0000 Subject: [PATCH] * Adjust getExecutionBugs test. --- module/bug/model.php | 2 +- module/bug/test/bug.class.php | 19 +++----- module/bug/test/model/getexecutionbugs.php | 51 +++++++++++++++++----- 3 files changed, 47 insertions(+), 25 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 2f162e2577..3331c052cf 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -959,7 +959,7 @@ class bugModel extends model * @access public * @return array */ - public function getExecutionBugs(int $executionID, int $productID = 0, string|int $branchID = 'all', int|array $builds = 0, string $type = '', int $param = 0, string $orderBy = 'id_desc', string $excludeBugs = '', object $pager = null): array + public function getExecutionBugs(int $executionID, int $productID = 0, string|int $branchID = 'all', string|array $builds = '0', string $type = '', int $param = 0, string $orderBy = 'id_desc', string $excludeBugs = '', object $pager = null): array { if(strpos($orderBy, 'pri_') !== false) $orderBy = str_replace('pri_', 'priOrder_', $orderBy); if(strpos($orderBy, 'severity_') !== false) $orderBy = str_replace('severity_', 'severityOrder_', $orderBy); diff --git a/module/bug/test/bug.class.php b/module/bug/test/bug.class.php index f39920ec5e..b91e7fbadd 100644 --- a/module/bug/test/bug.class.php +++ b/module/bug/test/bug.class.php @@ -635,29 +635,20 @@ class bugTest } /** + * 测试获取执行的 bug。 * Test get bugs of a execution. * * @param int $executionID * @access public * @return string */ - public function getExecutionBugsTest($executionID) + public function getExecutionBugsTest(int $executionID, int $productID = 0, string|int $branchID = 'all', int|array $builds = 0, string $type = '', int $param = 0, string $excludeBugs = ''): array { - $array = $this->objectModel->getExecutionBugs($executionID); + $bugs = $this->objectModel->getExecutionBugs($executionID, $productID, $branchID, $builds, $type, $param, $orderBy = 'id_desc', $excludeBugs); - $title = ''; - foreach($array as $bug) $title .= ',' . $bug->title; - $title = trim($title, ','); - $title = str_replace("'", '', $title); + if(dao::isError()) return dao::getError(); - if(dao::isError()) - { - return dao::getError(); - } - else - { - return $title; - } + return array_values($bugs); } /** diff --git a/module/bug/test/model/getexecutionbugs.php b/module/bug/test/model/getexecutionbugs.php index 4b68d0de32..9ea27accb8 100755 --- a/module/bug/test/model/getexecutionbugs.php +++ b/module/bug/test/model/getexecutionbugs.php @@ -1,7 +1,31 @@ #!/usr/bin/env php id->range('1-10'); + $bug->product->range('1,2,3,4'); + $bug->branch->range('0,0,1'); + $bug->project->range('1,2'); + $bug->execution->range('1,2'); + $bug->module->range('1,0'); + $bug->status->range("resolved,active,closed"); + $bug->title->prefix("BUG")->range('1-10'); + $bug->plan->range('1,0'); + $bug->assignedTo->range('admin,zhangsan'); + $bug->openedBy->range('admin,zhangsan'); + $bug->resolvedBy->range('admin'); + $bug->confirmed->range('0,1'); + $bug->resolution->range('postponed,fixed'); + $bug->openedBuild->range('trunk,2,1'); + $bug->gen(10); +} + +initData(); /** @@ -19,13 +43,20 @@ pid=1 */ -$executionIDList = array('101', '102', '103', '104', '105', '106', '1000001'); +$executionIdList = array(2, 1, 1000001); +$productIdList = array(1, 2); +$branchIdList = array('1'); +$buildIdList = array(1, 'trunk'); +$typeList = array('unresolved', 'noclosed', 'assignedtome', 'openedbyme'); +$paramList = array(1); +$excludeBugs = array(10); -$bug=new bugTest(); -r($bug->getExecutionBugsTest($executionIDList[0])) && p() && e('BUG3,BUG2,BUG1'); // 测试获取执行ID为101的bug -r($bug->getExecutionBugsTest($executionIDList[1])) && p() && e('BUG6,BUG5,BUG4'); // 测试获取执行ID为102的bug -r($bug->getExecutionBugsTest($executionIDList[2])) && p() && e('BUG9,bug8,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*":.<>。?/（）;7'); // 测试获取执行ID为103的bug -r($bug->getExecutionBugsTest($executionIDList[3])) && p() && e('BUG12,BUG11,BUG10'); // 测试获取执行ID为104的bug -r($bug->getExecutionBugsTest($executionIDList[4])) && p() && e('缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*":.<>。?/（）;15,BUG14,BUG13'); // 测试获取执行ID为105的bug -r($bug->getExecutionBugsTest($executionIDList[5])) && p() && e('BUG18,BUG17,bug16'); // 测试获取执行ID为106的bug -r($bug->getExecutionBugsTest($executionIDList[6])) && p() && e('0'); // 测试获取不存在的执行的bug \ No newline at end of file +$bug = new bugTest(); +r($bug->getExecutionBugsTest($executionIdList[0], 0, 'all')) && p('0:title;1:title;2:title;3:title;4:title') && e('BUG10;BUG8;BUG6;BUG4;BUG2'); // 测试获取项目ID为2的bug +r($bug->getExecutionBugsTest($executionIdList[0], 0, 'all', 0, 'all', 0, $excludeBugs[0])) && p('0:title;1:title;2:title;3:title') && e('BUG8;BUG6;BUG4;BUG2'); // 测试获取项目ID为2不包含id为10的bug +r($bug->getExecutionBugsTest($executionIdList[0], 0, 'all', $buildIdList[0])) && p('0:title;1:title;2:title') && e('BUG9;BUG6;BUG3'); // 测试获取项目ID为2, 影响版本为1的bug +r($bug->getExecutionBugsTest($executionIdList[0], $productIdList[1], 'all')) && p('0:title;1:title;2:title') && e('BUG10;BUG6;BUG2'); // 测试获取项目ID为2,产品ID为2的bug +r($bug->getExecutionBugsTest($executionIdList[0], $productIdList[1], $branchIdList[0])) && p('0:title') && e('BUG6'); // 测试获取项目ID为2,产品ID为2, 分支为1的bug +r($bug->getExecutionBugsTest($executionIdList[0], 0, 'all', 0, $typeList[0])) && p('0:title;1:title') && e('BUG8;BUG2'); // 测试获取项目ID为2,未解决的bug +r($bug->getExecutionBugsTest($executionIdList[0], 0, 'all', 0, $typeList[1])) && p('0:title;1:title;2:title;3:title') && e('BUG10;BUG8;BUG4;BUG2'); // 测试获取项目ID为2,未关闭的bug +r($bug->getExecutionBugsTest($executionIdList[1], 0, 'all', 0, 'all', $paramList[0])) && p('0:title;1:title;2:title;3:title;4:title') && e('BUG9;BUG7;BUG5;BUG3;BUG1'); // 测试获取项目ID为1,模块为1的bug