From 990946784d60586498e696a3fb226c7d22b79637 Mon Sep 17 00:00:00 2001 From: sunjun Date: Fri, 20 May 2022 06:16:39 +0000 Subject: [PATCH 1/2] add getAssignedByMeTest --- test/class/my.class.php | 20 ++++++++++++++++++++ test/model/my/getassignedbyme.php | 28 ++++++++++++++++++++++++++++ 2 files changed, 48 insertions(+) create mode 100755 test/model/my/getassignedbyme.php diff --git a/test/class/my.class.php b/test/class/my.class.php index 0a42cf82a3..c660b7e0da 100644 --- a/test/class/my.class.php +++ b/test/class/my.class.php @@ -82,4 +82,24 @@ class myTest return $objects; } + + public function getAssignedByMeTest($account, $limit, $pager, $orderBy, $projectID, $objectType) + { + global $tester; + $recTotal = 0; + $recPerPage = 20; + $pageID = 0; + $tester->app->loadClass('pager', $static = true); + $pager = new pager($recTotal, $recPerPage, $pageID); + + $actionID = $tester->loadModel('action')->create('task', 6, 'assigned', '', '', 'admin', ''); + $actionID = $tester->loadModel('action')->create('bug', 6, 'assigned', '', '', 'admin', ''); + $actionID = $tester->loadModel('action')->create('story', 5, 'assigned', '', '', 'admin', ''); + $objects = $this->objectModel->getAssignedByMe($account, $limit, $pager, $orderBy, $projectID, $objectType); + + if(dao::isError()) return dao::getError(); + + return count($objects); + } + } diff --git a/test/model/my/getassignedbyme.php b/test/model/my/getassignedbyme.php new file mode 100755 index 0000000000..4500a6388b --- /dev/null +++ b/test/model/my/getassignedbyme.php @@ -0,0 +1,28 @@ +#!/usr/bin/env php +getAssignedByMe(); +cid=1 +pid=1 + +当插入一条action为admin指派了task的动态时,查询结果为1条数据 >> 1 +当插入一条action为admin指派了bug的动态时,查询结果为1条数据 >> 1 +当插入一条action为admin指派了需求的动态时,查询结果为1条数据 >> 1 + +*/ + +$my = new myTest(); +$task = array('admin', 0, '', 'id_desc', 0, 'task'); +$bug = array('admin', 0, '', 'id_desc', 0, 'bug'); +$story = array('admin', 0, '', 'id_desc', 0, 'story'); + +r($my->getAssignedByMeTest($task[0], $task[1], $task[2], $task[3], $task[4], $task[5])) && p() && e('1'); // 当插入一条action为admin指派了task的动态时,查询结果为1条数据 +r($my->getAssignedByMeTest($bug[0], $bug[1], $bug[2], $bug[3], $bug[4], $bug[5])) && p() && e('1'); // 当插入一条action为admin指派了bug的动态时,查询结果为1条数据 +r($my->getAssignedByMeTest($story[0], $story[1], $story[2], $story[3], $story[4], $story[5])) && p() && e('1'); // 当插入一条action为admin指派了需求的动态时,查询结果为1条数据 + +system("./ztest init"); From adf3ad1e975730e577f27be1ce39bb12eeed655b Mon Sep 17 00:00:00 2001 From: sunjun Date: Fri, 20 May 2022 08:06:30 +0000 Subject: [PATCH 2/2] sprint_sunjun_test --- test/class/my.class.php | 12 ++++++++++++ test/model/my/getassignedbyme.php | 14 +++++++------- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/test/class/my.class.php b/test/class/my.class.php index c660b7e0da..6055b70091 100644 --- a/test/class/my.class.php +++ b/test/class/my.class.php @@ -83,6 +83,18 @@ class myTest return $objects; } + /** + * Function getAssignedByMe test by my + * + * @param string $account + * @param int $limit + * @param int $pager + * @param string $orderBy + * @param int $projectID + * @param string $objectType + * @access public + * @return int + */ public function getAssignedByMeTest($account, $limit, $pager, $orderBy, $projectID, $objectType) { global $tester; diff --git a/test/model/my/getassignedbyme.php b/test/model/my/getassignedbyme.php index 4500a6388b..02de7a0c09 100755 --- a/test/model/my/getassignedbyme.php +++ b/test/model/my/getassignedbyme.php @@ -16,13 +16,13 @@ pid=1 */ -$my = new myTest(); -$task = array('admin', 0, '', 'id_desc', 0, 'task'); -$bug = array('admin', 0, '', 'id_desc', 0, 'bug'); -$story = array('admin', 0, '', 'id_desc', 0, 'story'); +$my = new myTest(); +$task = array('admin', 0, '', 'id_desc', 0, 'task'); +$bug = array('admin', 0, '', 'id_desc', 0, 'bug'); +$story = array('admin', 0, '', 'id_desc', 0, 'story'); -r($my->getAssignedByMeTest($task[0], $task[1], $task[2], $task[3], $task[4], $task[5])) && p() && e('1'); // 当插入一条action为admin指派了task的动态时,查询结果为1条数据 -r($my->getAssignedByMeTest($bug[0], $bug[1], $bug[2], $bug[3], $bug[4], $bug[5])) && p() && e('1'); // 当插入一条action为admin指派了bug的动态时,查询结果为1条数据 -r($my->getAssignedByMeTest($story[0], $story[1], $story[2], $story[3], $story[4], $story[5])) && p() && e('1'); // 当插入一条action为admin指派了需求的动态时,查询结果为1条数据 +r($my->getAssignedByMeTest($task[0], $task[1], $task[2], $task[3], $task[4], $task[5])) && p() && e('1'); // 当插入一条action为admin指派了task的动态时,查询结果为1条数据 +r($my->getAssignedByMeTest($bug[0], $bug[1], $bug[2], $bug[3], $bug[4], $bug[5])) && p() && e('1'); // 当插入一条action为admin指派了bug的动态时,查询结果为1条数据 +r($my->getAssignedByMeTest($story[0], $story[1], $story[2], $story[3], $story[4], $story[5])) && p() && e('1'); // 当插入一条action为admin指派了需求的动态时,查询结果为1条数据 system("./ztest init");