From 36e8ec1ceb63981ae590046c3eea89c3cbbece1e Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 01:01:59 +0000 Subject: [PATCH 1/8] * [task#144776,doing,0.1h,5h] Optimize action transformactions unit test script. --- module/action/test/model/transformactions.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/module/action/test/model/transformactions.php b/module/action/test/model/transformactions.php index 5d5ada0740..79ea02bfaf 100755 --- a/module/action/test/model/transformactions.php +++ b/module/action/test/model/transformactions.php @@ -6,7 +6,7 @@ su('admin'); zenData('action')->loadYaml('action')->gen(25); zenData('product')->gen(1); -zenData('story')->gen(1); +zenData('storyspec')->gen(1); zenData('productplan')->gen(1); zenData('release')->gen(1); zenData('project')->gen(1); @@ -27,6 +27,10 @@ zenData('testsuite')->loadYaml('testsuite')->gen(1); zenData('testreport')->gen(1); zenData('product')->gen(1); +$story = zenData('story'); +$story->version->range('1'); +$story->gen(1); + /** title=测试转换动态71 72 73 74 75 >> 分支1;这是一个模块1;这是测试套件名称1;这是测试套件名称1;2023-09-19EXECUTION From 257d3ec52e3d1ba444cc557cb3fed361f35f4790 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 01:30:40 +0000 Subject: [PATCH 2/8] * [task#144776,doing,0.1h,6h] Optimize execution buildsearchform unit test script. --- module/execution/test/model/buildsearchform.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/module/execution/test/model/buildsearchform.php b/module/execution/test/model/buildsearchform.php index 26392ead8f..1893bbfef7 100755 --- a/module/execution/test/model/buildsearchform.php +++ b/module/execution/test/model/buildsearchform.php @@ -33,13 +33,19 @@ title=测试executionModel->buildSearchForm(); cid=1 pid=1 -正确的queryID >> 1 -错误的queryID >> 0 +- 错误的queryID @0 +- 正确的queryID @1 +- 正确的queryID @2 +- 正确的queryID @3 +- 正确的queryID @4 */ -$queryIDList = array('0', '1'); +$queryIDList = array('0', '1', '2', '3', '4'); $execution = new executionTest(); r($execution->buildSearchFormTest($queryIDList[1])) && p() && e('1'); // 正确的queryID r($execution->buildSearchFormTest($queryIDList[0])) && p() && e('0'); // 错误的queryID +r($execution->buildSearchFormTest($queryIDList[2])) && p() && e('0'); // 错误的queryID +r($execution->buildSearchFormTest($queryIDList[3])) && p() && e('0'); // 错误的queryID +r($execution->buildSearchFormTest($queryIDList[4])) && p() && e('0'); // 错误的queryID From 6a4d1bedae043330706e1c219efaa48cbc6945ed Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 01:38:04 +0000 Subject: [PATCH 3/8] * [task#144776,doing,0.1h,5h] Optimize execution updateuserview unit test script. --- module/execution/test/model/updateuserview.php | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/module/execution/test/model/updateuserview.php b/module/execution/test/model/updateuserview.php index 4699ed9215..12973c4021 100755 --- a/module/execution/test/model/updateuserview.php +++ b/module/execution/test/model/updateuserview.php @@ -28,7 +28,21 @@ title=测试executionModel->updateUserView(); timeout=0 cid=1 +- 默认情况下的用户是否有执行的可视权限 @`,5,4,` + +- 默认情况下的用户是否有执行的可视权限 @`,5,4,` + +- 默认情况下的用户是否有执行的可视权限 @`,5,4,` + +- 默认情况下的用户是否有执行的可视权限 @`,5,4,` + +- 默认情况下的用户是否有执行的可视权限 @`,5,4,` + */ $execution = new executionTest(); -r($execution->updateUserViewTest(5)) && p() && e('~f:5~'); // 默认情况下的用户是否有执行的可视权限 +r($execution->updateUserViewTest(5)) && p() && e('`,5,4,`'); // 默认情况下的用户是否有执行的可视权限 +r($execution->updateUserViewTest(4)) && p() && e('`,5,4,`'); // 默认情况下的用户是否有执行的可视权限 +r($execution->updateUserViewTest(3)) && p() && e('`,5,4,`'); // 默认情况下的用户是否有执行的可视权限 +r($execution->updateUserViewTest(2)) && p() && e('`,5,4,`'); // 默认情况下的用户是否有执行的可视权限 +r($execution->updateUserViewTest(1)) && p() && e('`,5,4,`'); // 默认情况下的用户是否有执行的可视权限 From 8ae0f5cc9ca6b239aa9062f1a677ca77ba252aae Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 02:17:04 +0000 Subject: [PATCH 4/8] * Filter isTpl during upgrade and install. --- lib/base/dao/dao.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/base/dao/dao.class.php b/lib/base/dao/dao.class.php index 1e1d7f7f94..f112c3645e 100644 --- a/lib/base/dao/dao.class.php +++ b/lib/base/dao/dao.class.php @@ -882,7 +882,7 @@ class baseDAO $sql .= '(`' . implode('`,`', array_keys($values)) . '`)' . ' VALUES(' . implode(',', $values) . ')'; } - elseif($this->method == 'select' && dao::$filterTpl == 'always' && $filterTpl) + elseif($this->method == 'select' && dao::$filterTpl == 'always' && $filterTpl && empty($this->app->installing) && empty($this->app->upgrading)) { /* 过滤模板类型的数据 */ foreach(array('project', 'task') as $table) From 9ca63f00c742a088019a5c156409ef8891e14976 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 02:51:04 +0000 Subject: [PATCH 5/8] * [task#144776,doing,0.1h,5h] Optimize group copypriv unit test script. --- module/group/model.php | 2 +- module/group/test/model/copypriv.php | 15 +++++++++------ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/module/group/model.php b/module/group/model.php index 3b4b7eaff8..62cedb9465 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -102,7 +102,7 @@ class groupModel extends model */ public function copyPriv(int $fromGroupID, int $toGroupID) { - $privs = $this->dao->findByGroup($fromGroupID)->from(TABLE_GROUPPRIV)->fetchAll(); + $privs = $this->dao->select('*')->from(TABLE_GROUPPRIV)->where('`group`')->eq($fromGroupID)->fetchAll(); foreach($privs as $key => $priv) { $privs[$key]->group = $toGroupID; diff --git a/module/group/test/model/copypriv.php b/module/group/test/model/copypriv.php index 849b5333e1..ca9cda15af 100755 --- a/module/group/test/model/copypriv.php +++ b/module/group/test/model/copypriv.php @@ -7,8 +7,11 @@ title=测试 groupModel->copyPriv(); timeout=0 cid=1 +- 复制分组1权限到分组1 @1 +- 复制分组1权限到分组2 @1 - 复制分组2权限到分组3 @1 -- 复制分组0权限到分组3 @1 +- 复制分组3权限到分组3 @1 +- 复制分组3权限到分组3 @1 */ @@ -20,9 +23,9 @@ su('admin'); zenData('group')->gen(5); zenData('grouppriv')->loadYaml('grouppriv')->gen(10); -$fromGroup = 2; -$toGroup = 3; - $group = new groupTest(); -r($group->copyPrivTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组2权限到分组3 -r($group->copyPrivTest(0, $toGroup)) && p() && e('1'); // 复制分组0权限到分组3 \ No newline at end of file +r($group->copyPrivTest(1, 1)) && p() && e('1'); // 复制分组1权限到分组1 +r($group->copyPrivTest(1, 2)) && p() && e('1'); // 复制分组1权限到分组2 +r($group->copyPrivTest(2, 3)) && p() && e('1'); // 复制分组2权限到分组3 +r($group->copyPrivTest(3, 3)) && p() && e('1'); // 复制分组3权限到分组3 +r($group->copyPrivTest(3, 3)) && p() && e('1'); // 复制分组3权限到分组3 From 7c3ef33124652de68c270afab354307a4c86d5d1 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 02:56:47 +0000 Subject: [PATCH 6/8] * [task#144776,doing,0.1h,5h] Optimize group copyuser unit test script. --- module/group/model.php | 2 +- module/group/test/model/copypriv.php | 4 ++-- module/group/test/model/copyuser.php | 15 +++++++++------ 3 files changed, 12 insertions(+), 9 deletions(-) diff --git a/module/group/model.php b/module/group/model.php index 62cedb9465..94df96a923 100644 --- a/module/group/model.php +++ b/module/group/model.php @@ -121,7 +121,7 @@ class groupModel extends model */ public function copyUser($fromGroupID, $toGroupID) { - $users = $this->dao->findByGroup($fromGroupID)->from(TABLE_USERGROUP)->fetchAll(); + $users = $this->dao->select('*')->from(TABLE_USERGROUP)->where('`group`')->eq($fromGroupID)->fetchAll(); foreach($users as $user) { $user->group = $toGroupID; diff --git a/module/group/test/model/copypriv.php b/module/group/test/model/copypriv.php index ca9cda15af..f6a30c6cbc 100755 --- a/module/group/test/model/copypriv.php +++ b/module/group/test/model/copypriv.php @@ -11,7 +11,7 @@ cid=1 - 复制分组1权限到分组2 @1 - 复制分组2权限到分组3 @1 - 复制分组3权限到分组3 @1 -- 复制分组3权限到分组3 @1 +- 复制分组0权限到分组3 @1 */ @@ -28,4 +28,4 @@ r($group->copyPrivTest(1, 1)) && p() && e('1'); // 复制分组1权限到分组1 r($group->copyPrivTest(1, 2)) && p() && e('1'); // 复制分组1权限到分组2 r($group->copyPrivTest(2, 3)) && p() && e('1'); // 复制分组2权限到分组3 r($group->copyPrivTest(3, 3)) && p() && e('1'); // 复制分组3权限到分组3 -r($group->copyPrivTest(3, 3)) && p() && e('1'); // 复制分组3权限到分组3 +r($group->copyPrivTest(0, 3)) && p() && e('1'); // 复制分组0权限到分组3 diff --git a/module/group/test/model/copyuser.php b/module/group/test/model/copyuser.php index 9e2b0f4d40..b93630d246 100755 --- a/module/group/test/model/copyuser.php +++ b/module/group/test/model/copyuser.php @@ -7,8 +7,11 @@ title=测试 groupModel->copyUser(); timeout=0 cid=1 +- 复制分组1用户到分组2 @1 - 复制分组2用户到分组3 @1 -- 复制分组0用户到分组3 @1 +- 复制分组3用户到分组4 @1 +- 复制分组4用户到分组5 @1 +- 复制分组0用户到分组5 @1 */ @@ -21,10 +24,10 @@ zenData('user')->gen(100); zenData('group')->gen(5); zenData('usergroup')->loadYaml('usergroup')->gen(10); -$fromGroup = 2; -$toGroup = 3; - $group = new groupTest(); -r($group->copyUserTest($fromGroup, $toGroup)) && p() && e('1'); // 复制分组2用户到分组3 -r($group->copyUserTest(0, $toGroup)) && p() && e('1'); // 复制分组0用户到分组3 \ No newline at end of file +r($group->copyUserTest(1, 2)) && p() && e('1'); // 复制分组1用户到分组2 +r($group->copyUserTest(2, 3)) && p() && e('1'); // 复制分组2用户到分组3 +r($group->copyUserTest(3, 4)) && p() && e('1'); // 复制分组3用户到分组4 +r($group->copyUserTest(4, 5)) && p() && e('1'); // 复制分组4用户到分组5 +r($group->copyUserTest(0, 5)) && p() && e('1'); // 复制分组0用户到分组5 From d2d27fc05cfc087f814104ecf3372c1ae38e8ee2 Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 03:08:12 +0000 Subject: [PATCH 7/8] * [task#144776,doing,0.1h,5h] Optimize group getpairs unit test script. --- module/group/test/model/getpairs.php | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/module/group/test/model/getpairs.php b/module/group/test/model/getpairs.php index f8c911a224..71ba44b9e4 100755 --- a/module/group/test/model/getpairs.php +++ b/module/group/test/model/getpairs.php @@ -8,7 +8,10 @@ timeout=0 cid=1 - 获取权限分组属性1 @这是一个新的用户分组1 +- 获取权限分组属性3 @这是一个新的用户分组3 +- 获取project=2的权限分组属性7 @这是一个新的用户分组7 - 获取project=1的权限分组属性6 @这是一个新的用户分组6 +- 获取project=1的权限分组属性10 @这是一个新的用户分组10 */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -18,7 +21,14 @@ su('admin'); zenData('group')->loadYaml('group')->gen(10); -$group = new groupTest(); +global $app; +$app->user->feedback = 1; -r($group->getPairsTest()) && p('1') && e('这是一个新的用户分组1'); // 获取权限分组 -r($group->getPairsTest(1)) && p('6') && e('这是一个新的用户分组6'); // 获取project=1的权限分组 \ No newline at end of file +$group = new groupTest(); +r($group->getPairsTest()) && p('1') && e('这是一个新的用户分组1'); // 获取权限分组 +r($group->getPairsTest()) && p('3') && e('这是一个新的用户分组3'); // 获取权限分组 +r($group->getPairsTest(2)) && p('7') && e('这是一个新的用户分组7'); // 获取project=2的权限分组 + +$app->user->feedback = 0; +r($group->getPairsTest(1)) && p('6') && e('这是一个新的用户分组6'); // 获取project=1的权限分组 +r($group->getPairsTest(5)) && p('10') && e('这是一个新的用户分组10'); // 获取project=1的权限分组 From 8c1f328d13af9d2c84f0bd71736339062378700b Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 5 Jun 2025 03:21:27 +0000 Subject: [PATCH 8/8] * [task#144776,doing,0.1h,5h] Optimize group updateprivbygroup unit test script. --- module/group/test/model/updateprivbygroup.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/module/group/test/model/updateprivbygroup.php b/module/group/test/model/updateprivbygroup.php index 272041e362..71bde4d540 100755 --- a/module/group/test/model/updateprivbygroup.php +++ b/module/group/test/model/updateprivbygroup.php @@ -11,6 +11,7 @@ cid=1 - 更新my的权限，检查其他nav的权限是否有影响属性module1 @method1 - 更新所有nav的权限，检查权限是否已更新属性my @index|work - 更新所有nav的权限，检查其他nav的权限是否已删除属性module1 @~~ +- 更新所有nav的权限，检查其他nav的权限是否已删除属性module1 @~~ */ include dirname(__FILE__, 5) . '/test/lib/init.php'; @@ -26,10 +27,15 @@ su('admin'); zenData('group')->loadYaml('group')->gen(5); zenData('grouppriv')->loadYaml('grouppriv')->gen(10); +global $app; +$app->rawModule = 'group'; +$app->rawMethod = 'updatePrivByGroup'; + $group = new groupTest(); $actions = array('my' => array('index', 'work')); r($group->updatePrivByGroupTest(1, 'my', '', $actions)) && p('my') && e('index|work'); //更新my的权限，检查my模块的权限是否更新正确 r($group->updatePrivByGroupTest(1, 'my', '', $actions)) && p('module1') && e('method1'); //更新my的权限，检查其他nav的权限是否有影响 -r($group->updatePrivByGroupTest(2, '', '', $actions)) && p('my') && e('index|work'); //更新所有nav的权限，检查权限是否已更新 -r($group->updatePrivByGroupTest(2, '', '', $actions)) && p('module1') && e('~~'); //更新所有nav的权限，检查其他nav的权限是否已删除 +r($group->updatePrivByGroupTest(2, '', '', $actions)) && p('my') && e('index|work'); //更新所有nav的权限，检查权限是否已更新 +r($group->updatePrivByGroupTest(2, '', '', $actions)) && p('module1') && e('~~'); //更新所有nav的权限，检查其他nav的权限是否已删除 +r($group->updatePrivByGroupTest(3, '', '', $actions)) && p('module1') && e('~~'); //更新所有nav的权限，检查其他nav的权限是否已删除