From af9a2f108cac9ce96d2d3d887a72d85313dd44cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=94=B0=E6=B7=91=E6=9D=B0?= Date: Thu, 5 Jan 2023 14:21:53 +0800 Subject: [PATCH] * Add case for program model. --- test/class/program.class.php | 12 ++++++++ test/model/program/getchildren.php | 6 ++-- test/model/program/getinvolvedprograms.php | 33 ++++++++++++++-------- 3 files changed, 36 insertions(+), 15 deletions(-) diff --git a/test/class/program.class.php b/test/class/program.class.php index c65d29e731..27412bcd18 100644 --- a/test/class/program.class.php +++ b/test/class/program.class.php @@ -174,4 +174,16 @@ class programTest { return $this->program->isClickable($programID, $status); } + + /** + * get involved programs. + * + * @param string $account + * @access public + * @return array + */ + public function getInvolvedProgramsTest($account) + { + return $this->program->getInvolvedPrograms($account); + } } diff --git a/test/model/program/getchildren.php b/test/model/program/getchildren.php index d22267f467..19605353f6 100755 --- a/test/model/program/getchildren.php +++ b/test/model/program/getchildren.php @@ -8,11 +8,9 @@ $program = zdTable('project'); $program->id->range('1-3'); $program->name->range('父项目集1,子项目集1,子项目集2'); $program->parent->range('0,1,1'); +$program->grade->range('1,2,2'); $program->type->range('program'); -$program->path->setFields(array( - array('field' => 'path1', 'range' => '1', 'prefix' => ',', 'postfix' => ','), - array('field' => 'path2', 'range' => '[],2,3', 'postfix' => ',') -)); +$program->path->range('`,1,`,`,1,2,`,`,1,3,`'); $program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD'); $program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD'); $program->gen(3); diff --git a/test/model/program/getinvolvedprograms.php b/test/model/program/getinvolvedprograms.php index e593aaf7d8..7f5bc688d6 100755 --- a/test/model/program/getinvolvedprograms.php +++ b/test/model/program/getinvolvedprograms.php @@ -1,8 +1,20 @@ #!/usr/bin/env php id->range('1-3'); +$program->name->range('1-3')->prefix('项目集'); +$program->type->range('program'); +$program->path->range('1-3')->prefix(',')->postfix(','); +$program->grade->range('1'); +$program->openedBy->range('admin,test1'); +$program->begin->range('20220112 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->end->range('20220212 000000:0')->type('timestamp')->format('YY/MM/DD'); +$program->gen(3); + /** title=测试 programModel::getInvolvedPrograms(); @@ -10,18 +22,17 @@ cid=1 pid=1 获取admin参与的项目集数量 >> 2 -获取test2参与的项目集数量 >> 1 -获取admin参与的项目集ID >> 10 -获取test2参与的项目集ID >> 1 +获取test1参与的项目集数量 >> 1 +获取admin参与的项目集ID >> 1 +获取test1参与的项目集ID >> 2 */ -global $tester; -$tester->loadModel('program'); -$adminPrograms = $tester->program->getInvolvedPrograms('admin'); -$test2Programs = $tester->program->getInvolvedPrograms('test2'); +$programTester = new programTest(); +$adminPrograms = $programTester->getInvolvedProgramsTest('admin'); +$test1Programs = $programTester->getInvolvedProgramsTest('test1'); -r(count($adminPrograms)) && p() && e('2'); // 获取admin参与的项目集数量 -r(count($test2Programs)) && p() && e('1'); // 获取test2参与的项目集数量 -r($adminPrograms) && p('10') && e('10'); // 获取admin参与的项目集ID -r($test2Programs) && p('1') && e('1'); // 获取test2参与的项目集ID \ No newline at end of file +r(count($adminPrograms)) && p() && e('2'); // 获取admin参与的项目集数量 +r(count($test1Programs)) && p() && e('1'); // 获取test1参与的项目集数量 +r($adminPrograms) && p('1') && e('1'); // 获取admin参与的项目集ID +r($test1Programs) && p('2') && e('2'); // 获取test1参与的项目集ID