diff --git a/module/testcase/test/model/getcanimportcases.php b/module/testcase/test/model/getcanimportcases.php new file mode 100644 index 0000000000..d9cba77ad7 --- /dev/null +++ b/module/testcase/test/model/getcanimportcases.php @@ -0,0 +1,63 @@ +#!/usr/bin/env php +gen(45); +zdTable('branch')->gen(20); +zdTable('case')->config('case')->gen(50); +zdTable('module')->config('module_import')->gen(50); +zdTable('userquery')->config('userquery')->gen(1); +zdTable('user')->gen(1); + +su('admin'); + +/** + +title=测试 testsuiteModel->getCanImportCases(); +cid=1 +pid=1 + + +*/ + +$productIdList = array(1, 41); +$libIdList = array(0, 1); +$branchList = array('all', 1); +$orderByList = array('id_desc', 'id_asc'); +$browseTypeList = array('', 'bysearch'); +$queryIdList = array(0, 1); +$testsuiteQuery = array(false, "`lib` = 'all'"); + +$tester->loadModel('testcase'); + +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[1], $branchList[0], $orderByList[0])))) && p() && e('30,28,26,24,22'); // 测试获取产品 1 用例库 1 分支 all 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 1 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[1], $branchList[1], $orderByList[0])))) && p() && e('30,28,26,24,22'); // 测试获取产品 1 用例库 1 分支 1 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[1])))) && p() && e('21,23,25,27,29'); // 测试获取产品 1 用例库 0 分支 all 排序 id_asc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[1], $branchList[1], $orderByList[1])))) && p() && e('22,24,26,28,30'); // 测试获取产品 1 用例库 1 分支 1 排序 id_asc 可以导入的用例 + +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[0], $branchList[0], $orderByList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 41 用例库 0 分支 all 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[1], $branchList[0], $orderByList[0])))) && p() && e('30,28,26,24,22'); // 测试获取产品 41 用例库 1 分支 all 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[0], $branchList[1], $orderByList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 41 用例库 0 分支 1 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[1], $branchList[1], $orderByList[0])))) && p() && e('30,28,26,24,22'); // 测试获取产品 41 用例库 1 分支 1 排序 id_desc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[0], $branchList[0], $orderByList[1])))) && p() && e('21,23,25,27,29'); // 测试获取产品 41 用例库 0 分支 all 排序 id_asc 可以导入的用例 +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[1], $libIdList[1], $branchList[1], $orderByList[1])))) && p() && e('22,24,26,28,30'); // 测试获取产品 41 用例库 1 分支 1 排序 id_asc 可以导入的用例 + +$tester->session->set('testsuiteQuery', $testsuiteQuery[0]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], null, $browseTypeList[1], $queryIdList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery false 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[0]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], null, $browseTypeList[1], $queryIdList[1])))) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery false 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[1]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], null, $browseTypeList[1], $queryIdList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery "`lib` = 'all'" 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[1]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], null, $browseTypeList[1], $queryIdList[1])))) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery "`lib` = 'all'" 可以导入的用例 + +$tester->session->set('testsuiteQuery', $testsuiteQuery[0]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], null, $browseTypeList[1], $queryIdList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery false 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[0]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], null, $browseTypeList[1], $queryIdList[1])))) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery false 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[1]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], null, $browseTypeList[1], $queryIdList[0])))) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery "`lib` = 'all'" 可以导入的用例 +$tester->session->set('testsuiteQuery', $testsuiteQuery[1]); +r(implode(',', array_keys($tester->testcase->getCanImportCases($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], null, $browseTypeList[1], $queryIdList[1])))) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery "`lib` = 'all'" 可以导入的用例 diff --git a/module/testcase/test/model/getcanimportedmodules.php b/module/testcase/test/model/getcanimportedmodules.php new file mode 100644 index 0000000000..fd73db7dee --- /dev/null +++ b/module/testcase/test/model/getcanimportedmodules.php @@ -0,0 +1,80 @@ +#!/usr/bin/env php +gen(45); +zdTable('branch')->gen(20); +zdTable('case')->config('case')->gen(50); +zdTable('module')->config('module_import')->gen(50); +zdTable('userquery')->config('userquery')->gen(1); +zdTable('user')->gen(1); + +su('admin'); + +/** + +title=测试 testsuiteModel->getCanImportedModules(); +cid=1 +pid=1 + +- 测试获取产品 1 用例库 0 分支 all 返回类型 pairs 可以导入的用例 @29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; + +- 测试获取产品 1 用例库 0 分支 all 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; + +- 测试获取产品 1 用例库 1 分支 all 返回类型 pairs 可以导入的用例 @30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; + +- 测试获取产品 1 用例库 1 分支 all 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; + +- 测试获取产品 1 用例库 0 分支 1 返回类型 pairs 可以导入的用例 @29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; + +- 测试获取产品 1 用例库 0 分支 1 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21; + +- 测试获取产品 1 用例库 1 分支 1 返回类型 pairs 可以导入的用例 @30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; + +- 测试获取产品 1 用例库 1 分支 1 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21; + +- 测试获取产品 41 用例库 0 分支 all 返回类型 pairs 可以导入的用例 @29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; + +- 测试获取产品 41 用例库 0 分支 all 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; + +- 测试获取产品 41 用例库 1 分支 all 返回类型 pairs 可以导入的用例 @30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; + +- 测试获取产品 41 用例库 1 分支 all 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; + +- 测试获取产品 41 用例库 0 分支 1 返回类型 pairs 可以导入的用例 @29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; + +- 测试获取产品 41 用例库 0 分支 1 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20; + +- 测试获取产品 41 用例库 1 分支 1 返回类型 pairs 可以导入的用例 @30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; + +- 测试获取产品 41 用例库 1 分支 1 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20; + +*/ + +$productIdList = array(1, 41); +$libIdList = array(0, 1); +$branchList = array('all', 1); +$returnTypeList = array('pairs', 'items'); + +$testcase = new testcaseTest(); + +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[0], $returnTypeList[0])) && p() && e('29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 0 分支 all 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[0], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;'); // 测试获取产品 1 用例库 0 分支 all 返回类型 items 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[0], $returnTypeList[0])) && p() && e('30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 1 分支 all 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[0], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;'); // 测试获取产品 1 用例库 1 分支 all 返回类型 items 可以导入的用例 + +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[1], $returnTypeList[0])) && p() && e('29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 0 分支 1 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[1], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 1 用例库 0 分支 1 返回类型 items 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[1], $returnTypeList[0])) && p() && e('30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 1 分支 1 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[1], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 1 用例库 1 分支 1 返回类型 items 可以导入的用例 + +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[0], $returnTypeList[0])) && p() && e('29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 0 分支 all 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[0], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 0 分支 all 返回类型 items 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[0], $returnTypeList[0])) && p() && e('30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 1 分支 all 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[0], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 1 分支 all 返回类型 items 可以导入的用例 + +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[1], $returnTypeList[0])) && p() && e('29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 0 分支 1 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[1], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 0 分支 1 返回类型 items 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[1], $returnTypeList[0])) && p() && e('30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 1 分支 1 返回类型 pairs 可以导入的用例 +r($testcase->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[1], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 1 分支 1 返回类型 items 可以导入的用例 diff --git a/module/testcase/test/testcase.class.php b/module/testcase/test/testcase.class.php index bccecadbcc..d53cb86e2e 100755 --- a/module/testcase/test/testcase.class.php +++ b/module/testcase/test/testcase.class.php @@ -1828,4 +1828,26 @@ class testcaseTest return implode(',', array_column($objects, 'id')); } + + /** + * 测试获取已经导入的用例模块。 + * Test get can imported case modules. + * + * @param int $productID + * @param int $libID + * @param int|string $branch + * @param string $returnType + * @access public + * @return string|array + */ + public function getCanImportedModulesTest(int $productID, int $libID, int|string $branch, string $returnType): string|array + { + $objects = $this->objectModel->getCanImportedModules($productID, $libID, $branch, $returnType); + + if(dao::isError()) return dao::getError(); + + $return = ''; + foreach($objects as $caseID => $modules) $return .= $caseID . ':' . implode(',', array_keys($modules)) . ';'; + return $return; + } } diff --git a/module/testcase/test/yaml/case.yaml b/module/testcase/test/yaml/case.yaml new file mode 100644 index 0000000000..08424d5f19 --- /dev/null +++ b/module/testcase/test/yaml/case.yaml @@ -0,0 +1,15 @@ +title: table zt_testcase +desc: "测试用例" +author: Mengyi Liu +version: "1.0" +fields: + - field: product + range: 1{10},41{10},0{10} + - field: branch + range: 0{10},1{5},0{15} + - field: module + range: 0{5},1{5},0{5},12{5},0{5},23{5} + - field: lib + range: 0,1 + - field: fromCaseID + range: 21-25,0{25} diff --git a/module/testcase/test/yaml/module_import.yaml b/module/testcase/test/yaml/module_import.yaml new file mode 100644 index 0000000000..9e4e2094e9 --- /dev/null +++ b/module/testcase/test/yaml/module_import.yaml @@ -0,0 +1,11 @@ +title: table zt_module +desc: "模块" +author: Mengyi Liu +version: "1.0" +fields: + - field: root + range: 1{10},41{10},0{10} + - field: branch + range: 0{10},1{5},0{15} + - field: type + range: case diff --git a/module/testcase/test/yaml/userquery.yaml b/module/testcase/test/yaml/userquery.yaml new file mode 100644 index 0000000000..7f979b9cd4 --- /dev/null +++ b/module/testcase/test/yaml/userquery.yaml @@ -0,0 +1,7 @@ +title: table zt_userquery +desc: "用户查询" +author: Mengyi Liu +version: "1.0" +fields: + - field: sql + range: "(1=1 AND `product` = '1')" diff --git a/module/testsuite/test/model/deletesuitesbyid.php b/module/testsuite/test/model/deletesuitebyid.php similarity index 100% rename from module/testsuite/test/model/deletesuitesbyid.php rename to module/testsuite/test/model/deletesuitebyid.php diff --git a/module/testsuite/test/model/getcanimportcases.php b/module/testsuite/test/model/getcanimportcases.php deleted file mode 100644 index 3ef9fa1b88..0000000000 --- a/module/testsuite/test/model/getcanimportcases.php +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env php -gen(45); -zdTable('branch')->gen(20); -zdTable('case')->config('case')->gen(50); -zdTable('module')->config('module')->gen(50); -zdTable('userquery')->config('userquery')->gen(1); -zdTable('user')->gen(1); - -su('admin'); - -/** - -title=测试 testsuiteModel->getCanImportCases(); -cid=1 -pid=1 - - -*/ - -$productIdList = array(1, 41); -$libIdList = array(0, 1); -$branchList = array('all', 1); -$orderByList = array('id_desc', 'id_asc'); -$browseTypeList = array('', 'bysearch'); -$queryIdList = array(0, 1); -$testsuiteQuery = array(false, "`lib` = 'all'"); - -$testsuite = new testsuiteTest(); - -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[1], $branchList[0], $orderByList[0])) && p() && e('30,28,26,24,22'); // 测试获取产品 1 用例库 1 分支 all 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 1 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[1], $branchList[1], $orderByList[0])) && p() && e('30,28,26,24,22'); // 测试获取产品 1 用例库 1 分支 1 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[1])) && p() && e('21,23,25,27,29'); // 测试获取产品 1 用例库 0 分支 all 排序 id_asc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[1], $branchList[1], $orderByList[1])) && p() && e('22,24,26,28,30'); // 测试获取产品 1 用例库 1 分支 1 排序 id_asc 可以导入的用例 - -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[0], $branchList[0], $orderByList[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 41 用例库 0 分支 all 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[1], $branchList[0], $orderByList[0])) && p() && e('30,28,26,24,22'); // 测试获取产品 41 用例库 1 分支 all 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[0], $branchList[1], $orderByList[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 41 用例库 0 分支 1 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[1], $branchList[1], $orderByList[0])) && p() && e('30,28,26,24,22'); // 测试获取产品 41 用例库 1 分支 1 排序 id_desc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[0], $branchList[0], $orderByList[1])) && p() && e('21,23,25,27,29'); // 测试获取产品 41 用例库 0 分支 all 排序 id_asc 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[1], $libIdList[1], $branchList[1], $orderByList[1])) && p() && e('22,24,26,28,30'); // 测试获取产品 41 用例库 1 分支 1 排序 id_asc 可以导入的用例 - -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], $browseTypeList[1], $queryIdList[0], $testsuiteQuery[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery false 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], $browseTypeList[1], $queryIdList[1], $testsuiteQuery[0])) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery false 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], $browseTypeList[1], $queryIdList[0], $testsuiteQuery[1])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery "`lib` = 'all'" 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[0], $orderByList[0], $browseTypeList[1], $queryIdList[1], $testsuiteQuery[1])) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery "`lib` = 'all'" 可以导入的用例 - -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], $browseTypeList[1], $queryIdList[0], $testsuiteQuery[0])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery false 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], $browseTypeList[1], $queryIdList[1], $testsuiteQuery[0])) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery false 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], $browseTypeList[1], $queryIdList[0], $testsuiteQuery[1])) && p() && e('29,27,25,23,21'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 0 testsuiteQuery "`lib` = 'all'" 可以导入的用例 -r($testsuite->getCanImportCasesTest($productIdList[0], $libIdList[0], $branchList[1], $orderByList[0], $browseTypeList[1], $queryIdList[1], $testsuiteQuery[1])) && p() && e('0'); // 测试获取产品 1 用例库 0 分支 all 排序 id_desc browseType bysearch queryID 1 testsuiteQuery "`lib` = 'all'" 可以导入的用例 diff --git a/module/testsuite/test/model/getcanimportedmodules.php b/module/testsuite/test/model/getcanimportedmodules.php deleted file mode 100644 index e5713c13fa..0000000000 --- a/module/testsuite/test/model/getcanimportedmodules.php +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env php -gen(45); -zdTable('branch')->gen(20); -zdTable('case')->config('case')->gen(50); -zdTable('module')->config('module')->gen(50); -zdTable('userquery')->config('userquery')->gen(1); -zdTable('user')->gen(1); - -su('admin'); - -/** - -title=测试 testsuiteModel->getCanImportedModules(); -cid=1 -pid=1 - -- 测试获取产品 1 用例库 0 分支 all 返回类型 pairs 可以导入的用例 @29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; - -- 测试获取产品 1 用例库 0 分支 all 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; - -- 测试获取产品 1 用例库 1 分支 all 返回类型 pairs 可以导入的用例 @30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; - -- 测试获取产品 1 用例库 1 分支 all 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; - -- 测试获取产品 1 用例库 0 分支 1 返回类型 pairs 可以导入的用例 @29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; - -- 测试获取产品 1 用例库 0 分支 1 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21; - -- 测试获取产品 1 用例库 1 分支 1 返回类型 pairs 可以导入的用例 @30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto; - -- 测试获取产品 1 用例库 1 分支 1 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21; - -- 测试获取产品 41 用例库 0 分支 all 返回类型 pairs 可以导入的用例 @29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; - -- 测试获取产品 41 用例库 0 分支 all 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; - -- 测试获取产品 41 用例库 1 分支 all 返回类型 pairs 可以导入的用例 @30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:11,41,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; - -- 测试获取产品 41 用例库 1 分支 all 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19; - -- 测试获取产品 41 用例库 0 分支 1 返回类型 pairs 可以导入的用例 @29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; - -- 测试获取产品 41 用例库 0 分支 1 返回类型 items 可以导入的用例 @29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20; - -- 测试获取产品 41 用例库 1 分支 1 返回类型 pairs 可以导入的用例 @30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto; - -- 测试获取产品 41 用例库 1 分支 1 返回类型 items 可以导入的用例 @30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20; - -*/ - -$productIdList = array(1, 41); -$libIdList = array(0, 1); -$branchList = array('all', 1); -$returnTypeList = array('pairs', 'items'); - -$testsuite = new testsuiteTest(); - -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[0], $returnTypeList[0])) && p() && e('29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 0 分支 all 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[0], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;'); // 测试获取产品 1 用例库 0 分支 all 返回类型 items 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[0], $returnTypeList[0])) && p() && e('30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 1 分支 all 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[0], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20;'); // 测试获取产品 1 用例库 1 分支 all 返回类型 items 可以导入的用例 - -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[1], $returnTypeList[0])) && p() && e('29:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;27:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;25:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;23:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;21:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 0 分支 1 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[0], $branchList[1], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 1 用例库 0 分支 1 返回类型 items 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[1], $returnTypeList[0])) && p() && e('30:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;28:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;26:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;24:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;22:0,1,31,2,32,3,33,4,34,5,35,6,36,7,37,8,38,9,39,10,40,ditto;'); // 测试获取产品 1 用例库 1 分支 1 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[0], $libIdList[1], $branchList[1], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 1 用例库 1 分支 1 返回类型 items 可以导入的用例 - -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[0], $returnTypeList[0])) && p() && e('29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 0 分支 all 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[0], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 0 分支 all 返回类型 items 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[0], $returnTypeList[0])) && p() && e('30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 1 分支 all 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[0], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 1 分支 all 返回类型 items 可以导入的用例 - -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[1], $returnTypeList[0])) && p() && e('29:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;27:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;25:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;23:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;21:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 0 分支 1 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[0], $branchList[1], $returnTypeList[1])) && p() && e('29:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;27:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;25:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;23:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;21:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 0 分支 1 返回类型 items 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[1], $returnTypeList[0])) && p() && e('30:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;28:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;26:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;24:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;22:0,11,41,12,42,13,43,14,44,15,45,16,46,17,47,18,48,19,49,20,50,ditto;'); // 测试获取产品 41 用例库 1 分支 1 返回类型 pairs 可以导入的用例 -r($testsuite->getCanImportedModulesTest($productIdList[1], $libIdList[1], $branchList[1], $returnTypeList[1])) && p() && e('30:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;28:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;26:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;24:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;22:0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17,18,19,20,21;'); // 测试获取产品 41 用例库 1 分支 1 返回类型 items 可以导入的用例 diff --git a/module/testsuite/test/testsuite.class.php b/module/testsuite/test/testsuite.class.php index f530e2d0fe..fca6e605d8 100644 --- a/module/testsuite/test/testsuite.class.php +++ b/module/testsuite/test/testsuite.class.php @@ -280,52 +280,4 @@ class testsuiteTest { return $this->objectModel->deleteCaseBySuiteID($cases, $suiteID); } - - /** - * 测试获取可以导入的用例。 - * Test get can import cases. - * - * @param int $productID - * @param int $libID - * @param int|string $branch - * @param string $orderBy - * @param string $browseType - * @param int $queryID - * @param bool|string $testsuiteQuery - * @access public - * @return string|array - */ - public function getCanImportCasesTest(int $productID, int $libID, int|string $branch, string $orderBy = 'id_desc', string $browseType = '', int $queryID = 0, bool|string $testsuiteQuery = false): string|array - { - global $tester; - $tester->session->set('testsuiteQuery', $testsuiteQuery); - - $objects = $this->objectModel->getCanImportCases($productID, $libID, $branch, $orderBy, null, $browseType, $queryID); - - if(dao::isError()) return dao::getError(); - - return implode(',', array_keys($objects)); - } - - /** - * 测试获取已经导入的用例模块。 - * Test get can imported case modules. - * - * @param int $productID - * @param int $libID - * @param int|string $branch - * @param string $returnType - * @access public - * @return string|array - */ - public function getCanImportedModulesTest(int $productID, int $libID, int|string $branch, string $returnType): string|array - { - $objects = $this->objectModel->getCanImportedModules($productID, $libID, $branch, $returnType); - - if(dao::isError()) return dao::getError(); - - $return = ''; - foreach($objects as $caseID => $modules) $return .= $caseID . ':' . implode(',', array_keys($modules)) . ';'; - return $return; - } }