diff --git a/module/testtask/model.php b/module/testtask/model.php index 052fe72036..76c13112a9 100644 --- a/module/testtask/model.php +++ b/module/testtask/model.php @@ -355,7 +355,6 @@ class testtaskModel extends model */ public function getAllLinkableCases($task, $query, $linkedCases, $pager) { - a($query); return $this->dao->select('*')->from(TABLE_CASE)->where($query) ->andWhere('id')->notIN($linkedCases) ->andWhere('status')->ne('wait') diff --git a/test/model/testtask/getalllinkablecases.php b/test/model/testtask/getalllinkablecases.php index d5cb3d7524..d497fe4d0f 100644 --- a/test/model/testtask/getalllinkablecases.php +++ b/test/model/testtask/getalllinkablecases.php @@ -15,9 +15,9 @@ global $tester; $tester->loadModel('testtask'); $tester->app->loadClass('pager', $static = true); -$task1 = $tester->testtask->getById(1); -$task2 = $tester->testtask->getById(2); -$pager = new pager(0, 10, 1); +$task1 = $tester->testtask->getById(1); +$task2 = $tester->testtask->getById(2); +$pager = new pager(0, 10, 1); $cases1 = $tester->testtask->getAllLinkableCases($task1, '1 = 1', '', $pager); $cases2 = $tester->testtask->getAllLinkableCases($task2, '1 = 1', '', null); diff --git a/test/model/testtask/getbuginfo.php b/test/model/testtask/getbuginfo.php index 403a68f025..59e2335d35 100644 --- a/test/model/testtask/getbuginfo.php +++ b/test/model/testtask/getbuginfo.php @@ -12,6 +12,16 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); -r($testtask->getBugInfoTest()) && p() && e(); \ No newline at end of file +$task1 = $tester->testtask->getBugInfo(1, 1); +$task2 = $tester->testtask->getBugInfo(2, 2); + +r(count($task1)) && p() && e('8'); // 查看根据测试单的ID获取到的数据数量 +r($task1['bugSeverityGroups']) && p('1:name,value') && e('1,1'); // 查看根据测试单的ID获取到的数据数量 +r($task1['bugStatusGroups']) && p('active:name,value') && e('激活,1'); // 查看根据测试单的ID获取到的数据数量 + +r(count($task2)) && p() && e('8'); // 查看根据测试单的ID获取到的数据数量 +r($task2['bugSeverityGroups']) && p('2:name,value') && e('2,1'); // 查看根据测试单的ID获取到的数据数量 +r($task2['bugOpenedByGroups']) && p('admin:name,value') && e('admin,1'); // 查看根据测试单的ID获取到的数据数量 diff --git a/test/model/testtask/getdataoftesttaskpermodule.php b/test/model/testtask/getdataoftesttaskpermodule.php index 3d1d01437e..0afd473dc8 100644 --- a/test/model/testtask/getdataoftesttaskpermodule.php +++ b/test/model/testtask/getdataoftesttaskpermodule.php @@ -12,6 +12,13 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); -r($testtask->getDataOfTestTaskPerModuleTest()) && p() && e(); \ No newline at end of file +$result0 = $tester->testtask->getDataOfTestTaskPerModule(0); +$result1 = $tester->testtask->getDataOfTestTaskPerModule(1); +$result2 = $tester->testtask->getDataOfTestTaskPerModule(2); + +r($result0) && p() && e('0'); // 获取测试单0的模块分组 +r($result1[0]) && p('name,value') && e('/,4'); // 获取测试单1模块分组,查看各个模块的数量 +r($result2[0]) && p('name,value') && e('/,4'); // 获取测试单2模块分组,查看各个模块的数量 diff --git a/test/model/testtask/getdataoftesttaskperrunner.php b/test/model/testtask/getdataoftesttaskperrunner.php index f44ebce186..afb2a9484c 100644 --- a/test/model/testtask/getdataoftesttaskperrunner.php +++ b/test/model/testtask/getdataoftesttaskperrunner.php @@ -12,6 +12,13 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); -r($testtask->getDataOfTestTaskPerRunnerTest()) && p() && e(); \ No newline at end of file +$result0 = $tester->testtask->getDataOfTestTaskPerRunner(0); +$result1 = $tester->testtask->getDataOfTestTaskPerRunner(1); +$result2 = $tester->testtask->getDataOfTestTaskPerRunner(2); + +r($result0) && p() && e('0'); // 获取测试单0的执行人分组 +r(current($result1)) && p('name,value') && e('未执行,4'); // 获取测试单1执行人分组,查看各个执行人的执行数量 +r(current($result2)) && p('name,value') && e('未执行,4'); // 获取测试单2执行人分组,查看各个执行人的执行数量 diff --git a/test/model/testtask/getdataoftesttaskperrunresult.php b/test/model/testtask/getdataoftesttaskperrunresult.php index fdc315b5cd..f950c7a5a2 100644 --- a/test/model/testtask/getdataoftesttaskperrunresult.php +++ b/test/model/testtask/getdataoftesttaskperrunresult.php @@ -1,7 +1,6 @@ #!/usr/bin/env php loadModel('testtask'); -r($testtask->getDataOfTestTaskPerRunResultTest()) && p() && e(); \ No newline at end of file +$result0 = $tester->testtask->getDataOfTestTaskPerRunResult(0); +$result1 = $tester->testtask->getDataOfTestTaskPerRunResult(1); +$result2 = $tester->testtask->getDataOfTestTaskPerRunResult(2); + +r($result0) && p() && e('0'); // 获取测试单0的执行结果 +r($result1) && p('pass:value') && e('2'); // 获取测试单1的成功执行结果 +r($result1) && p('fail:value') && e('2'); // 获取测试单1的失败执行结果 +r($result2) && p('pass:value') && e('2'); // 获取测试单2的成功执行结果 +r($result2) && p('fail:value') && e('2'); // 获取测试单2的失败执行结果 diff --git a/test/model/testtask/getdataoftesttaskpertype.php b/test/model/testtask/getdataoftesttaskpertype.php index bea6f554d2..d2f5e37216 100644 --- a/test/model/testtask/getdataoftesttaskpertype.php +++ b/test/model/testtask/getdataoftesttaskpertype.php @@ -12,6 +12,19 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); -r($testtask->getDataOfTestTaskPerTypeTest()) && p() && e(); \ No newline at end of file +$result0 = $tester->testtask->getDataOfTestTaskPerType(0); +$result1 = $tester->testtask->getDataOfTestTaskPerType(1); +$result2 = $tester->testtask->getDataOfTestTaskPerType(2); + +r($result0) && p() && e('0'); // 获取测试单0的类型分组 +r($result1) && p('config:value') && e('1'); // 获取测试单1的config类型数量 +r($result1) && p('feature:value') && e('1'); // 获取测试单1的feature类型数量 +r($result1) && p('install:value') && e('1'); // 获取测试单1的install类型数量 +r($result1) && p('performance:value') && e('1'); // 获取测试单1的performance类型数量 +r($result2) && p('other:value') && e('1'); // 获取测试单2的other类型数量 +r($result2) && p('security:value') && e('1'); // 获取测试单2的security类型数量 +r($result2) && p('feature:value') && e('1'); // 获取测试单2的feature类型数量 +r($result2) && p('interface:value') && e('1'); // 获取测试单2的interface类型数量 diff --git a/test/model/testtask/getlinkablecasesbybug.php b/test/model/testtask/getlinkablecasesbybug.php index 72888d689d..621150268a 100644 --- a/test/model/testtask/getlinkablecasesbybug.php +++ b/test/model/testtask/getlinkablecasesbybug.php @@ -12,6 +12,16 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); +$tester->app->loadClass('pager', $static = true); -r($testtask->getLinkableCasesByBugTest()) && p() && e(); \ No newline at end of file +$task1 = $tester->testtask->getById(1); +$task2 = $tester->testtask->getById(2); +$pager = new pager(0, 10, 1); + +$cases1 = $tester->testtask->getLinkableCasesByBug(1, $task1, '1 = 1', '', $pager); +$cases2 = $tester->testtask->getLinkableCasesByBug(2, $task2, '1 = 1', '', $pager); + +r(count($cases1)) && p() && e('0'); // 通过测试单1关联的版本下的Bug,获取可关联到测试单1的用例数量 +r(count($cases2)) && p() && e('0'); // 通过测试单2关联的版本下的Bug,获取可关联到测试单2的用例数量 diff --git a/test/model/testtask/getlinkablecasesbystory.php b/test/model/testtask/getlinkablecasesbystory.php index 98573bf718..6ff58fcffb 100644 --- a/test/model/testtask/getlinkablecasesbystory.php +++ b/test/model/testtask/getlinkablecasesbystory.php @@ -1,7 +1,6 @@ #!/usr/bin/env php loadModel('testtask'); +$tester->app->loadClass('pager', $static = true); -r($testtask->getLinkableCasesByStoryTest()) && p() && e(); \ No newline at end of file +$task1 = $tester->testtask->getById(1); +$task2 = $tester->testtask->getById(2); +$pager = new pager(0, 10, 1); + +$cases1 = $tester->testtask->getLinkableCasesByStory(1, $task1, '1 = 1', '', $pager); +$cases2 = $tester->testtask->getLinkableCasesByStory(2, $task2, '1 = 1', '', $pager); + +r(count($cases1)) && p() && e('0'); // 通过测试单1关联的版本下的需求,获取可关联到测试单1的用例数量 +r(count($cases2)) && p() && e('0'); // 通过测试单2关联的版本下的需求,获取可关联到测试单2的用例数量 diff --git a/test/model/testtask/getlinkablecasesbysuite.php b/test/model/testtask/getlinkablecasesbysuite.php index 372ac2d004..7090ae1767 100644 --- a/test/model/testtask/getlinkablecasesbysuite.php +++ b/test/model/testtask/getlinkablecasesbysuite.php @@ -12,6 +12,18 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); +$tester->app->loadClass('pager', $static = true); -r($testtask->getLinkableCasesBySuiteTest()) && p() && e(); \ No newline at end of file +$task1 = $tester->testtask->getById(1); +$task2 = $tester->testtask->getById(2); +$pager = new pager(0, 10, 1); + +$cases1 = $tester->testtask->getLinkableCasesBySuite(1, $task1, '1 = 1', 1, '', $pager); +$cases2 = $tester->testtask->getLinkableCasesBySuite(2, $task2, '1 = 1', 3, '', $pager); + +r(count($cases1)) && p() && e('1'); // 根据测试套件1获取测试单1可关联的用例数量 +r(count($cases2)) && p() && e('1'); // 根据测试套件2获取测试单2可关联的用例数量 +r($cases1) && p('0:id,title,status,type') && e('2,这个是测试用例2,normal,performance'); // 根据测试套件1获取测试单1可关联的用例详情 +r($cases2) && p('0:id,title,status,type') && e('6,这个是测试用例6,normal,interface'); // 根据测试套件2获取测试单2可关联的用例详情 diff --git a/test/model/testtask/getlinkablecasesbytesttask.php b/test/model/testtask/getlinkablecasesbytesttask.php index 5e38841f50..00b35fb497 100644 --- a/test/model/testtask/getlinkablecasesbytesttask.php +++ b/test/model/testtask/getlinkablecasesbytesttask.php @@ -12,6 +12,21 @@ pid=1 */ -$testtask = new testtaskTest(); +global $tester; +$tester->loadModel('testtask'); +$tester->app->loadClass('pager', $static = true); -r($testtask->getLinkableCasesByTestTaskTest()) && p() && e(); \ No newline at end of file +$task1 = $tester->testtask->getById(1); +$task2 = $tester->testtask->getById(2); +$pager = new pager(0, 10, 1); + +$cases1 = $tester->testtask->getLinkableCasesByTestTask(1, array(2), '1 = 1', $pager); +$cases2 = $tester->testtask->getLinkableCasesByTestTask(2, '', '1 = 1', $pager); +$cases3 = $tester->testtask->getLinkableCasesByTestTask(3, '', '1 = 1', $pager); + +r(count($cases1)) && p() && e('2'); // 直接获取测试单1可关联的用例数量,排除掉ID为2的用例,查看数量 +r(count($cases2)) && p() && e('3'); // 直接获取测试单2可关联的用例数量,查看数量 +r(count($cases3)) && p() && e('3'); // 直接获取测试单3可关联的用例数量,查看数量 +r($cases1) && p('0:id,title,type,stage') && e('3,这个是测试用例3,config,intergrate'); // 直接获取测试单1可关联的用例数量,排除掉ID为2的用例,查看获取到的第一个用例的详情 +r($cases2) && p('0:id,title,type,stage') && e('6,这个是测试用例6,interface,bvt'); // 直接获取测试单2可关联的用例数量,查看获取到的第一个用例的详情 +r($cases3) && p('0:id,title,type,stage') && e('10,这个是测试用例10,config,system'); // 直接获取测试单3可关联的用例数量,查看获取到的第一个用例的详情 diff --git a/test/model/testtask/getrelatedtesttasks.php b/test/model/testtask/getrelatedtesttasks.php index c7eb77d9fe..171a23b1f4 100644 --- a/test/model/testtask/getrelatedtesttasks.php +++ b/test/model/testtask/getrelatedtesttasks.php @@ -1,7 +1,6 @@ #!/usr/bin/env php loadModel('testtask'); -r($testtask->getRelatedTestTasksTest()) && p() && e(); \ No newline at end of file +$tasks1 = $tester->testtask->getRelatedTestTasks(1, 1); +$tasks2 = $tester->testtask->getRelatedTestTasks(1, 0); +$tasks3 = $tester->testtask->getRelatedTestTasks(2, 0); + +r(count($tasks1)) && p() && e('0'); //查看产品1下相关的测试单,排除掉测试单1,查看数量 +r(count($tasks2)) && p() && e('1'); //查看产品1下相关的测试单,不排除任何测试单,查看数量 +r(count($tasks3)) && p() && e('1'); //查看产品2下相关的测试单,不排除任何测试单,查看数量 +r($tasks2) && p('1') && e('测试单1'); //查看产品2下相关的测试单,不排除任何测试单,查看数量 +r($tasks3) && p('2') && e('测试单2'); //查看产品2下相关的测试单,不排除任何测试单,查看数量