diff --git a/module/kanban/test/lib/kanban.unittest.class.php b/module/kanban/test/lib/kanban.unittest.class.php index 783980c56c..834469d33c 100755 --- a/module/kanban/test/lib/kanban.unittest.class.php +++ b/module/kanban/test/lib/kanban.unittest.class.php @@ -2637,4 +2637,20 @@ class kanbanTest return $result; } + + /** + * Test getPageToolBar method. + * + * @param object $kanban + * @access public + * @return string + */ + public function getPageToolBarTest($kanban) + { + $result = $this->objectModel->getPageToolBar($kanban); + + if(dao::isError()) return dao::getError(); + + return $result; + } } diff --git a/module/kanban/test/model/getpagetoolbar.php b/module/kanban/test/model/getpagetoolbar.php index 6e8e3cc167..9a67c19cea 100755 --- a/module/kanban/test/model/getpagetoolbar.php +++ b/module/kanban/test/model/getpagetoolbar.php @@ -1,29 +1,47 @@ #!/usr/bin/env php gen(2); -zenData('user')->gen(5); /** -title=测试 kanbanModel->getPageToolBar(); +title=测试 kanbanModel::getPageToolBar(); timeout=0 -cid=1 +cid=0 -- 查看普通用户获取操作按钮的字符长度 @161 -- 查看管理员获取操作按钮的字符长度 @1282 +- 执行$userToolbar @161 +- 执行$adminToolbar) > strlen($userToolbar @1 +- 执行$closedKanbanToolbar, '激活看板') !== false @1 +- 执行$adminToolbar, 'icon-fullscreen') !== false @1 +- 执行$adminToolbar, '设置') !== false @1 */ -global $tester; -$tester->loadModel('kanban'); -$kanban1 = $tester->kanban->getByID(1); -$kanban2 = $tester->kanban->getByID(2); +include dirname(__FILE__, 5) . '/test/lib/init.php'; +include dirname(__FILE__, 2) . '/lib/kanban.unittest.class.php'; + +zenData('kanban')->gen(3); +zenData('user')->gen(5); + +su('user1'); + +$kanbanTest = new kanbanTest(); + +// 创建测试用的看板对象 +$activeKanban = new stdclass(); +$activeKanban->id = 1; +$activeKanban->status = 'active'; + +$closedKanban = new stdclass(); +$closedKanban->id = 2; +$closedKanban->status = 'closed'; + +$userToolbar = $kanbanTest->getPageToolBarTest($activeKanban); -$toolbar1 = $tester->kanban->getPageToolBar($kanban1); su('admin'); -$toolbar2 = $tester->kanban->getPageToolBar($kanban2); +$adminToolbar = $kanbanTest->getPageToolBarTest($activeKanban); +$closedKanbanToolbar = $kanbanTest->getPageToolBarTest($closedKanban); -r(strlen($toolbar1)) && p('') && e('161'); // 查看普通用户获取操作按钮的字符长度 -r(strlen($toolbar2)) && p('') && e('1282'); // 查看管理员获取操作按钮的字符长度 \ No newline at end of file +r(strlen($userToolbar)) && p() && e('161'); +r(strlen($adminToolbar) > strlen($userToolbar)) && p() && e('1'); +r(strpos($closedKanbanToolbar, '激活看板') !== false) && p() && e('1'); +r(strpos($adminToolbar, 'icon-fullscreen') !== false) && p() && e('1'); +r(strpos($adminToolbar, '设置') !== false) && p() && e('1'); \ No newline at end of file