From 12c3fd80ddc6a7c950579936d8cee50850279e66 Mon Sep 17 00:00:00 2001 From: tanghucheng Date: Mon, 28 Mar 2022 17:01:56 +0800 Subject: [PATCH 01/11] * Code for bug #21058. --- extension/lite/custom/ext/lang/en/lite.php | 4 ++-- extension/lite/custom/ext/lang/zh-cn/lite.php | 1 - module/custom/control.php | 2 ++ 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extension/lite/custom/ext/lang/en/lite.php b/extension/lite/custom/ext/lang/en/lite.php index bfe39b23ad..adc8835faf 100644 --- a/extension/lite/custom/ext/lang/en/lite.php +++ b/extension/lite/custom/ext/lang/en/lite.php @@ -6,7 +6,6 @@ $lang->custom->notice->readOnlyOfExecution = "If Change Forbidden, any change on $lang->custom->moduleName['execution'] = $lang->custom->execution; $lang->custom->object = array(); -$lang->custom->object['project'] = 'Project'; $lang->custom->object['execution'] = $lang->custom->execution; $lang->custom->object['story'] = $lang->SRCommon; $lang->custom->object['task'] = 'Task'; @@ -15,7 +14,8 @@ $lang->custom->object['user'] = 'User'; $lang->custom->object['block'] = 'Block'; $lang->custom->task = new stdClass(); -$lang->custom->task->fields['priList'] = 'Priority'; +$lang->custom->task->fields['priList'] = 'Priority'; +$lang->custom->task->fields['typeList'] = 'Type'; $lang->custom->story = new stdClass(); $lang->custom->story->fields['priList'] = 'Priority'; diff --git a/extension/lite/custom/ext/lang/zh-cn/lite.php b/extension/lite/custom/ext/lang/zh-cn/lite.php index b7fec903d2..c4a3d1948e 100644 --- a/extension/lite/custom/ext/lang/zh-cn/lite.php +++ b/extension/lite/custom/ext/lang/zh-cn/lite.php @@ -6,7 +6,6 @@ $lang->custom->notice->readOnlyOfExecution = "禁止修改后，已关闭{$lang- $lang->custom->moduleName['execution'] = $lang->custom->execution; $lang->custom->object = array(); -$lang->custom->object['project'] = '项目'; $lang->custom->object['execution'] = $lang->custom->execution; $lang->custom->object['story'] = $lang->SRCommon; $lang->custom->object['task'] = '任务'; diff --git a/module/custom/control.php b/module/custom/control.php index dc159ba0c6..60ab69b4a0 100644 --- a/module/custom/control.php +++ b/module/custom/control.php @@ -19,6 +19,8 @@ class custom extends control */ public function index() { + if($this->config->vision == 'lite') return print(js::locate(inlink('execution'))); + if(($this->config->systemMode == 'new') and common::hasPriv('custom', 'set')) { return print(js::locate(inlink('set', "module=project&field=" . key($this->lang->custom->project->fields)))); From 9f74fe748f8bb79213597f027437bfa317276633 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 29 Mar 2022 09:34:09 +0800 Subject: [PATCH 02/11] * Fix bug #20804,20946. --- lib/pager/pager.class.php | 24 +++++++++++++++++++++-- module/gitlab/lang/en.php | 1 + module/gitlab/lang/zh-cn.php | 1 + module/gitlab/view/browseproject.html.php | 2 +- module/gitlab/view/view.html.php | 3 +++ 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/lib/pager/pager.class.php b/lib/pager/pager.class.php index 1dd0dac22a..0d0b016fa9 100644 --- a/lib/pager/pager.class.php +++ b/lib/pager/pager.class.php @@ -90,10 +90,11 @@ class pager extends basePager * * @param string $align * @param string $type + * @param int $maxRecPerPage * @access public * @return void */ - public function show($align = 'right', $type = 'full') + public function show($align = 'right', $type = 'full', $maxRecPerPage = 0) { if($type == 'pagerjs') { @@ -110,7 +111,26 @@ class pager extends basePager } else { - echo ""; + $pageSizeOptions = ''; + if($maxRecPerPage) + { + /* Set record per page. */ + for($i = 5; $i <= 50; $i += 5) $options[] = $i; + $options = array_merge($options, array(100, 200, 500, 1000, 2000)); + + $pageSizeOptions = 'data-page-size-options="'; + foreach($options as $option) + { + $pageSizeOptions .= "$option,"; + if($option >= $maxRecPerPage) + { + $pageSizeOptions = trim($pageSizeOptions, ',') . '"'; + break; + } + } + } + + echo ""; } } else diff --git a/module/gitlab/lang/en.php b/module/gitlab/lang/en.php index feaa6bb53b..9df7073538 100644 --- a/module/gitlab/lang/en.php +++ b/module/gitlab/lang/en.php @@ -77,6 +77,7 @@ $lang->gitlab->createSuccess = "Create success"; $lang->gitlab->mustBindUser = 'You have not registered the GitLab account, please contact the administrator to register.'; $lang->gitlab->noAccess = 'Permission denied'; $lang->gitlab->notCompatible = 'The current GitLab version is not compatible with ZenTao, please upgrade the GitLab version and try again'; +$lang->gitlab->deleted = 'Deleted'; $lang->gitlab->placeholder = new stdclass; $lang->gitlab->placeholder->name = ''; diff --git a/module/gitlab/lang/zh-cn.php b/module/gitlab/lang/zh-cn.php index 5f6d6120ce..d3235a8c3a 100644 --- a/module/gitlab/lang/zh-cn.php +++ b/module/gitlab/lang/zh-cn.php @@ -77,6 +77,7 @@ $lang->gitlab->createSuccess = "创建成功"; $lang->gitlab->mustBindUser = '您还未绑定GitLab用户，请联系管理员进行绑定'; $lang->gitlab->noAccess = '权限不足'; $lang->gitlab->notCompatible = '当前GitLab版本与禅道不兼容，请升级GitLab版本后重试'; +$lang->gitlab->deleted = '已删除'; $lang->gitlab->placeholder = new stdclass; $lang->gitlab->placeholder->name = ''; diff --git a/module/gitlab/view/browseproject.html.php b/module/gitlab/view/browseproject.html.php index 1209405395..686511c634 100644 --- a/module/gitlab/view/browseproject.html.php +++ b/module/gitlab/view/browseproject.html.php @@ -83,7 +83,7 @@ -
show('right', 'pagerjs');?>
+
show('right', 'pagerjs', 100);?>
diff --git a/module/gitlab/view/view.html.php b/module/gitlab/view/view.html.php index 2866e100e1..49cff2e5c6 100644 --- a/module/gitlab/view/view.html.php +++ b/module/gitlab/view/view.html.php @@ -18,6 +18,9 @@
id?> name;?> + deleted):?> + gitlab->deleted;?> +
From f6e4a00c2509ac048d318a2ec7da72c25f04e7d9 Mon Sep 17 00:00:00 2001 From: zenggang Date: Tue, 29 Mar 2022 02:11:46 +0000 Subject: [PATCH 03/11] * Fix bug#21092 --- module/tutorial/js/index.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/module/tutorial/js/index.js b/module/tutorial/js/index.js index 43e450fe1b..2064a6b582 100644 --- a/module/tutorial/js/index.js +++ b/module/tutorial/js/index.js @@ -168,6 +168,8 @@ $(function() container = null; } + if($(ele).hasClass('create-bug-btn')) container = '.btn-toolbar.pull-right'; // Fix bug #21092. + $e.closest('body').find('.tooltip-tutorial').tooltip('destroy'); var offset = $e.offset(); var winWidth = $(window).width(); From 731f96d1a54a375b3d683432b9b5620b5cae73d9 Mon Sep 17 00:00:00 2001 From: xieqiyu Date: Tue, 29 Mar 2022 10:57:12 +0800 Subject: [PATCH 04/11] * Fix bug#16137,#16136. --- module/bug/js/common.js | 4 +++- module/story/control.php | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/module/bug/js/common.js b/module/bug/js/common.js index 83d599fc68..96afeeee40 100644 --- a/module/bug/js/common.js +++ b/module/bug/js/common.js @@ -504,7 +504,9 @@ function setStories(moduleID, productID, storyID) { var branch = $('#branch').val(); if(typeof(branch) == 'undefined') branch = 0; - link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + storyID); + var executionID = $('#execution').val(); + if(typeof(executionID) == 'undefined') executionID = 0; + link = createLink('story', 'ajaxGetProductStories', 'productID=' + productID + '&branch=' + branch + '&moduleID=' + moduleID + '&storyID=' + storyID + '&onlyOption=false&status=&limit=0&type=full&hasParent=1&executionID=' + executionID); $.get(link, function(stories) { if(!stories) stories = ''; diff --git a/module/story/control.php b/module/story/control.php index 09099b18be..02977d6d88 100644 --- a/module/story/control.php +++ b/module/story/control.php @@ -2099,7 +2099,7 @@ class story extends control $stories = $this->story->getProductStoryPairs($productID, $branch, $moduleID, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); } - if(empty($stories)) $stories = $this->story->getProductStoryPairs($productID, $branch, 0, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); + if(!in_array($this->app->tab, array('execution', 'project')) and empty($stories)) $stories = $this->story->getProductStoryPairs($productID, $branch, 0, $storyStatus, 'id_desc', $limit, $type, 'story', $hasParent); $storyID = isset($stories[$storyID]) ? $storyID : 0; $select = html::select('story' . $number, empty($stories) ? array('' => '') : $stories, $storyID, "class='form-control'"); From a2e9c28f6ea5b9dbce78e6be50d837b39c4221d7 Mon Sep 17 00:00:00 2001 From: sunjun Date: Tue, 29 Mar 2022 11:12:02 +0800 Subject: [PATCH 05/11] *Fixbug #21258 --- module/execution/model.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/module/execution/model.php b/module/execution/model.php index 703830a1e2..cd6c878de0 100644 --- a/module/execution/model.php +++ b/module/execution/model.php @@ -305,14 +305,6 @@ class executionModel extends model $type = 'sprint'; if($project) $type = zget($this->config->execution->modelList, $project->model, 'sprint'); - /* Judge workdays is legitimate. */ - $workdays = helper::diffDate($_POST['end'], $_POST['begin']) + 1; - if(isset($_POST['days']) and $_POST['days'] > $workdays) - { - dao::$errors['days'] = sprintf($this->lang->project->workdaysExceed, $workdays); - return false; - } - /* If the execution model is a stage, determine whether the product is linked. */ $products = array_filter($this->post->products); if(empty($products)) @@ -324,6 +316,14 @@ class executionModel extends model $this->config->execution->create->requiredFields .= ',project'; } + /* Judge workdays is legitimate. */ + $workdays = helper::diffDate($_POST['end'], $_POST['begin']) + 1; + if(isset($_POST['days']) and $_POST['days'] > $workdays) + { + dao::$errors['days'] = sprintf($this->lang->project->workdaysExceed, $workdays); + return false; + } + /* Get the data from the post. */ $sprint = fixer::input('post') ->setDefault('status', 'wait') From 603ae3bfdccc5760119572920b660ff244105f2a Mon Sep 17 00:00:00 2001 From: zhouxin Date: Tue, 29 Mar 2022 03:14:50 +0000 Subject: [PATCH 06/11] * Fix bug #16707. --- module/program/control.php | 2 +- module/user/model.php | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index 72f7c663dc..f19a9b96f9 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -60,7 +60,7 @@ class program extends control $this->view->orderBy = $orderBy; $this->view->users = $this->user->getPairs('noletter'); $this->view->userIdPairs = $this->user->getPairs('noletter|showid'); - $this->view->usersAvatar = $this->user->getAvatarPairs(); + $this->view->usersAvatar = $this->user->getAvatarPairs(false); $this->view->programType = $programType; $this->view->PMList = $PMList; $this->view->progressList = $this->program->getProgressList(); diff --git a/module/user/model.php b/module/user/model.php index 69c1da87ee..7a0cb82ad0 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -37,11 +37,11 @@ class userModel extends model * @access public * @return void */ - public function getList() + public function getList($undeleted = true) { return $this->dao->select('*')->from(TABLE_USER) - ->where('deleted')->eq(0) - ->andWhere('type')->eq('inside') + ->where('type')->eq('inside') + ->beginIF($undeleted == true)->andWhere('deleted')->eq(0)->fi() ->orderBy('account') ->fetchAll(); } @@ -146,10 +146,10 @@ class userModel extends model * @access public * @return array */ - public function getAvatarPairs() + public function getAvatarPairs($undeleted = true) { $avatarPairs = array(); - $userList = $this->getList(); + $userList = $this->getList($undeleted); foreach($userList as $user) $avatarPairs[$user->account] = $user->avatar; return $avatarPairs; From 376de6d82487307980e6f3e495fac409d511cb8c Mon Sep 17 00:00:00 2001 From: zhouxin Date: Tue, 29 Mar 2022 04:28:39 +0000 Subject: [PATCH 07/11] * Fix bug #16707. --- module/program/control.php | 2 +- module/user/model.php | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/module/program/control.php b/module/program/control.php index f19a9b96f9..cd7e6c2adf 100644 --- a/module/program/control.php +++ b/module/program/control.php @@ -60,7 +60,7 @@ class program extends control $this->view->orderBy = $orderBy; $this->view->users = $this->user->getPairs('noletter'); $this->view->userIdPairs = $this->user->getPairs('noletter|showid'); - $this->view->usersAvatar = $this->user->getAvatarPairs(false); + $this->view->usersAvatar = $this->user->getAvatarPairs(''); $this->view->programType = $programType; $this->view->PMList = $PMList; $this->view->progressList = $this->program->getProgressList(); diff --git a/module/user/model.php b/module/user/model.php index 7a0cb82ad0..4f2b5a3dd6 100644 --- a/module/user/model.php +++ b/module/user/model.php @@ -37,11 +37,11 @@ class userModel extends model * @access public * @return void */ - public function getList($undeleted = true) + public function getList($params = 'nodeleted') { return $this->dao->select('*')->from(TABLE_USER) ->where('type')->eq('inside') - ->beginIF($undeleted == true)->andWhere('deleted')->eq(0)->fi() + ->beginIF(strpos($params, 'nodeleted') !== false)->andWhere('deleted')->eq(0)->fi() ->orderBy('account') ->fetchAll(); } @@ -146,10 +146,10 @@ class userModel extends model * @access public * @return array */ - public function getAvatarPairs($undeleted = true) + public function getAvatarPairs($params = 'nodeleted') { $avatarPairs = array(); - $userList = $this->getList($undeleted); + $userList = $this->getList($params); foreach($userList as $user) $avatarPairs[$user->account] = $user->avatar; return $avatarPairs; From 5460fc9b9b33c7881c89027c76e81324351d2689 Mon Sep 17 00:00:00 2001 From: liyang <“liyang@easycorp.ltd”> Date: Tue, 29 Mar 2022 13:23:28 +0800 Subject: [PATCH 08/11] update story data --- test/data/story.yaml | 4 ++-- test/data/zentao/processor.php | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/test/data/story.yaml b/test/data/story.yaml index fd1b48756c..ab254831ae 100644 --- a/test/data/story.yaml +++ b/test/data/story.yaml @@ -236,8 +236,8 @@ fields: format: "" - field: closedReason note: "关闭原因" - range: 1-1000 - prefix: "关闭原因" + range: done,subdivided,duplicate,postponed,willnotdo,cancel,bydesign + prefix: "" postfix: "" loop: 0 format: "" diff --git a/test/data/zentao/processor.php b/test/data/zentao/processor.php index b7688c067a..1ff2bbf54e 100644 --- a/test/data/zentao/processor.php +++ b/test/data/zentao/processor.php @@ -44,6 +44,7 @@ class Processor $this->initRelease(); $this->initStakeholder(); $this->initUserquery(); + $this->initMessage(); $this->initUpdateKanban(); $this->initStory(); $this->initBug(); @@ -159,6 +160,7 @@ class Processor $this->dao->update(TABLE_STORY)->set('`status`')->eq('active')->where('id')->le('20')->exec(); $this->dao->update(TABLE_STORY)->set('`status`')->eq('draft')->where('id')->ge('300')->andwhere('id')->le('400')->exec(); $this->dao->update(TABLE_STORY)->set('`closedBy`')->eq('')->set('`closedReason`')->eq('')->where('status')->ne('closed')->exec(); + $this->dao->update(TABLE_STORY)->set('`plan`')->eq('0')->where('id')->gt('300')->andwhere('id')->lt('321')->exec(); } /** @@ -318,6 +320,12 @@ class Processor $this->dao->query("INSERT INTO `zt_userquery` (`id`, `account`, `module`, `title`, `form`, `sql`, `shortcut`) VALUES (5, 'admin', 'executionBuild', '执行版本搜索', 'a:37:{s:9:\"fieldname\";s:0:\"\";s:12:\"fieldproduct\";s:0:\"\";s:12:\"fieldscmPath\";s:0:\"\";s:13:\"fieldfilePath\";s:0:\"\";s:9:\"fielddate\";s:0:\"\";s:12:\"fieldbuilder\";s:0:\"\";s:9:\"fielddesc\";s:0:\"\";s:7:\"fieldid\";s:0:\"\";s:6:\"andOr1\";s:3:\"AND\";s:6:\"field1\";s:4:\"name\";s:9:\"operator1\";s:7:\"include\";s:6:\"value1\";s:8:\"版本17\";s:6:\"andOr2\";s:3:\"and\";s:6:\"field2\";s:2:\"id\";s:9:\"operator2\";s:1:\"=\";s:6:\"value2\";s:0:\"\";s:6:\"andOr3\";s:3:\"and\";s:6:\"field3\";s:7:\"product\";s:9:\"operator3\";s:1:\"=\";s:6:\"value3\";s:0:\"\";s:10:\"groupAndOr\";s:3:\"and\";s:6:\"andOr4\";s:3:\"AND\";s:6:\"field4\";s:7:\"scmPath\";s:9:\"operator4\";s:7:\"include\";s:6:\"value4\";s:0:\"\";s:6:\"andOr5\";s:3:\"and\";s:6:\"field5\";s:8:\"filePath\";s:9:\"operator5\";s:7:\"include\";s:6:\"value5\";s:0:\"\";s:6:\"andOr6\";s:3:\"and\";s:6:\"field6\";s:4:\"date\";s:9:\"operator6\";s:1:\"=\";s:6:\"value6\";s:0:\"\";s:6:\"module\";s:14:\"executionBuild\";s:9:\"actionURL\";s:78:\"/index.php?m=execution&f=build&executionID=101&type=bysearch&queryID=myQueryID\";s:10:\"groupItems\";s:1:\"3\";s:8:\"formType\";s:4:\"more\";}', '(( 1 AND `name` LIKE \'%版本17%\' ) AND ( 1 ))', '0');"); } + private function initMessage() + { + $this->dao->query("DELETE FROM `zt_config` where `key` = 'setting';"); + $this->dao->query("INSERT INTO `zt_config` (`vision`, `owner`, `module`, `section`, `key`, `value`) VALUES + ('rnd', 'system', 'message', '', 'setting', '{\"mail\":{\"setting\":{\"story\":[\"opened\",\"edited\",\"commented\",\"frombug\",\"changed\",\"reviewed\",\"closed\",\"activated\",\"assigned\"],\"task\":[\"opened\",\"edited\",\"commented\",\"assigned\",\"confirmed\",\"started\",\"finished\",\"paused\",\"canceled\",\"restarted\",\"closed\",\"activated\"],\"testtask\":[\"opened\",\"edited\",\"closed\"],\"doc\":[\"created\",\"edited\"]}},\"message\":{\"setting\":{\"story\":[\"opened\",\"edited\",\"commented\",\"frombug\",\"changed\",\"reviewed\",\"closed\",\"activated\",\"assigned\"],\"task\":[\"opened\",\"edited\",\"commented\",\"assigned\",\"confirmed\",\"started\",\"finished\",\"paused\",\"canceled\",\"restarted\",\"closed\",\"activated\"],\"testtask\":[\"opened\",\"edited\",\"started\",\"blocked\",\"closed\",\"activated\"],\"todo\":[\"opened\",\"edited\"],\"doc\":[\"created\",\"edited\"]}}}');"); + } private function initTodo() { $toDay = date('y-m-d'); From 1fcbef1a7923442e9e5c80a403dad303fe605cf3 Mon Sep 17 00:00:00 2001 From: liyuchun Date: Tue, 29 Mar 2022 13:45:36 +0800 Subject: [PATCH 09/11] * Fix bug #13194. --- module/common/model.php | 10 ++++++++++ module/tutorial/view/index.html.php | 1 - 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/module/common/model.php b/module/common/model.php index 8991412729..a7c28e4ec8 100644 --- a/module/common/model.php +++ b/module/common/model.php @@ -2279,6 +2279,16 @@ EOD; $module = strtolower($module); $method = strtolower($method); + /* If the user is doing a tutorial, have all tutorial privs. */ + if(defined('TUTORIAL')) + { + $app->loadLang('tutorial'); + foreach($lang->tutorial->tasks as $task) + { + if($task['nav']['module'] == $module and $task['nav']['method'] = $method) return true; + } + } + /* Check the parent object is closed. */ if(!empty($method) and strpos('close|batchclose', $method) === false and !commonModel::canBeChanged($module, $object)) return false; diff --git a/module/tutorial/view/index.html.php b/module/tutorial/view/index.html.php index 454c6edcf4..f0136f8685 100644 --- a/module/tutorial/view/index.html.php +++ b/module/tutorial/view/index.html.php @@ -76,7 +76,6 @@ Date: Tue, 29 Mar 2022 06:16:14 +0000 Subject: [PATCH 10/11] * Fix bug#21092,11398 --- module/execution/view/story.html.php | 2 +- module/tutorial/js/index.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php index c67e6f6d21..4da719b838 100644 --- a/module/execution/view/story.html.php +++ b/module/execution/view/story.html.php @@ -335,7 +335,7 @@ $actionLink = $this->createLink('story', 'batchEdit', "productID=0&executionID=$execution->id"); echo html::commonButton($lang->edit, "data-form-action='$actionLink' $disabled"); ?> - +
    Date: Tue, 29 Mar 2022 14:27:03 +0800 Subject: [PATCH 11/11] * Add auto test of kanban. --- test/class/kanban.class.php | 144 ++++++++++++++++--- test/model/kanban/create.php | 12 +- test/model/kanban/createcard.php | 59 ++++++++ test/model/kanban/createcolumn.php | 89 ++++++++++++ test/model/kanban/createdefaultcolumns.php | 26 ++++ test/model/kanban/createdefaultlane.php | 25 ++++ test/model/kanban/createdefaultregion.php | 42 ++++++ test/model/kanban/createexecutioncolumns.php | 36 +++++ test/model/kanban/createexecutionlane.php | 34 +++++ test/model/kanban/creategroup.php | 25 ++++ 10 files changed, 464 insertions(+), 28 deletions(-) create mode 100755 test/model/kanban/createcard.php create mode 100755 test/model/kanban/createcolumn.php create mode 100755 test/model/kanban/createdefaultcolumns.php create mode 100755 test/model/kanban/createdefaultlane.php create mode 100755 test/model/kanban/createdefaultregion.php create mode 100755 test/model/kanban/createexecutioncolumns.php create mode 100755 test/model/kanban/createexecutionlane.php create mode 100755 test/model/kanban/creategroup.php diff --git a/test/class/kanban.class.php b/test/class/kanban.class.php index 0058ee741e..8f5c274187 100644 --- a/test/class/kanban.class.php +++ b/test/class/kanban.class.php @@ -7,22 +7,40 @@ class kanbanTest $this->objectModel = $tester->loadModel('kanban'); } + /** + * Test create a kanban group. + * + * @param int $kanbanID + * @param int $regionID + * @access public + * @return object + */ public function createGroupTest($kanbanID, $regionID) { - $objects = $this->objectModel->createGroup($kanbanID, $regionID); + $objectID = $this->objectModel->createGroup($kanbanID, $regionID); if(dao::isError()) return dao::getError(); - return $objects; + global $tester; + $object = $tester->dao->findByID($objectID)->from(TABLE_KANBANGROUP)->fetch(); + return $object; } + /** + * Test create a default kanban region. + * + * @param int $kanbanID + * @access public + * @return object + */ public function createDefaultRegionTest($kanban) { - $objects = $this->objectModel->createDefaultRegion($kanban); + $objectID = $this->objectModel->createDefaultRegion($kanban); if(dao::isError()) return dao::getError(); - return $objects; + $object = $this->objectModel->getRegionByID($objectID); + return $object; } public function createRegionTest($kanban, $region = null, $copyRegionID = 0, $from = 'kanban') @@ -34,31 +52,65 @@ class kanbanTest return $objects; } - public function createDefaultLaneTest($kanban, $regionID, $groupID) + /** + * Test create default kanban lanes. + * + * @param int $regionID + * @param int $groupID + * @access public + * @return object + */ + public function createDefaultLaneTest($regionID, $groupID) { - $objects = $this->objectModel->createDefaultLane($kanban, $regionID, $groupID); + $objectID = $this->objectModel->createDefaultLane(null, $regionID, $groupID); if(dao::isError()) return dao::getError(); - return $objects; + $object = $this->objectModel->getLaneByID($objectID); + return $object; } - public function createDefaultColumnsTest($kanban, $regionID, $groupID) + /** + * Test create default kanban columns. + * + * @param int $regionID + * @param int $groupID + * @access public + * @return int + */ + public function createDefaultColumnsTest($regionID, $groupID) { - $objects = $this->objectModel->createDefaultColumns($kanban, $regionID, $groupID); + $this->objectModel->createDefaultColumns(null, $regionID, $groupID); + if(dao::isError()) return dao::getError(); - return $objects; + global $tester; + $objects = $tester->dao->select('*')->from(TABLE_KANBANCOLUMN)->where('`region`')->eq($regionID)->andWhere('`group`')->eq($groupID)->andWhere('`type`')->like('column%')->fetchAll(); + return count($objects); } - public function createColumnTest($regionID, $column = null, $order = 0, $parent = 0, $from = 'kanban') + /** + * Test create a column. + * + * @param object $param + * @access public + * @return object + */ + public function createColumnTest($param) { - $objects = $this->objectModel->createColumn($regionID, $column = null, $order = 0, $parent = 0, $from = 'kanban'); + $regionID = 1; + + foreach($param as $key => $value) $_POST[$key] = $value; + + $objectID = $this->objectModel->createColumn($regionID, null, 0, $param->parent); + + unset($_POST); if(dao::isError()) return dao::getError(); - return $objects; + $object = $this->objectModel->getColumnByID($objectID); + return $object; } public function splitColumnTest($columnID) @@ -70,13 +122,31 @@ class kanbanTest return $objects; } - public function createCardTest($kanbanID, $regionID, $groupID, $columnID) + /** + * Test create a card. + * + * @param array $param + * @access public + * @return object + */ + public function createCardTest($param) { - $objects = $this->objectModel->createCard($kanbanID, $regionID, $groupID, $columnID); + $kanbanID = 1; + $regionID = 1; + $groupID = 1; + $columnID = 1; + + $_POST['lane'] = 1; + $_POST['begin'] = date('Y-m-d', strtotime("-3 day")); + $_POST['end'] = date('Y-m-d', strtotime("+3 day")); + foreach($param as $key => $value) $_POST[$key] = $value; + + $objectID = $this->objectModel->createCard($kanbanID, $regionID, $groupID, $columnID); if(dao::isError()) return dao::getError(); - return $objects; + $object = $this->objectModel->getCardByID($objectID); + return $object; } public function importCardTest($kanbanID, $regionID, $groupID, $columnID) @@ -388,7 +458,7 @@ class kanbanTest * @access public * @return object */ - public function createTest($param = array(), $field = '') + public function createTest($param = array()) { foreach($param as $key => $value) $_POST[$key] = $value; @@ -396,7 +466,7 @@ class kanbanTest unset($_POST); - if(dao::isError()) return dao::getError()[$field][0]; + if(dao::isError()) return dao::getError(); $object = $this->objectModel->getByID($objectID); return $object; @@ -411,22 +481,52 @@ class kanbanTest return $objects; } + /** + * Test add execution Kanban lanes and columns. + * + * @param int $executionID + * @param string $type + * @param string $groupBy + * @access public + * @return int + */ public function createExecutionLaneTest($executionID, $type = 'all', $groupBy = 'default') { - $objects = $this->objectModel->createExecutionLane($executionID, $type = 'all', $groupBy = 'default'); + $this->objectModel->createExecutionLane($executionID, $type, $groupBy); if(dao::isError()) return dao::getError(); - return $objects; + global $tester; + $objects = $tester->dao->select('*')->from(TABLE_KANBANLANE) + ->where('execution')->eq($executionID) + ->beginIF($type != 'all')->andWhere('type')->eq($type)->fi() + ->fetchAll(); + return count($objects); } + /** + * Test create execution columns. + * + * @param int $laneID + * @param string $type + * @param int $executionID + * @access public + * @return int + */ public function createExecutionColumnsTest($laneID, $type, $executionID) { - $objects = $this->objectModel->createExecutionColumns($laneID, $type, $executionID); + $this->objectModel->createExecutionColumns($laneID, $type, $executionID); + + global $tester; + $objects = $tester->dao->select('*')->from(TABLE_KANBANCELL) + ->where('kanban')->eq($executionID) + ->andWhere('lane')->eq($laneID) + ->andWhere('type')->eq($type) + ->fetchAll(); if(dao::isError()) return dao::getError(); - return $objects; + return count($objects); } /** diff --git a/test/model/kanban/create.php b/test/model/kanban/create.php index 143ed18fe4..9974cc05b3 100755 --- a/test/model/kanban/create.php +++ b/test/model/kanban/create.php @@ -62,10 +62,10 @@ $kanban6->desc = '测试创建重名的公共看板的描述'; $kanban = new kanbanTest(); -r($kanban->createTest($kanban1)) && p('name,space,type,owner,whitelist') && e('测试创建协作看板,1,,po15,'); // 创建协同空间 -r($kanban->createTest($kanban2)) && p('name,space,type,owner,whitelist') && e('测试创建私人看板,2,,admin,,user4'); // 创建私人空间 -r($kanban->createTest($kanban3)) && p('name,space,type,owner,whitelist') && e('测试创建公共看板,3,,po17,'); // 创建公共空间 -r($kanban->createTest($kanban4, 'name')) && p() && e('『看板名称』不能为空。'); // 创建没有名字的公共空间 -r($kanban->createTest($kanban5, 'space')) && p() && e('『所属空间』不能为空。'); // 创建没有空间公共空间 -r($kanban->createTest($kanban6, 'name')) && p() && e('『看板名称』已经有『测试创建公共看板』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); // 创建重名公共空间 +r($kanban->createTest($kanban1)) && p('name,space,type,owner,whitelist') && e('测试创建协作看板,1,,po15,'); // 创建协同空间 +r($kanban->createTest($kanban2)) && p('name,space,type,owner,whitelist') && e('测试创建私人看板,2,,admin,,user4'); // 创建私人空间 +r($kanban->createTest($kanban3)) && p('name,space,type,owner,whitelist') && e('测试创建公共看板,3,,po17,'); // 创建公共空间 +r($kanban->createTest($kanban4)) && p('name:0') && e('『看板名称』不能为空。'); // 创建没有名字的公共空间 +r($kanban->createTest($kanban5)) && p('space:0') && e('『所属空间』不能为空。'); // 创建没有空间公共空间 +r($kanban->createTest($kanban6)) && p('name:0') && e('『看板名称』已经有『测试创建公共看板』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); // 创建重名公共空间 system("./ztest init"); diff --git a/test/model/kanban/createcard.php b/test/model/kanban/createcard.php new file mode 100755 index 0000000000..3bef554215 --- /dev/null +++ b/test/model/kanban/createcard.php @@ -0,0 +1,59 @@ +#!/usr/bin/env php +createCard(); +cid=1 +pid=1 + +*/ + +$card1 = new stdclass(); +$card1->name = '测试创建卡片1'; +$card1->pri = '1'; +$card1->estimate = '1'; +$card1->assignedTo = array('po15', 'user3'); +$card1->desc = '测试创建卡片1的卡片描述'; + +$card2 = new stdclass(); +$card2->name = '测试创建卡片2'; +$card2->pri = '2'; +$card2->estimate = '2'; +$card2->assignedTo = array('user3'); +$card2->desc = '测试创建卡片2的卡片描述'; + +$card3 = new stdclass(); +$card3->name = '测试创建预计小于0的卡片'; +$card3->pri = '3'; +$card3->estimate = '-1'; +$card3->assignedTo = array('po15'); +$card3->desc = '测试创建预计小于0的卡片的描述'; + +$card4 = new stdclass(); +$card4->name = '测试创建结束小于开始日期的卡片'; +$card4->pri = '4'; +$card4->estimate = '4'; +$card4->assignedTo = array('user3'); +$card4->begin = '2022-03-29'; +$card4->end = '2022-03-20'; +$card4->desc = '测试创建结束小于开始日期的卡片的描述'; + +$card5 = new stdclass(); +$card5->name = ''; +$card5->pri = '1'; +$card5->estimate = '5'; +$card5->assignedTo = array('po15'); +$card5->desc = '测试不填写名称的卡片的卡片描述'; + +$kanban = new kanbanTest(); + +r($kanban->createCardTest($card1)) && p('name,pri,estimate,desc') && e('测试创建卡片1,1,1,测试创建卡片1的卡片描述'); // 测试创建卡片1 +r($kanban->createCardTest($card2)) && p('name,pri,estimate,desc') && e('测试创建卡片2,2,2,测试创建卡片2的卡片描述'); // 测试创建卡片2 +r($kanban->createCardTest($card3)) && p('estimate') && e('预计不能为负数!'); // 测试创建预计小于0的卡片 +r($kanban->createCardTest($card4)) && p('end') && e('"截止日期"不能小于"预计开始"!'); // 测试创建结束小于开始日期的卡片 +r($kanban->createCardTest($card5)) && p('name:0') && e('『卡片名称』不能为空。'); // 测试创建没有名字的卡片 +system("./ztest init"); diff --git a/test/model/kanban/createcolumn.php b/test/model/kanban/createcolumn.php new file mode 100755 index 0000000000..55cd98ee4f --- /dev/null +++ b/test/model/kanban/createcolumn.php @@ -0,0 +1,89 @@ +#!/usr/bin/env php +createColumn(); +cid=1 +pid=1 + +*/ + +$column1 = new stdclass(); +$column1->name = '测试创建不限制看板列'; +$column1->limit = '-1'; +$column1->noLimit = '-1'; +$column1->color = '#333'; +$column1->group = '1'; +$column1->parent = '0'; + +$column2 = new stdclass(); +$column2->name = '测试创建不限制子看板列'; +$column2->limit = '-1'; +$column2->noLimit = '-1'; +$column2->color = '#333'; +$column2->group = '1'; +$column2->parent = '1'; + +$column3 = new stdclass(); +$column3->name = '测试创建限制父看板列'; +$column3->WIPCount = '111'; +$column3->limit = '111'; +$column3->color = '#333'; +$column3->group = '1'; +$column3->parent = '-1'; + +$column4 = new stdclass(); +$column4->name = '测试创建限制子看板列'; +$column4->WIPCount = '11'; +$column4->limit = '11'; +$column4->color = '#333'; +$column4->group = '1'; +$column4->parent = '5263'; + +$column5 = new stdclass(); +$column5->name = ''; +$column5->limit = '-1'; +$column5->noLimit = '-1'; +$column5->color = '#333'; +$column5->group = '1'; +$column5->parent = '0'; + +$column6 = new stdclass(); +$column6->name = '测试创建不填写在制品数量的看板列'; +$column6->WIPCount = ''; +$column6->limit = ''; +$column6->color = '#333'; +$column6->group = '1'; +$column6->parent = '0'; + +$column7 = new stdclass(); +$column7->name = '测试创建在制品数量为0的看板列'; +$column7->WIPCount = 0; +$column7->limit = 0; +$column7->color = '#333'; +$column7->group = '1'; +$column7->parent = '0'; + +$column8 = new stdclass(); +$column8->name = '测试创建在制品数量超出限制的子看板列'; +$column8->WIPCount = '111'; +$column8->limit = '111'; +$column8->color = '#333'; +$column8->group = '1'; +$column8->parent = '5263'; + +$kanban = new kanbanTest(); + +r($kanban->createColumnTest($column1)) && p('name,limit,color,parent,group') && e('测试创建不限制看板列,-1,#333,0,1'); // 创建没有在制品限制的看板列 +r($kanban->createColumnTest($column2)) && p('name,limit,color,parent,group') && e('测试创建不限制子看板列,-1,#333,1,1'); // 创建没有在制品限制的看板列 +r($kanban->createColumnTest($column3)) && p('name,limit,color,parent,group') && e('测试创建限制父看板列,111,#333,-1,1'); // 创建有在制品限制的看板列 +r($kanban->createColumnTest($column4)) && p('name,limit,color,parent,group') && e('测试创建限制子看板列,11,#333,5263,1'); // 创建有在制品限制的子看板列 +r($kanban->createColumnTest($column5)) && p('name:0') && e('『看板列名称』不能为空。'); // 创建没有名称的看板列 +r($kanban->createColumnTest($column6)) && p('limit') && e('在制品数量必须是正整数。'); // 创建没有填写在制品限制的看板列 +r($kanban->createColumnTest($column7)) && p('limit') && e('在制品数量必须是正整数。'); // 创建在制品数量为0的看板列 +r($kanban->createColumnTest($column8)) && p('limit:0') && e('父列的在制品数量不能小于子列在制品数量之和'); // 创建在制品数量超出限制的子看板列 +system("./ztest init"); diff --git a/test/model/kanban/createdefaultcolumns.php b/test/model/kanban/createdefaultcolumns.php new file mode 100755 index 0000000000..88b95477b1 --- /dev/null +++ b/test/model/kanban/createdefaultcolumns.php @@ -0,0 +1,26 @@ +#!/usr/bin/env php +createDefaultColumns(); +cid=1 +pid=1 + +*/ + +$kanban = new kanbanTest(); + +$regionIDList = array('1', '2', '3', '4', '5'); +$groupIDList = array('1', '2', '3', '4', '5'); + +r($kanban->createDefaultColumnsTest($regionIDList[0], $groupIDList[0])) && p() && e('8'); // 创建region 1 group 1的默认泳道列 +r($kanban->createDefaultColumnsTest($regionIDList[1], $groupIDList[1])) && p() && e('8'); // 创建region 2 group 2的默认泳道列 +r($kanban->createDefaultColumnsTest($regionIDList[2], $groupIDList[2])) && p() && e('8'); // 创建region 3 group 3的默认泳道列 +r($kanban->createDefaultColumnsTest($regionIDList[3], $groupIDList[3])) && p() && e('8'); // 创建region 4 group 4的默认泳道列 +r($kanban->createDefaultColumnsTest($regionIDList[4], $groupIDList[4])) && p() && e('8'); // 创建region 5 group 5的默认泳道列 +r($kanban->createDefaultColumnsTest($regionIDList[0], $groupIDList[0])) && p() && e('12'); // 重复创建region 1 group 1的默认泳道列 +system("./ztest init"); diff --git a/test/model/kanban/createdefaultlane.php b/test/model/kanban/createdefaultlane.php new file mode 100755 index 0000000000..5de6a9df41 --- /dev/null +++ b/test/model/kanban/createdefaultlane.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +createDefaultLane(); +cid=1 +pid=1 + +*/ + +$kanban = new kanbanTest(); + +$regionIDList = array('1', '2', '3', '4', '5'); +$groupIDList = array('1', '2', '3', '4', '5'); + +r($kanban->createDefaultLaneTest($regionIDList[0], $groupIDList[0])) && p('name,group,region,type') && e('默认泳道,1,1,common'); // 创建region 1 group 1的默认泳道 +r($kanban->createDefaultLaneTest($regionIDList[1], $groupIDList[1])) && p('name,group,region,type') && e('默认泳道,2,2,common'); // 创建region 2 group 2的默认泳道 +r($kanban->createDefaultLaneTest($regionIDList[2], $groupIDList[2])) && p('name,group,region,type') && e('默认泳道,3,3,common'); // 创建region 3 group 3的默认泳道 +r($kanban->createDefaultLaneTest($regionIDList[3], $groupIDList[3])) && p('name,group,region,type') && e('默认泳道,4,4,common'); // 创建region 4 group 4的默认泳道 +r($kanban->createDefaultLaneTest($regionIDList[4], $groupIDList[4])) && p('name,group,region,type') && e('默认泳道,5,5,common'); // 创建region 5 group 5的默认泳道 +system("./ztest init"); diff --git a/test/model/kanban/createdefaultregion.php b/test/model/kanban/createdefaultregion.php new file mode 100755 index 0000000000..efe8c8e287 --- /dev/null +++ b/test/model/kanban/createdefaultregion.php @@ -0,0 +1,42 @@ +#!/usr/bin/env php +createDefaultRegion(); +cid=1 +pid=1 + +*/ + +$kanban1 = new stdclass(); +$kanban1->id = 10001; +$kanban1->space = 10001; + +$kanban2 = new stdclass(); +$kanban2->id = 10002; +$kanban2->space = 10002; + +$kanban3 = new stdclass(); +$kanban3->id = 10003; +$kanban3->space = 10003; + +$kanban4 = new stdclass(); +$kanban4->id = 10004; +$kanban4->space = 10004; + +$kanban5 = new stdclass(); +$kanban5->id = 1; +$kanban5->space = 1; + +$kanban = new kanbanTest(); + +r($kanban->createDefaultRegionTest($kanban1)) && p('space,kanban,name') && e('10001,10001,默认区域'); // 创建看板10001的默认区域 +r($kanban->createDefaultRegionTest($kanban2)) && p('space,kanban,name') && e('10002,10002,默认区域'); // 创建看板10002的默认区域 +r($kanban->createDefaultRegionTest($kanban3)) && p('space,kanban,name') && e('10003,10003,默认区域'); // 创建看板10003的默认区域 +r($kanban->createDefaultRegionTest($kanban4)) && p('space,kanban,name') && e('10004,10004,默认区域'); // 创建看板10004的默认区域 +r($kanban->createDefaultRegionTest($kanban5)) && p('name:0') && e('『区域名称』已经有『默认区域』这条记录了。如果您确定该记录已删除，请到后台-系统-数据-回收站还原。'); // 重复创建看板1的默认区域 +system("./ztest init"); diff --git a/test/model/kanban/createexecutioncolumns.php b/test/model/kanban/createexecutioncolumns.php new file mode 100755 index 0000000000..94bcfe5eb4 --- /dev/null +++ b/test/model/kanban/createexecutioncolumns.php @@ -0,0 +1,36 @@ +#!/usr/bin/env php +createExecutionColumns(); +cid=1 +pid=1 + +*/ + +$laneIDList = array('100001', '100002', '100003', '10004', '10005'); +$executionIDList = array('101', '102', '103', '104', '105'); +$typeList = array('story', 'task', 'bug'); + +$kanban = new kanbanTest(); + +r($kanban->createExecutionColumnsTest($laneIDList[0], $typeList[0], $executionIDList[0])) && p() && e('11'); // 创建泳道 100001 执行101 需求的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[0], $typeList[1], $executionIDList[0])) && p() && e('7'); // 创建泳道 100001 执行101 任务的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[0], $typeList[2], $executionIDList[0])) && p() && e('9'); // 创建泳道 100001 执行101 bug 的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[1], $typeList[0], $executionIDList[1])) && p() && e('11'); // 创建泳道 100002 执行102 需求的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[1], $typeList[1], $executionIDList[1])) && p() && e('7'); // 创建泳道 100002 执行102 任务的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[1], $typeList[1], $executionIDList[1])) && p() && e('14'); // 创建泳道 100002 执行102 bug 的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[2], $typeList[0], $executionIDList[2])) && p() && e('11'); // 创建泳道 100003 执行103 需求的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[2], $typeList[1], $executionIDList[2])) && p() && e('7'); // 创建泳道 100003 执行103 任务的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[2], $typeList[2], $executionIDList[2])) && p() && e('9'); // 创建泳道 100003 执行103 bug 的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[3], $typeList[0], $executionIDList[3])) && p() && e('11'); // 创建泳道 100004 执行104 需求的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[3], $typeList[1], $executionIDList[3])) && p() && e('7'); // 创建泳道 100004 执行104 任务的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[3], $typeList[2], $executionIDList[3])) && p() && e('9'); // 创建泳道 100004 执行104 bug 的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[4], $typeList[0], $executionIDList[4])) && p() && e('11'); // 创建泳道 100005 执行105 需求的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[4], $typeList[1], $executionIDList[4])) && p() && e('7'); // 创建泳道 100005 执行105 任务的看板列 +r($kanban->createExecutionColumnsTest($laneIDList[4], $typeList[2], $executionIDList[4])) && p() && e('9'); // 创建泳道 100005 执行105 bug 的看板列 +system("./ztest init"); diff --git a/test/model/kanban/createexecutionlane.php b/test/model/kanban/createexecutionlane.php new file mode 100755 index 0000000000..523722b831 --- /dev/null +++ b/test/model/kanban/createexecutionlane.php @@ -0,0 +1,34 @@ +#!/usr/bin/env php +createExecutionLane(); +cid=1 +pid=1 + +*/ + +$executionIDList = array('101', '102', '103', '104', '105'); +$typeIDList = array('all', 'story', 'task', 'bug'); +$groupByIDList = array('default', 'pri', 'category', 'module', 'source', 'assignedTo', 'story', 'severity'); + +$kanban = new kanbanTest(); + +r($kanban->createExecutionLaneTest($executionIDList[0])) && p() && e('3'); // 创建执行101的泳道 +r($kanban->createExecutionLaneTest($executionIDList[0], $typeIDList[1])) && p() && e('2'); // 创建执行101 需求的泳道 +r($kanban->createExecutionLaneTest($executionIDList[0], $typeIDList[1], $groupByIDList[2])) && p() && e('3'); // 创建执行101 需求 按类别分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[1])) && p() && e('3'); // 创建执行101的泳道 +r($kanban->createExecutionLaneTest($executionIDList[1], $typeIDList[1], $groupByIDList[4])) && p() && e('3'); // 创建执行102 需求 按来源分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[1], $typeIDList[2], $groupByIDList[1])) && p() && e('4'); // 创建执行102 任务 按优先级分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[1], $typeIDList[2], $groupByIDList[6])) && p() && e('7'); // 创建执行102 任务 按需求分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[2])) && p() && e('3'); // 创建执行103的泳道 +r($kanban->createExecutionLaneTest($executionIDList[2], $typeIDList[3], $groupByIDList[7])) && p() && e('4'); // 创建执行103 bug 按严重程度分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[2], $typeIDList[3], $groupByIDList[3])) && p() && e('8'); // 创建执行103 bug 按模块分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[2], $typeIDList[3], $groupByIDList[5])) && p() && e('10'); // 创建执行103 bug 按指派给分组的泳道 +r($kanban->createExecutionLaneTest($executionIDList[3])) && p() && e('3'); // 创建执行104的泳道 +r($kanban->createExecutionLaneTest($executionIDList[4])) && p() && e('3'); // 创建执行105的泳道 +system("./ztest init"); diff --git a/test/model/kanban/creategroup.php b/test/model/kanban/creategroup.php new file mode 100755 index 0000000000..b5e6f66e90 --- /dev/null +++ b/test/model/kanban/creategroup.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +createGroup(); +cid=1 +pid=1 + +*/ + +$kanbanIDList = array('1', '2', '3', '4', '5'); +$regionIDList = array('1', '2', '3', '4', '5'); + +$kanban = new kanbanTest(); + +r($kanban->createGroupTest($kanbanIDList[0], $regionIDList[0])) && p('kanaban,region,orde') && e(',1,'); // 测试创建看板1 区域1的看板组 +r($kanban->createGroupTest($kanbanIDList[1], $regionIDList[1])) && p('kanaban,region,orde') && e(',2,'); // 测试创建看板2 区域2的看板组 +r($kanban->createGroupTest($kanbanIDList[2], $regionIDList[2])) && p('kanaban,region,orde') && e(',3,'); // 测试创建看板3 区域3的看板组 +r($kanban->createGroupTest($kanbanIDList[3], $regionIDList[3])) && p('kanaban,region,orde') && e(',4,'); // 测试创建看板4 区域4的看板组 +r($kanban->createGroupTest($kanbanIDList[4], $regionIDList[4])) && p('kanaban,region,orde') && e(',5,'); // 测试创建看板5 区域5的看板组 +system("./ztest init");