Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch ztflow-tianshujie-release/21.7.2#tianshujie of zentao/zentaopms (#9383)

Browse Source
This commit is contained in:
刘刚
2025-06-11 10:09:44 +08:00
committed by Gitfox
parent f33ed1c8d4 279f1963e2
commit 32c0a70e75
4 changed files with 33 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/test/lib/branch.unittest.class.php
+3 -4
View File
@@ -404,9 +404,9 @@ class branchTest
* @param string $mergedBranches
* @param object $data
* @access public
* @return array|int
* @return array
*/
public function mergeBranchTest(int $productID, string $mergedBranches, object $data): array|int
public function mergeBranchTest(int $productID, string $mergedBranches, object $data): array
{
$data->status = 'active';
$data->createdDate = helper::today();
@@ -414,8 +414,7 @@ class branchTest
if(dao::isError()) return dao::getError();
$branches = $this->objectModel->dao->select('*')->from(TABLE_BRANCH)->where('deleted')->eq(0)->andWhere('product')->eq($productID)->fetchAll();
return count($branches);
return $this->objectModel->dao->select('*')->from(TABLE_BRANCH)->where('deleted')->eq(0)->andWhere('product')->eq($productID)->fetchAll();
}
/**
module/branch/test/model/mergebranch.php
+13 -7
View File
@@ -11,12 +11,18 @@ su('admin');
/**
title=测试 branchModel->mergeBranch();
timeout=1
timeout=0
cid=1
- 测试合并分支 1 到 分支 2 @2
- 测试合并分支 2 到 新建分支 @3
- 测试合并分支 3 4 到 主干 @1
- 测试合并分支 1 到 分支 2
- 第0条的product属性 @6
- 第0条的name属性 @分支2
- 测试合并分支 2 到 新建分支
- 第0条的product属性 @6
- 第0条的name属性 @分支2
- 测试合并分支 3 4 到 主干
- 第0条的product属性 @7
- 第0条的name属性 @分支5
*/
$productID = array(6, 7);
@@ -40,6 +46,6 @@ $mergeBranch3->mergedBranchIDList = array(4, 5);
$mergeBranch3->targetBranch = 0;
$branch = new branchTest();
r($branch->mergeBranchTest($productID[0], $mergedBranches[0], $mergeBranch1)) && p() && e('2'); // 测试合并分支 1 到 分支 2
r($branch->mergeBranchTest($productID[0], $mergedBranches[1], $mergeBranch2)) && p() && e('3'); // 测试合并分支 2 到 新建分支
r($branch->mergeBranchTest($productID[1], $mergedBranches[2], $mergeBranch3)) && p() && e('1'); // 测试合并分支 3 4 到 主干
r($branch->mergeBranchTest($productID[0], $mergedBranches[0], $mergeBranch1)) && p('0:product,name') && e('6,分支2'); // 测试合并分支 1 到 分支 2
r($branch->mergeBranchTest($productID[0], $mergedBranches[1], $mergeBranch2)) && p('0:product,name') && e('6,分支2'); // 测试合并分支 2 到 新建分支
r($branch->mergeBranchTest($productID[1], $mergedBranches[2], $mergeBranch3)) && p('0:product,name') && e('7,分支5'); // 测试合并分支 3 4 到 主干
module/doc/test/lib/doc.unittest.class.php
+2 -3
View File
@@ -1095,13 +1095,12 @@ class docTest
*
* @param string $type product|project|execution
* @param int $objectID
* @param string $edition
* @access public
* @return array
*/
public function getLinkedObjectDataTest(string $type, int $objectID, string $edition = ''): array
public function getLinkedObjectDataTest(string $type, int $objectID): array
{
$this->objectModel->config->edition = $edition;
$this->objectModel->config->edition = 'biz';
$data = $this->objectModel->getLinkedObjectData($type, $objectID);
if(dao::isError()) return dao::getError();
module/doc/test/model/getlinkedobjectdata.php
+15 -53
View File
@@ -4,36 +4,18 @@
/**
title=测试 docModel->getLinkedObjectData();
timeout=0
cid=1
- 测试传入错误的type @0
- 获取开源版关联产品ID=0的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'
- 获取开源版关联产品ID=1的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'
- 获取开源版关联产品ID=2的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'
- 获取旗舰版关联产品ID=0的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'
- 获取旗舰版关联产品ID=1的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'
- 获取旗舰版关联产品ID=2的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'
- 获取IPD版关联产品ID=0的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'
- 获取IPD版关联产品ID=1的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'
- 获取IPD版关联产品ID=2的数据属性4 @SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'
- 获取开源版关联项目ID=0的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'
- 获取开源版关联项目ID=11的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'
- 获取开源版关联项目ID=60的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'
- 获取旗舰版关联项目ID=0的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'
- 获取旗舰版关联项目ID=11的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'
- 获取旗舰版关联项目ID=60的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'
- 获取IPD版关联项目ID=0的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'
- 获取IPD版关联项目ID=11的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'
- 获取IPD版关联项目ID=60的数据属性11 @SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'
- 获取开源版关联项目ID=0的数据属性11 @0
- 获取开源版关联项目ID=11的数据属性11 @0
- 获取开源版关联项目ID=60的数据属性11 @0
- 获取开源版关联执行ID=0的数据 @0
- 获取开源版关联执行ID=101的数据属性13 @1,11
- 获取开源版关联执行ID=106的数据属性13 @6,16
- 获取旗舰版关联执行ID=0的数据 @0
- 获取旗舰版关联执行ID=101的数据属性13 @1,11
- 获取旗舰版关联执行ID=106的数据属性13 @6,16
- 获取IPD版关联执行ID=0的数据 @0
- 获取IPD版关联执行ID=101的数据属性13 @1,11
- 获取IPD版关联执行ID=106的数据属性13 @6,16
- 获取开源版关联执行ID=101的数据属性13 @0
- 获取开源版关联执行ID=106的数据属性13 @0
*/
@@ -92,35 +74,15 @@ su('admin');
$types = array('all', 'product', 'project', 'execution');
$products = array(0 ,1, 2);
$projects = array(0, 11, 60);
$editions = array('open', 'max', 'ipd');
$executions = array(0, 101, 106);
$docTester = new docTest();
r($docTester->getLinkedObjectDataTest($types[0], $products[0], $editions[0])) && p() && e('0'); // 测试传入错误的type
r($docTester->getLinkedObjectDataTest($types[1], $products[0], $editions[0])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'"); // 获取开源版关联产品ID=0的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[1], $editions[0])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'"); // 获取开源版关联产品ID=1的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[2], $editions[0])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'"); // 获取开源版关联产品ID=2的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[0], $editions[1])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'"); // 获取旗舰版关联产品ID=0的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[1], $editions[1])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'"); // 获取旗舰版关联产品ID=1的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[2], $editions[1])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'"); // 获取旗舰版关联产品ID=2的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[0], $editions[2])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '0' AND `deleted` = '0'"); // 获取IPD版关联产品ID=0的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[1], $editions[2])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'"); // 获取IPD版关联产品ID=1的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[2], $editions[2])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'"); // 获取IPD版关联产品ID=2的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[0], $editions[0])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'"); // 获取开源版关联项目ID=0的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[1], $editions[0])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'"); // 获取开源版关联项目ID=11的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[2], $editions[0])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'"); // 获取开源版关联项目ID=60的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[0], $editions[1])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'"); // 获取旗舰版关联项目ID=0的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[1], $editions[1])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'"); // 获取旗舰版关联项目ID=11的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[2], $editions[1])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'"); // 获取旗舰版关联项目ID=60的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[0], $editions[2])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '0' AND `deleted` = '0'"); // 获取IPD版关联项目ID=0的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[1], $editions[2])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '11' AND `deleted` = '0'"); // 获取IPD版关联项目ID=11的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[2], $editions[2])) && p('11') && e("SELECT id FROM `zt_design` WHERE `project` = '60' AND `deleted` = '0'"); // 获取IPD版关联项目ID=60的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[0], $editions[0])) && p('0') && e("0"); // 获取开源版关联执行ID=0的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[1], $editions[0])) && p('13', ';') && e('1,11'); // 获取开源版关联执行ID=101的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[2], $editions[0])) && p('13', ';') && e('6,16'); // 获取开源版关联执行ID=106的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[0], $editions[1])) && p('0') && e("0"); // 获取旗舰版关联执行ID=0的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[1], $editions[1])) && p('13', ';') && e('1,11'); // 获取旗舰版关联执行ID=101的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[2], $editions[1])) && p('13', ';') && e('6,16'); // 获取旗舰版关联执行ID=106的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[0], $editions[2])) && p('0') && e("0"); // 获取IPD版关联执行ID=0的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[1], $editions[2])) && p('13', ';') && e('1,11'); // 获取IPD版关联执行ID=101的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[2], $editions[2])) && p('13', ';') && e('6,16'); // 获取IPD版关联执行ID=106的数据
r($docTester->getLinkedObjectDataTest($types[0], $products[0])) && p() && e('0'); // 测试传入错误的type
r($docTester->getLinkedObjectDataTest($types[1], $products[1])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '1' AND `deleted` = '0'"); // 获取开源版关联产品ID=1的数据
r($docTester->getLinkedObjectDataTest($types[1], $products[2])) && p('4') && e("SELECT id FROM `zt_story` WHERE `product` = '2' AND `deleted` = '0'"); // 获取开源版关联产品ID=2的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[0])) && p('11') && e('0'); // 获取开源版关联项目ID=0的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[1])) && p('11') && e('0'); // 获取开源版关联项目ID=11的数据
r($docTester->getLinkedObjectDataTest($types[2], $projects[2])) && p('11') && e('0'); // 获取开源版关联项目ID=60的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[0])) && p('0') && e("0"); // 获取开源版关联执行ID=0的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[1])) && p('13', ';') && e('0'); // 获取开源版关联执行ID=101的数据
r($docTester->getLinkedObjectDataTest($types[3], $executions[2])) && p('13', ';') && e('0'); // 获取开源版关联执行ID=106的数据