diff --git a/test/class/user.class.php b/test/class/user.class.php index f044ba0db2..2d562ddf00 100755 --- a/test/class/user.class.php +++ b/test/class/user.class.php @@ -893,6 +893,24 @@ class userTest return $this->objectModel->getProgramAuthedUsers($program, $stakeholders, $whiteList, $admins); } + /** + * getSprintAuthedUsersTest + * + * @param int $sprintID + * @param array $stakeholders + * @param array $teams + * @param array $whiteList + * @param array $admins + * @access public + * @return void + */ + public function getSprintAuthedUsersTest($sprintID, $stakeholders, $teams, $whiteList, $admins) + { + global $tester; + $sprint = $tester->loadModel('execution')->getByID($sprintID); + return $this->objectModel->getSprintAuthedUsers($sprint, $stakeholders, $teams, $whiteList, $admins); + } + /** * Test get product view list users. * @@ -903,11 +921,11 @@ class userTest * @access public * @return void */ - public function getProductViewListUsersTest($productID, $teams, $stakeholders, $whiteList) + public function getProductViewListUsersTest($productID, $teams, $stakeholders, $whiteList, $admins) { global $tester; $product = $tester->loadModel('product')->getByID($productID); - return $this->objectModel->getProductViewListUsers($product, $teams, $stakeholders, $whiteList); + return $this->objectModel->getProductViewListUsers($product, $teams, $stakeholders, $whiteList, $admins); } /** @@ -920,7 +938,7 @@ class userTest * @access public * @return void */ - public function getTeamMemberPairsTest($objectID, $type, $params, $usersToAppended) + public function getTeamMemberPairsTest($objectID, $type, $params = '', $usersToAppended = array()) { return $this->objectModel->getTeamMemberPairs($objectID, $type, $params, $usersToAppended); } @@ -946,9 +964,9 @@ class userTest * * @param string $type * @access public - * @return void + * @return array */ - public function getUserTemplates($type) + public function getUserTemplatesTest($type) { return $this->objectModel->getUserTemplates($type); } @@ -1105,4 +1123,22 @@ class userTest { return $this->objectModel->identifyByCookie(); } + + /** + * test of isClickable. + * + * @param int $userID + * @param string $action + * @access public + * @return bool + */ + public function isClickableTest($userID, $action = '') + { + global $tester; + + $user = $tester->loadModel('user')->getById($userID, 'id'); + if($userID == 10) $user->ranzhi = ''; + + return $this->objectModel->isClickable($user, $action); + } } diff --git a/test/model/user/getcancreatestoryusers.php b/test/model/user/getcancreatestoryusers.php index 1121d5c858..548acdea49 100755 --- a/test/model/user/getcancreatestoryusers.php +++ b/test/model/user/getcancreatestoryusers.php @@ -2,6 +2,7 @@ gen(1000); su('admin'); /** @@ -10,9 +11,9 @@ title=测试 userModel->getCanCreateStoryUsers(); cid=1 pid=1 -查找系统中有权限创建、批量创建需求的用户 >> A:admin;T:产品主管48 +查找系统中有权限创建、批量创建需求的用户 >> A:admin;T:研发主管48 */ $user = new userTest(); -r($user->getCanCreateStoryUsersTest()) && p('admin;td48') && e('A:admin;T:产品主管48'); //查找系统中有权限创建、批量创建需求的用户 \ No newline at end of file +r($user->getCanCreateStoryUsersTest()) && p('admin;td48') && e('A:admin;T:研发主管48'); //查找系统中有权限创建、批量创建需求的用户 \ No newline at end of file diff --git a/test/model/user/getpersonaldata.php b/test/model/user/getpersonaldata.php index 741dd421f7..f685b83216 100755 --- a/test/model/user/getpersonaldata.php +++ b/test/model/user/getpersonaldata.php @@ -2,6 +2,11 @@ gen(500); +zdTable('story')->gen(400); +zdTable('case')->gen(400); +zdTable('bug')->gen(300); + su('admin'); /** @@ -10,9 +15,9 @@ title=测试 userModel::getPersonalData(); cid=1 pid=1 -获取admin用户的createdBugs数量 >> 270 +获取admin用户的createdBugs数量 >> 30 获取test2用户createdCases数量 >> 4 -当获取一个空用户的数据时，系统默认返回当前登录用户的数据 >> 2 +当获取一个空用户的数据时，系统默认返回当前登录用户的数据 >> 3 */ $user = new userTest(); @@ -20,6 +25,6 @@ $adminData = $user->getPersonalDataTest('admin'); $test2Data = $user->getPersonalDataTest('test2'); $emptyData = $user->getPersonalDataTest(''); -r($adminData) && p('createdBugs') && e('270'); //获取admin用户的createdBugs数量 +r($adminData) && p('createdBugs') && e('30'); //获取admin用户的createdBugs数量 r($test2Data) && p('createdCases') && e('4'); //获取test2用户createdCases数量 -r($emptyData) && p('createdTodos') && e('2'); //当获取一个空用户的数据时，系统默认返回当前登录用户的数据 \ No newline at end of file +r($emptyData) && p('createdTodos') && e('3'); //当获取一个空用户的数据时，系统默认返回当前登录用户的数据 \ No newline at end of file diff --git a/test/model/user/getproductviewlistusers.php b/test/model/user/getproductviewlistusers.php index a2b34ef1e8..23e12a7a5c 100755 --- a/test/model/user/getproductviewlistusers.php +++ b/test/model/user/getproductviewlistusers.php @@ -2,6 +2,8 @@ gen(10); +zdTable('user')->gen(100); su('admin'); /** @@ -14,6 +16,7 @@ pid=1 获取对ID为1的产品有权限的用户 >> test9 获取对ID为1的产品有权限的用户 >> admin 获取对ID为2的产品有权限的用户 >> astaw +获取对ID为2的产品有权限的用户 >> test20 */ @@ -28,7 +31,11 @@ $whiteList['user35'] = 'user35'; $whiteList['user35'] = 'user35'; $whiteList['astaw'] = 'astaw'; -r(count($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList))) && p() && e('11'); //获取对ID为1的产品有权限的用户 -r($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList)) && p('test9') && e('test9'); //获取对ID为1的产品有权限的用户 -r($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList)) && p('admin') && e('admin'); //获取对ID为1的产品有权限的用户 -r($user->getProductViewListUsersTest(2, $stakeholders, $teams, $whiteList)) && p('astaw') && e('astaw'); //获取对ID为2的产品有权限的用户 \ No newline at end of file +$admins['test20'] = 'test20'; +$admins['test21'] = 'test21'; + +r(count($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList, array()))) && p() && e('11'); //获取对ID为1的产品有权限的用户 +r($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList, array())) && p('test9') && e('test9'); //获取对ID为1的产品有权限的用户 +r($user->getProductViewListUsersTest(1, $stakeholders, $teams, $whiteList, array())) && p('admin') && e('admin'); //获取对ID为1的产品有权限的用户 +r($user->getProductViewListUsersTest(2, $stakeholders, $teams, $whiteList, array())) && p('astaw') && e('astaw'); //获取对ID为2的产品有权限的用户 +r($user->getProductViewListUsersTest(2, $stakeholders, $teams, $whiteList, $admins)) && p('test20') && e('test20'); //获取对ID为2的产品有权限的用户 \ No newline at end of file diff --git a/test/model/user/getsprintauthedusers.php b/test/model/user/getsprintauthedusers.php new file mode 100755 index 0000000000..cffb119ef7 --- /dev/null +++ b/test/model/user/getsprintauthedusers.php @@ -0,0 +1,38 @@ +#!/usr/bin/env php +gen(300, 'execution'); +zdTable('user')->gen(200); +su('admin'); + +/** + +title=测试 userModel->getSprintAuthedUsers(); +cid=1 +pid=1 + +获取对ID为101的执行有权限的用户 >> test9 +获取对ID为101的执行有权限的用户 >> admin +获取对ID为201的执行有权限的用户 >> astaw +获取对ID为201的执行有权限的用户 >> test21 + +*/ +$user = new userTest(); +$stakeholders['test9'] = 'test9'; +$stakeholders['test10'] = 'test10'; + +$teams['pm7'] = 'pm7'; +$teams['pm8'] = 'pm8'; + +$whiteList['user35'] = 'user35'; +$whiteList['user35'] = 'user35'; +$whiteList['astaw'] = 'astaw'; + +$admins['test20'] = 'test20'; +$admins['test21'] = 'test21'; + +r($user->getSprintAuthedUsersTest(101, $stakeholders, $teams, $whiteList, array())) && p('test9') && e('test9'); //获取对ID为101的执行有权限的用户 +r($user->getSprintAuthedUsersTest(101, $stakeholders, $teams, $whiteList, array())) && p('admin') && e('admin'); //获取对ID为101的执行有权限的用户 +r($user->getSprintAuthedUsersTest(201, $stakeholders, $teams, $whiteList, array())) && p('astaw') && e('astaw'); //获取对ID为201的执行有权限的用户 +r($user->getSprintAuthedUsersTest(201, $stakeholders, $teams, $whiteList, $admins)) && p('test21') && e('test21'); //获取对ID为201的执行有权限的用户 \ No newline at end of file diff --git a/test/model/user/getteammemberpairs.php b/test/model/user/getteammemberpairs.php index 2465a1663a..6d38e65314 100755 --- a/test/model/user/getteammemberpairs.php +++ b/test/model/user/getteammemberpairs.php @@ -2,6 +2,9 @@ gen(10); +zdTable('team')->gen(400); +zdTable('user')->gen(1000); su('admin'); /** @@ -12,6 +15,7 @@ pid=1 获取ID为11的项目的团队成员数量 >> 3 获取ID为11的项目的团队成员数量，追加用户test2 >> 4 +获取ID为11的项目的团队成员数量，追加用户test2 >> project 获取ID为110的执行的团队成员成员 >> T:测试1 */ @@ -19,5 +23,6 @@ pid=1 $user = new userTest(); r(count($user->getTeamMemberPairsTest(11, 'project'))) && p() && e('3'); //获取ID为11的项目的团队成员数量 -r(count($user->getTeamMemberPairsTest(11, 'project', '', array('test2')))) && p() && e('4'); //获取ID为11的项目的团队成员数量，追加用户test2 -r($user->getTeamMemberPairsTest(110, 'execution')) && p('test1') && e('T:测试1'); //获取ID为110的执行的团队成员成员 \ No newline at end of file +r(count($user->getTeamMemberPairsTest(11, 'project', '', array('test2')))) && p() && e('4') && zdTable('project')->gen(100, 'execution' );//获取ID为11的项目的团队成员数量，追加用户test2 +zdTable('project')->gen(100, 'execution' ); +r($user->getTeamMemberPairsTest(110, 'execution')) && p('test1') && e('T:测试1'); //获取ID为110的执行的团队成员成员 diff --git a/test/model/user/getuserdetailsforapi.php b/test/model/user/getuserdetailsforapi.php index 171028a760..155c839af3 100755 --- a/test/model/user/getuserdetailsforapi.php +++ b/test/model/user/getuserdetailsforapi.php @@ -2,6 +2,7 @@ gen(500); su('admin'); /** @@ -10,7 +11,7 @@ title=测试 userModel::getUserDetailsForAPI(); cid=1 pid=1 -获取admin用户的url >> guser-profile-1. +获取admin用户的url >> getuserdetailsforapi 获取test2用户的真实姓名 >> 测试2 获取user10的头像信息 >> http:///home/z/tmp/10.png @@ -19,6 +20,6 @@ $user = new userTest(); $userList = array('admin', 'test2', 'user10', ''); $users = $user->getUserDetailsForAPITest($userList); -r($users) && p('admin:url') && e('guser-profile-1.'); //获取admin用户的url +r($users) && p('admin:url') && e('getuserdetailsforapi'); //获取admin用户的url r($users) && p('test2:realname') && e('测试2'); //获取test2用户的真实姓名 r($users) && p('user10:avatar') && e('http:///home/z/tmp/10.png'); //获取user10的头像信息 \ No newline at end of file diff --git a/test/model/user/getusertemplates.php b/test/model/user/getusertemplates.php index 74e7f78ab9..f3a55414c1 100755 --- a/test/model/user/getusertemplates.php +++ b/test/model/user/getusertemplates.php @@ -2,6 +2,8 @@ gen(10); +zdTable('user')->gen(1000); su('admin'); /** @@ -10,9 +12,16 @@ title=测试 userModel::getUserTemplates(); cid=1 pid=1 - +查询当前用户能够使用的exporttask类型的模板 >> admin +查询当前用户能够使用的story类型的模板 >> dev10 +查询当前用户能够使用的exportbug类型的模板 >> 0 +查询当前用户能够使用的exportstory类型的模板 >> test10 */ -$user = new userTest(); +$typeList = array('exporttask', 'story', 'exportbug', 'exportstory'); -//r() && p('') && e(''); // \ No newline at end of file +$user = new userTest(); +r($user->getUserTemplatesTest($typeList[0])) && p('0:account') && e('admin'); //查询当前用户能够使用的exporttask类型的模板 +r($user->getUserTemplatesTest($typeList[1])) && p('0:account') && e('dev10'); //查询当前用户能够使用的story类型的模板 +r($user->getUserTemplatesTest($typeList[2])) && p('0:account') && e('0'); //查询当前用户能够使用的exportbug类型的模板 +r($user->getUserTemplatesTest($typeList[3])) && p('0:account') && e('test10'); //查询当前用户能够使用的exportstory类型的模板 \ No newline at end of file diff --git a/test/model/user/isclickable.php b/test/model/user/isclickable.php new file mode 100755 index 0000000000..6468463fae --- /dev/null +++ b/test/model/user/isclickable.php @@ -0,0 +1,34 @@ +#!/usr/bin/env php +gen(10); + +/** + +title=测试 userModel::getById(); +cid=1 +pid=1 + +判断用户id为1，action为空时，是否可点击 >> 1 +判断用户id为1，action为unbind，是否可点击 >> 1 +判断用户id为1，action为unlock，是否可点击 >> 0 +判断用户id为1，action为undefind，是否可点击 >> 1 +判断用户id为10，action为unbind，是否可点击 >> 0 +判断用户id为10，action为unlock，是否可点击 >> 0 + +*/ +$actionList[0] = 'unbind'; +$actionList[1] = 'unlock'; +$actionList[2] = 'undefind'; + +$user = new userTest(); + +r($user->isClickableTest(1)) && p() && e('1'); // 判断用户id为1，action为空时，是否可点击 +r($user->isClickableTest(1, $actionList[0])) && p() && e('1'); // 判断用户id为1，action为unbind，是否可点击 +r($user->isClickableTest(1, $actionList[1])) && p() && e('0'); // 判断用户id为1，action为unlock，是否可点击 +r($user->isClickableTest(1, $actionList[2])) && p() && e('1'); // 判断用户id为1，action为undefind，是否可点击 +r($user->isClickableTest(10,$actionList[0])) && p() && e('0'); // 判断用户id为10，action为unbind，是否可点击 +r($user->isClickableTest(10,$actionList[1])) && p() && e('0'); // 判断用户id为10，action为unlock，是否可点击 \ No newline at end of file diff --git a/test/model/user/processaccountsort.php b/test/model/user/processaccountsort.php index bd06572e5e..c99b08a089 100755 --- a/test/model/user/processaccountsort.php +++ b/test/model/user/processaccountsort.php @@ -2,6 +2,7 @@ gen(500); su('admin'); /** @@ -20,5 +21,4 @@ $admin = array( 'role' => 'qa', 'realname' => 'admin' ); -a($user->processAccountSortTest(array('admin'=>$admin)));exit; r($user->processAccountSortTest(array('admin'=>$admin))) && p('admin:account,role') && e('admin,qa'); //获取当前用户信息 \ No newline at end of file diff --git a/test/model/user/saveusertemplate.php b/test/model/user/saveusertemplate.php index 451319d6cb..4f344efe75 100755 --- a/test/model/user/saveusertemplate.php +++ b/test/model/user/saveusertemplate.php @@ -2,7 +2,8 @@ switchDB(); +zdTable('usertpl')->gen(10); +zdTable('user')->gen(500); su('admin'); /** @@ -42,6 +43,4 @@ $tpls3 = $user->saveUserTemplate('task'); r(count($tpls1)) && p() && e('1'); //插入一条Bug用户模板，查看数量 r(count($tpls3)) && p() && e('2'); //插入两条任务类型的用户模板，查看数量 r($tpls2) && p('0:title') && e('Admin的模板二'); //查看插入的模板二的名字 -r($tpls2) && p('0:content') && e('

这是一段模板内容

'); //查看插入的模板二的内容 - -$db->restoreDB(); \ No newline at end of file +r($tpls2) && p('0:content') && e('

这是一段模板内容

'); //查看插入的模板二的内容 \ No newline at end of file