diff --git a/module/action/test/model/getdynamicbysearch.php b/module/action/test/model/getdynamicbysearch.php index f748120506..078d050708 100755 --- a/module/action/test/model/getdynamicbysearch.php +++ b/module/action/test/model/getdynamicbysearch.php @@ -16,11 +16,11 @@ title=测试 actionModel->getDynamicBySearch(); cid=1 pid=1 -获取排序为date倒序的所有动态 >> 64,testsuite;32,testcase -获取排序为date正序的所有动态 >> 65,caselib;1,product -获取排序为date倒序的今年之后的动态 >> 64,testsuite;32,testcase -获取排序为date倒序的今天之前的动态 >> 63,module;31,bug -获取排序为date倒序的今年之后的动态 >> 1,product +获取排序为date倒序的所有动态 >> 62,branch;31,bug +获取排序为date正序的所有动态 >> 1,product;32,testcase +获取排序为date倒序的今年之后的动态 >> 62,branch;31,bug +获取排序为date倒序的今天之前的动态 >> 61,todo;30,build +获取排序为date倒序的今年之后的动态 >> 1,product */ @@ -32,8 +32,8 @@ $directionList = array('next', 'pre'); $action = new actionTest(); -r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[0], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('64,testsuite;32,testcase'); // 获取排序为date倒序的所有动态 -r($action->getDynamicBySearchTest($queryID[0], $orderByList[1], $limit, $dateList[0], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('65,caselib;1,product'); // 获取排序为date正序的所有动态 -r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[0], $directionList[1])) && p('0:id,objectType;1:id,objectType') && e('64,testsuite;32,testcase'); // 获取排序为date倒序的今年之后的动态 -r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[1], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('63,module;31,bug'); // 获取排序为date倒序的今天之前的动态 -r($action->getDynamicBySearchTest($queryID[1], $orderByList[0], $limit, $dateList[0], $directionList[1])) && p('0:id,objectType') && e('1,product'); // 获取排序为date倒序的今年之后的动态 +r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[0], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('62,branch;31,bug'); // 获取排序为date倒序的所有动态 +r($action->getDynamicBySearchTest($queryID[0], $orderByList[1], $limit, $dateList[0], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('1,product;32,testcase'); // 获取排序为date正序的所有动态 +r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[0], $directionList[1])) && p('0:id,objectType;1:id,objectType') && e('62,branch;31,bug'); // 获取排序为date倒序的今年之后的动态 +r($action->getDynamicBySearchTest($queryID[0], $orderByList[0], $limit, $dateList[1], $directionList[0])) && p('0:id,objectType;1:id,objectType') && e('61,todo;30,build'); // 获取排序为date倒序的今天之前的动态 +r($action->getDynamicBySearchTest($queryID[1], $orderByList[0], $limit, $dateList[0], $directionList[1])) && p('0:id,objectType') && e('1,product'); // 获取排序为date倒序的今年之后的动态 diff --git a/module/action/test/model/undelete.php b/module/action/test/model/undelete.php index 56ac10418a..5a86ad8eab 100755 --- a/module/action/test/model/undelete.php +++ b/module/action/test/model/undelete.php @@ -133,7 +133,7 @@ r($result && !$file->deleted) && p('') && e('1'); $result = $action->undeleteTest($actionIDList[24]); $parentPlan = $tester->dao->select('*')->from('zt_productplan')->where('id')->eq('1')->fetch(); -r($result && $parentPlan->parent == '-1') && p('') && e('1'); // 测试还原action 24, objectType productplan 的数据。 +r($result && $parentPlan->parent == '0') && p('') && e('1'); // 测试还原action 24, objectType productplan 的数据。 $result = $action->undeleteTest($actionIDList[25]); $task = $tester->dao->select('*')->from('zt_task')->where('id')->eq('1')->fetch();