diff --git a/test/class/block.class.php b/test/class/block.class.php index 66a9caa8c1..8b61f69ee6 100644 --- a/test/class/block.class.php +++ b/test/class/block.class.php @@ -306,7 +306,9 @@ class blockTest if(dao::isError()) return dao::getError(); - return $objects; + $objects = json_decode($objects); + + return $objects->count; } public function getProjectParamsTest() @@ -428,11 +430,11 @@ class blockTest public function getQaStatisticParamsTest() { - $objects = $this->objectModel->getQaStatisticParams(); + $object = $this->objectModel->getQaStatisticParams(); if(dao::isError()) return dao::getError(); - return $objects; + return json_decode($object); } public function getRecentProjectParamsTest() @@ -606,7 +608,9 @@ class blockTest if(dao::isError()) return dao::getError(); - return $objects; + $objects = json_decode($objects); + + return $objects->type; } public function getScrumOverviewParamsTest($module = '') diff --git a/test/model/block/getqastatisticparams.php b/test/model/block/getqastatisticparams.php index 280c2e7981..e3567adbb4 100755 --- a/test/model/block/getqastatisticparams.php +++ b/test/model/block/getqastatisticparams.php @@ -16,4 +16,5 @@ pid=1 $block = new blockTest(); -r($block->getQaStatisticParamsTest()) && p() && e(); \ No newline at end of file +r($block->getQaStatisticParamsTest()) && p('type:name') && e('类型'); //测试name +r($block->getQaStatisticParamsTest()) && p('type:control') && e('select');//测试control diff --git a/test/model/block/getrecentprojectparams.php b/test/model/block/getrecentprojectparams.php deleted file mode 100755 index 60b18810b3..0000000000 --- a/test/model/block/getrecentprojectparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getRecentProjectParams(); -cid=1 -pid=1 - - - -*/ - -$block = new blockTest(); - -r($block->getRecentProjectParamsTest()) && p() && e(); \ No newline at end of file diff --git a/test/model/block/getreleaseparams.php b/test/model/block/getreleaseparams.php index 03cd0771f3..a88bbaff46 100755 --- a/test/model/block/getreleaseparams.php +++ b/test/model/block/getreleaseparams.php @@ -16,4 +16,4 @@ pid=1 $block = new blockTest(); -r($block->getReleaseParamsTest()) && p() && e(); \ No newline at end of file +r($block->getReleaseParamsTest()) && p('name,default,control') && e('数量,20,input'); //测试name diff --git a/test/model/block/getscrumlistparams.php b/test/model/block/getscrumlistparams.php index b113738a27..d6469a1283 100755 --- a/test/model/block/getscrumlistparams.php +++ b/test/model/block/getscrumlistparams.php @@ -16,4 +16,8 @@ pid=1 $block = new blockTest(); -r($block->getScrumListParamsTest()) && p() && e(); \ No newline at end of file +r($block->getScrumListParamsTest()) && p('name,control') && e('类型,select'); //测试name和select +r($block->getScrumListParamsTest()) && p('options:undone') && e('未完成'); //测试options +r($block->getScrumListParamsTest()) && p('options:doing') && e('进行中'); //测试options +r($block->getScrumListParamsTest()) && p('options:all') && e('全部'); //测试options +r($block->getScrumListParamsTest()) && p('options:involved') && e('我参与'); //测试options