From 24e2138aef1d71ce1441ed948eec1fb45468386a Mon Sep 17 00:00:00 2001 From: zhouxin Date: Mon, 16 May 2022 00:46:04 +0000 Subject: [PATCH 1/2] Add testcase. --- test/class/block.class.php | 12 ++++++++---- test/model/block/getqastatisticparams.php | 3 ++- test/model/block/getrecentprojectparams.php | 19 ------------------- test/model/block/getreleaseparams.php | 2 +- test/model/block/getscrumlistparams.php | 6 +++++- 5 files changed, 16 insertions(+), 26 deletions(-) delete mode 100755 test/model/block/getrecentprojectparams.php diff --git a/test/class/block.class.php b/test/class/block.class.php index 673575a26c..310bc9512c 100644 --- a/test/class/block.class.php +++ b/test/class/block.class.php @@ -287,7 +287,9 @@ class blockTest if(dao::isError()) return dao::getError(); - return $objects; + $objects = json_decode($objects); + + return $objects->count; } public function getProjectParamsTest() @@ -402,11 +404,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() @@ -574,7 +576,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..af48613636 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 From 9556bc3e9b27c8472e994c9117a627e73c4b560c Mon Sep 17 00:00:00 2001 From: zhouxin Date: Mon, 16 May 2022 00:51:58 +0000 Subject: [PATCH 2/2] Adjust code. --- test/model/block/getreleaseparams.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/model/block/getreleaseparams.php b/test/model/block/getreleaseparams.php index af48613636..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('name,default,control') && e('数量,20,input'); //测试name +r($block->getReleaseParamsTest()) && p('name,default,control') && e('数量,20,input'); //测试name