From 0372a1a7ac75df7c09dbc7ddd69ed648214cd4dc Mon Sep 17 00:00:00 2001 From: Wangyuting <851424971@qq.com> Date: Mon, 8 May 2023 17:52:17 +0800 Subject: [PATCH] * Add block test. --- module/block/model.php | 43 --------- module/block/test/model/appendcountparams.php | 37 -------- module/block/test/model/checkapi.php | 15 +-- module/block/test/model/create.php | 67 +++++++------- .../block/test/model/getassigntomeparams.php | 26 ------ module/block/test/model/getblock.php | 26 ------ module/block/test/model/getblocklist.php | 21 ----- module/block/test/model/getbugparams.php | 23 ----- module/block/test/model/getbuildparams.php | 20 ---- module/block/test/model/getbyid.php | 30 +++--- module/block/test/model/getcaseparams.php | 23 ----- .../block/test/model/getexecutionparams.php | 20 ---- .../model/getexecutionstatisticparams.php | 20 ---- module/block/test/model/gethiddenblocks.php | 19 ---- module/block/test/model/getlastkey.php | 23 ----- module/block/test/model/getlistparams.php | 26 ------ module/block/test/model/getplanparams.php | 19 ---- module/block/test/model/getproductparams.php | 19 ---- .../test/model/getproductstatisticparams.php | 19 ---- .../test/model/getprojectdynamicparams.php | 18 ---- module/block/test/model/getprojectparams.php | 18 ---- .../test/model/getprojectstatisticparams.php | 19 ---- .../block/test/model/getprojectteamparams.php | 19 ---- .../block/test/model/getqastatisticparams.php | 21 ----- module/block/test/model/getreleaseparams.php | 19 ---- .../block/test/model/getscrumlistparams.php | 27 ------ .../test/model/getscrumproductparams.php | 19 ---- .../test/model/getscrumroadmapparams.php | 19 ---- .../block/test/model/getscrumtestparams.php | 19 ---- .../block/test/model/getstatisticparams.php | 34 ------- module/block/test/model/getstoryparams.php | 19 ---- module/block/test/model/gettaskparams.php | 19 ---- module/block/test/model/gettesttaskparams.php | 19 ---- module/block/test/model/gettodoparams.php | 19 ---- .../test/model/getwaterfallissueparams.php | 19 ---- .../test/model/getwaterfallriskparams.php | 19 ---- module/block/test/model/save.php | 56 ----------- module/block/test/model/update.php | 92 ++++++++++++------- test/data/block.yaml | 22 ----- test/data/zt_block.sql | 35 ------- test/data/zt_block.yaml | 76 --------------- test/devdata/block.yaml | 26 ------ 42 files changed, 119 insertions(+), 1030 deletions(-) delete mode 100755 module/block/test/model/appendcountparams.php delete mode 100755 module/block/test/model/getassigntomeparams.php delete mode 100755 module/block/test/model/getblock.php delete mode 100755 module/block/test/model/getblocklist.php delete mode 100755 module/block/test/model/getbugparams.php delete mode 100755 module/block/test/model/getbuildparams.php delete mode 100755 module/block/test/model/getcaseparams.php delete mode 100755 module/block/test/model/getexecutionparams.php delete mode 100755 module/block/test/model/getexecutionstatisticparams.php delete mode 100755 module/block/test/model/gethiddenblocks.php delete mode 100755 module/block/test/model/getlastkey.php delete mode 100755 module/block/test/model/getlistparams.php delete mode 100755 module/block/test/model/getplanparams.php delete mode 100755 module/block/test/model/getproductparams.php delete mode 100755 module/block/test/model/getproductstatisticparams.php delete mode 100755 module/block/test/model/getprojectdynamicparams.php delete mode 100755 module/block/test/model/getprojectparams.php delete mode 100755 module/block/test/model/getprojectstatisticparams.php delete mode 100755 module/block/test/model/getprojectteamparams.php delete mode 100755 module/block/test/model/getqastatisticparams.php delete mode 100755 module/block/test/model/getreleaseparams.php delete mode 100755 module/block/test/model/getscrumlistparams.php delete mode 100755 module/block/test/model/getscrumproductparams.php delete mode 100755 module/block/test/model/getscrumroadmapparams.php delete mode 100755 module/block/test/model/getscrumtestparams.php delete mode 100755 module/block/test/model/getstatisticparams.php delete mode 100755 module/block/test/model/getstoryparams.php delete mode 100755 module/block/test/model/gettaskparams.php delete mode 100755 module/block/test/model/gettesttaskparams.php delete mode 100755 module/block/test/model/gettodoparams.php delete mode 100755 module/block/test/model/getwaterfallissueparams.php delete mode 100755 module/block/test/model/getwaterfallriskparams.php delete mode 100755 module/block/test/model/save.php diff --git a/module/block/model.php b/module/block/model.php index 32764c870f..8b2b1e7e53 100644 --- a/module/block/model.php +++ b/module/block/model.php @@ -370,49 +370,6 @@ class blockModel extends model return true; } - /** - * Save a block. - * - * @param int $blockID - * @param string $type - * @param string $module - * @access public - * @return int|false - */ - public function save(int $blockID, string $type, string $module = 'my'): bool|int - { - $block = $blockID ? $this->getByID($blockID) : null; - $data = fixer::input('post') - ->setIF($blockID, 'id', $blockID) - ->add('account', $this->app->user->account) - ->add('module', $module) - ->add('order', $block ? $block->order : ($this->getMaxOrderByModule($module) + 1)) - ->add('hidden', 0) - ->setDefault('vision', $this->config->vision) - ->setDefault('grid', '4') - ->setDefault('params', array()) - ->stripTags('html', $this->config->allowedTags) - ->remove('uid,actionLink,modules,moduleBlock') - ->get(); - - $data->source = $this->post->moduleBlock ? $this->post->modules : ''; - $data->block = $this->post->moduleBlock ? $this->post->moduleBlock : $this->post->modules; - - if($block) $data->height = $block->height; - if($type == 'html') - { - $uid = $this->post->uid; - $data = $this->loadModel('file')->processImgURL($data, 'html', $uid); - $data->params['html'] = $data->html; - unset($data->html); - unset($_SESSION['album'][$uid]); - } - - $data->params = helper::jsonEncode($data->params); - - $this->dao->replace(TABLE_BLOCK)->data($data)->exec(); - } - /** * Init block when account use first. * 用户首次加载时初始化区块数据. diff --git a/module/block/test/model/appendcountparams.php b/module/block/test/model/appendcountparams.php deleted file mode 100755 index 090fd5968c..0000000000 --- a/module/block/test/model/appendcountparams.php +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env php -appendCountParams(); -cid=1 -pid=1 - -测试新增count param >> count:{name:数量,default:20,control:input}; -测试新增count param 和 param test >> test:test;count:{name:数量,default:20,control:input}; -测试新增count param 和 param par >> par:par;count:{name:数量,default:20,control:input}; -测试新增count param 和 param append >> append:append;count:{name:数量,default:20,control:input}; -测试新增count param 和 param 空 >> count:{name:数量,default:20,control:input}; - -*/ -$param1 = new stdclass(); -$param1->test = 'test'; - -$param2 = new stdclass(); -$param2->par = 'par'; - -$param3 = new stdclass(); -$param3->append = 'append'; - -$param4 = new stdclass(); - -$block = new blockTest(); - -r($block->appendCountParamsTest()) && p() && e('count:{name:数量,default:20,control:input};'); // 测试新增count param -r($block->appendCountParamsTest($param1)) && p() && e('test:test;count:{name:数量,default:20,control:input};'); // 测试新增count param 和 param test -r($block->appendCountParamsTest($param2)) && p() && e('par:par;count:{name:数量,default:20,control:input};'); // 测试新增count param 和 param par -r($block->appendCountParamsTest($param3)) && p() && e('append:append;count:{name:数量,default:20,control:input};'); // 测试新增count param 和 param append -r($block->appendCountParamsTest($param4)) && p() && e('count:{name:数量,default:20,control:input};'); // 测试新增count param 和 param 空 \ No newline at end of file diff --git a/module/block/test/model/checkapi.php b/module/block/test/model/checkapi.php index a04fa668ba..6997cd7526 100755 --- a/module/block/test/model/checkapi.php +++ b/module/block/test/model/checkapi.php @@ -19,14 +19,17 @@ function initData() /** title=测试 blockModel->checkAPI(); +timeout=0 cid=1 -pid=1 -测试空哈希值 >> 0 -测试正确的哈希值 >> 1 -测试错误的哈希值 >> 0 +sed: can't read /home/liuruogu/git/zentaopms/test/config/my.php: No such file or directory +- 测试空哈希值 @0 - */ +- 测试正确的哈希值 @1 + +- 测试错误的哈希值 @0 + +*/ initData(); @@ -34,4 +37,4 @@ $block = new blockTest(); r($block->checkAPITest('')) && p('') && e('0'); // 测试空哈希值 r($block->checkAPITest('858640a724c2c981983935eb2bbc4ad8')) && p('') && e('1'); // 测试正确的哈希值 -r($block->checkAPITest('858640a724c2c98198')) && p('') && e('0'); // 测试错误的哈希值 +r($block->checkAPITest('858640a724c2c98198')) && p('') && e('0'); // 测试错误的哈希值 \ No newline at end of file diff --git a/module/block/test/model/create.php b/module/block/test/model/create.php index 9fbb185e38..a5aa0776a4 100755 --- a/module/block/test/model/create.php +++ b/module/block/test/model/create.php @@ -5,61 +5,66 @@ include dirname(__FILE__, 2) . '/block.class.php'; su('admin'); -function initData() -{ - $block = zdTable('block'); - $block->id->range('2'); - $block->account->range('test'); - $block->vision->range('rnd'); - $block->module->range('test'); - $block->title->prefix('区块')->range('2'); - $block->order->range('5'); - - $block->gen(1); -} - /** title=测试 block 模块 model下的 create 方法 timeout=0 cid=39 -- 执行block模块的getByID方法,参数是$newBlockID +- 测试获取正常的block的内容 - 属性account @admin - 属性vision @rnd - 属性dashboard @my - - 属性title @区块123 - - 属性source @my - - 属性block @bug - - 属性order @5 + - 属性module @project + - 属性code @statistic + - 属性title @项目统计区块 + - 属性order @1 -- 执行blockTest模块的create方法,参数是$accoutTooLangBlock,属性account @『所属用户』长度应当不超过『30』,且大于『0』。 +- 测试所属模块为空 @『所属模块』不能为空。 +- 测试所属区块为空 @『区块』不能为空。 +- 测试区块名称为空 @『区块名称』不能为空。 + +- 测试account 字段字符超出长度 @『所属用户』长度应当不超过『30』,且大于『0』。 */ global $tester; $tester->loadModel('block'); -initData(); - $block = new stdclass(); $block->account = 'admin'; $block->vision = 'rnd'; $block->dashboard = 'my'; -$block->title = '区块123'; -$block->order = '5'; +$block->module = 'project'; +$block->code = 'statistic'; +$block->title = '项目统计区块'; +$block->order = '1'; -$accoutTooLangBlock = new stdclass(); -$accoutTooLangBlock->account = 'adminadminadminadminadminadminadminadmin1'; -$accoutTooLangBlock->vision = 'rnd'; -$accoutTooLangBlock->dashboard = 'my'; -$accoutTooLangBlock->title = 'long account'; -$accoutTooLangBlock->order = '5'; +$accountTooLangBlock = new stdclass(); +$accountTooLangBlock->account = 'adminadminadminadminadminadminadminadmin1'; +$accountTooLangBlock->vision = 'rnd'; +$accountTooLangBlock->dashboard = 'my'; +$accountTooLangBlock->module = 'project'; +$accountTooLangBlock->code = 'statistic'; +$accountTooLangBlock->title = '项目统计区块2'; +$accountTooLangBlock->order = '2'; + +$emptyModuleBlock = new stdclass(); +$emptyModuleBlock->module = ''; + +$emptyCodeBlock = new stdclass(); +$emptyCodeBlock->code = ''; + +$emptyTitleBlock = new stdclass(); +$emptyTitleBlock->title = ''; $blockTest = new blockTest(); $newBlockID = $blockTest->createTest($block); -r($tester->block->getByID($newBlockID)) && p('account,vision,dashboard,title,order') && e('admin,rnd,my,区块123,5'); // 测试获取正常的block的内容 -r($blockTest->createTest($accoutTooLangBlock)) && p('account:0') && e('『所属用户』长度应当不超过『30』,且大于『0』。'); // 测试account 字段字符超出长度 +r($tester->block->getByID($newBlockID)) && p('account,vision,dashboard,module,code,title,order') && e('admin,rnd,my,project,statistic,项目统计区块,1'); // 测试获取正常的block的内容 +r($blockTest->createTest($emptyModuleBlock)) && p('module:0') && e('『所属模块』不能为空。'); // 测试所属模块为空 +r($blockTest->createTest($emptyCodeBlock)) && p('code:0') && e('『区块』不能为空。'); // 测试所属区块为空 +r($blockTest->createTest($emptyTitleBlock)) && p('title:0') && e('『区块名称』不能为空。'); // 测试区块名称为空 +r($blockTest->createTest($accountTooLangBlock)) && p('account:0') && e('『所属用户』长度应当不超过『30』,且大于『0』。'); // 测试account 字段字符超出长度 \ No newline at end of file diff --git a/module/block/test/model/getassigntomeparams.php b/module/block/test/model/getassigntomeparams.php deleted file mode 100755 index e82aeaf37a..0000000000 --- a/module/block/test/model/getassigntomeparams.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getAssignToMeParams(); -cid=1 -pid=1 - -获取当前登陆用户待办的默认参数 >> 待办数,20,input -获取当前登陆用户任务的默认参数 >> 任务数,20,input -获取当前登陆用户Bug的默认参数 >> Bug数,20,input -获取当前登陆用户需求的默认参数 >> 需求数,20,input - -*/ - -$block = new blockTest(); -$data = $block->getAssignToMeParamsTest(); - -r($data) && p('todoCount:name,default,control') && e('待办数,20,input'); // 获取当前登陆用户待办的默认参数 -r($data) && p('taskCount:name,default,control') && e('任务数,20,input'); // 获取当前登陆用户任务的默认参数 -r($data) && p('bugCount:name,default,control') && e('Bug数,20,input'); // 获取当前登陆用户Bug的默认参数 -r($data) && p('storyCount:name,default,control') && e('需求数,20,input'); // 获取当前登陆用户需求的默认参数 \ No newline at end of file diff --git a/module/block/test/model/getblock.php b/module/block/test/model/getblock.php deleted file mode 100755 index 68c8c45db3..0000000000 --- a/module/block/test/model/getblock.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getBlock(); -cid=1 -pid=1 - -测试获取block的所属模块 >> my -测试获取block的名称 >> 项目统计 -测试获取block的来源 >> project -测试获取block的区块 >> statistic - -*/ - -$block = new blockTest(); -$data = $block->getBlockTest(99); - -r($data) && p('module') && e('my'); // 测试获取block的所属模块 -r($data) && p('title') && e('项目统计'); // 测试获取block的名称 -r($data) && p('source') && e('project'); // 测试获取block的来源 -r($data) && p('block') && e('statistic'); // 测试获取block的区块 \ No newline at end of file diff --git a/module/block/test/model/getblocklist.php b/module/block/test/model/getblocklist.php deleted file mode 100755 index 64cc7240ef..0000000000 --- a/module/block/test/model/getblocklist.php +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env php -getBlockList(); -cid=1 -pid=1 - - >> 测试统计;指派给我的Bug;指派给我的用例;待测版本列表 - >> 项目计划;最新计划 - -*/ - -$block = new blockTest(); - -r($block->getBlockListTest('qa')) && p('107:title;108:title;109:title;110:title') && e('测试统计;指派给我的Bug;指派给我的用例;待测版本列表'); -r($block->getBlockListTest('project', 'waterfall')) && p('105:title;106:title') && e('项目计划;最新计划'); \ No newline at end of file diff --git a/module/block/test/model/getbugparams.php b/module/block/test/model/getbugparams.php deleted file mode 100755 index 338a2c3bf8..0000000000 --- a/module/block/test/model/getbugparams.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php -getBugParams(); -cid=1 -pid=1 - -测试通过模块获取Bug区块的参数 >> 数量;类型;排序 -测试通过模块获取Bug区块的参数 >> 数量;类型;排序 - -*/ - -$block = new blockTest(); -$data[0] = $block->getBugParamsTest('qa'); -$data[1] = $block->getBugParamsTest('my'); - -r($data[0]) && p('count:name;type:name;orderBy:name') && e('数量;类型;排序'); //测试通过模块获取Bug区块的参数 -r($data[1]) && p('count:name;type:name;orderBy:name') && e('数量;类型;排序'); //测试通过模块获取Bug区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getbuildparams.php b/module/block/test/model/getbuildparams.php deleted file mode 100755 index 39e03c683d..0000000000 --- a/module/block/test/model/getbuildparams.php +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -getBuildParams(); -cid=1 -pid=1 - -测试获取版本区块参数 >> 数量,20,input - -*/ - -$block = new blockTest(); -$data = $block->getBuildParamsTest(); - -r($data) && p('count:name,default,control') && e('数量,20,input'); //测试获取版本区块参数 \ No newline at end of file diff --git a/module/block/test/model/getbyid.php b/module/block/test/model/getbyid.php index c91889a9ad..b1bbbba46a 100755 --- a/module/block/test/model/getbyid.php +++ b/module/block/test/model/getbyid.php @@ -7,11 +7,13 @@ function initData() { $block = zdTable('block'); $block->id->range('2-5'); - $block->account->range('admin,test1,test2'); + $block->account->range('admin'); $block->vision->range('rnd,lite'); - $block->module->range('my,qa,project'); - $block->title->prefix('区块')->range('2-5'); - $block->order->range('5-2'); + $block->dashboard->range('my'); + $block->module->range('project'); + $block->code->range('list,statistic'); + $block->title->prefix('区块名称')->range('2-5'); + $block->order->range('1-4'); $block->gen(4); } @@ -22,18 +24,18 @@ title=测试 blockModel->getByID(); timeout=0 cid=1 -- 执行block模块的getByID方法,参数是2 +- 测试获取正常的block的内容 - 属性account @admin - 属性vision @rnd - - 属性module @my - - 属性title @区块2 - - 属性source @my - - 属性block @bug - - 属性order @5 + - 属性dashboard @my + - 属性module @project + - 属性code @list + - 属性title @区块名称2 + - 属性order @1 -- 执行block模块的getByID方法,参数是4,属性order @3 -- 执行block模块的getByID方法,参数是6 @0 +- 测试获取正常的block的内容属性order @3 +- 测试获取不存在的block的内容 @0 */ @@ -42,6 +44,6 @@ $tester->loadModel('block'); initData(); -r($tester->block->getByID(2)) && p('account,vision,module,title,order') && e('admin,rnd,my,区块2,5'); // 测试获取正常的block的内容 +r($tester->block->getByID(2)) && p('account,vision,dashboard,module,code,title,order') && e('admin,rnd,my,project,list,区块名称2,1'); // 测试获取正常的block的内容 r($tester->block->getByID(4)) && p('order') && e('3'); // 测试获取正常的block的内容 -r($tester->block->getByID(6)) && p('') && e('0'); // 测试获取不存在的block的内容 +r($tester->block->getByID(6)) && p('') && e('0'); // 测试获取不存在的block的内容 \ No newline at end of file diff --git a/module/block/test/model/getcaseparams.php b/module/block/test/model/getcaseparams.php deleted file mode 100755 index 334fe013cc..0000000000 --- a/module/block/test/model/getcaseparams.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php -getCaseParams(); -cid=1 -pid=1 - -测试通过模块获取用例区块的参数 >> 数量;类型;排序 -测试通过模块获取用例区块的参数 >> 数量;类型;排序 - -*/ - -$block = new blockTest(); -$data[0] = $block->getCaseParamsTest('qa'); -$data[1] = $block->getCaseParamsTest('my'); - -r($data[0]) && p('count:name;type:name;orderBy:name') && e('数量;类型;排序'); //测试通过模块获取用例区块的参数 -r($data[1]) && p('count:name;type:name;orderBy:name') && e('数量;类型;排序'); //测试通过模块获取用例区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getexecutionparams.php b/module/block/test/model/getexecutionparams.php deleted file mode 100755 index 5c80eab9ae..0000000000 --- a/module/block/test/model/getexecutionparams.php +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -getExecutionParams(); -cid=1 -pid=1 - -测试获取执行区块的参数 >> 数量;类型 - -*/ - -$block = new blockTest(); -$data = $block->getExecutionParamsTest(); - -r($data) && p('count:name;type:name') && e('数量;类型'); //测试获取执行区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getexecutionstatisticparams.php b/module/block/test/model/getexecutionstatisticparams.php deleted file mode 100755 index 183de9b9ea..0000000000 --- a/module/block/test/model/getexecutionstatisticparams.php +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env php -getExecutionStatisticParams(); -cid=1 -pid=1 - -测试获取执行区块的参数 >> 数量;类型 - -*/ - -$block = new blockTest(); -$data = $block->getExecutionStatisticParamsTest(); - -r($data) && p('count:name;type:name') && e('数量;类型'); //测试获取执行区块的参数 \ No newline at end of file diff --git a/module/block/test/model/gethiddenblocks.php b/module/block/test/model/gethiddenblocks.php deleted file mode 100755 index e8a222fc1c..0000000000 --- a/module/block/test/model/gethiddenblocks.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getHiddenBlocks(); -cid=1 -pid=1 - -测试获取隐藏的区块 >> 未获取到隐藏的区块 - -*/ - -$block = new blockTest(); - -r($block->getHiddenBlocksTest('my')) && p('message') && e('未获取到隐藏的区块'); //测试获取隐藏的区块 \ No newline at end of file diff --git a/module/block/test/model/getlastkey.php b/module/block/test/model/getlastkey.php deleted file mode 100755 index 4593256e0e..0000000000 --- a/module/block/test/model/getlastkey.php +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env php -getLastKey(); -cid=1 -pid=1 - -测试通过qa模块获取区块的key >> 4 -测试通过my模块获取区块的key >> 10 - -*/ - -$block = new blockTest(); -$data[0] = $block->getLastKeyTest('qa'); -$data[1] = $block->getLastKeyTest('my'); - -r($data[0]) && p('qa') && e('4'); //测试通过qa模块获取区块的key -r($data[1]) && p('my') && e('10'); //测试通过my模块获取区块的key \ No newline at end of file diff --git a/module/block/test/model/getlistparams.php b/module/block/test/model/getlistparams.php deleted file mode 100755 index 48799a7461..0000000000 --- a/module/block/test/model/getlistparams.php +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env php -getListParams(); -cid=1 -pid=1 - -测试通过模块获取区块的参数 >> 数量 -测试通过模块获取区块的参数 >> 数量 -测试通过模块获取区块的参数 >> 数量;类型;排序 - -*/ - -$block = new blockTest(); -$data[0] = $block->getListParamsTest('my'); -$data[1] = $block->getListParamsTest('qa'); -$data[2] = $block->getListParamsTest('project'); - -r($data[0]) && p('count:name') && e('数量'); //测试通过模块获取区块的参数 -r($data[1]) && p('count:name') && e('数量'); //测试通过模块获取区块的参数 -r($data[2]) && p('count:name;type:name;orderBy:name') && e('数量;类型;排序'); //测试通过模块获取区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getplanparams.php b/module/block/test/model/getplanparams.php deleted file mode 100755 index d4f4ebd7a4..0000000000 --- a/module/block/test/model/getplanparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getPlanParams(); -cid=1 -pid=1 - -获取计划参数 >> {"count":{"name":"\u6570\u91cf","default":20,"control":"input"}} - -*/ - -$block = new blockTest(); - -r($block->getPlanParamsTest()) && p() && e('{"count":{"name":"\u6570\u91cf","default":20,"control":"input"}}'); // 获取计划参数 \ No newline at end of file diff --git a/module/block/test/model/getproductparams.php b/module/block/test/model/getproductparams.php deleted file mode 100755 index 92455e2fbb..0000000000 --- a/module/block/test/model/getproductparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getProductParams(); -cid=1 -pid=1 - -获取产品区块的参数 >> type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select};count:{name:数量,default:20,control:input}; - -*/ - -$block = new blockTest(); - -r($block->getProductParamsTest()) && p() && e('type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select};count:{name:数量,default:20,control:input};'); // 获取产品区块的参数 diff --git a/module/block/test/model/getproductstatisticparams.php b/module/block/test/model/getproductstatisticparams.php deleted file mode 100755 index 9d1057dfd9..0000000000 --- a/module/block/test/model/getproductstatisticparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getProductStatisticParams(); -cid=1 -pid=1 - -获取产品统计区块的参数 >> count:{name:数量,default:20,control:input};type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select}; - -*/ - -$block = new blockTest(); - -r($block->getProductStatisticParamsTest()) && p() && e('count:{name:数量,default:20,control:input};type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select};'); // 获取产品统计区块的参数 diff --git a/module/block/test/model/getprojectdynamicparams.php b/module/block/test/model/getprojectdynamicparams.php deleted file mode 100755 index cc326b7f07..0000000000 --- a/module/block/test/model/getprojectdynamicparams.php +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env php -getProjectDynamicParams(); -cid=1 -pid=1 - -获取项目动态区块参数 >> count:{name:数量,default:20,control:input}; -*/ - -$block = new blockTest(); - -r($block->getProjectDynamicParamsTest()) && p() && e('count:{name:数量,default:20,control:input};'); // 获取项目动态区块参数 diff --git a/module/block/test/model/getprojectparams.php b/module/block/test/model/getprojectparams.php deleted file mode 100755 index 016f529b9c..0000000000 --- a/module/block/test/model/getprojectparams.php +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env php -getProjectParams(); -cid=1 -pid=1 - -获取计划参数 >> {"type":{"name":"\u7c7b\u578b","options":{"all":"\u6240\u6709","undone":"\u672a\u5b8c\u6210","wait":"\u672a\u5f00\u59cb","doing":"\u8fdb\u884c\u4e2d","suspended":"\u5df2\u6302\u8d77","closed":"\u5df2\u5173\u95ed"},"control":"select"},"orderBy":{"name":"\u6392\u5e8f","options":{"id_asc":"ID \u9012\u589e","id_desc":"ID \u9012\u51cf","status_asc":"\u72b6\u6001\u6b63\u5e8f","status_desc":"\u72b6\u6001\u5012\u5e8f"},"control":"select"},"count":{"name":"\u6570\u91cf","default":20,"control":"input"}} -*/ - -$block = new blockTest(); - -r($block->getProjectParamsTest()) && p() && e('{"type":{"name":"\u7c7b\u578b","options":{"all":"\u6240\u6709","undone":"\u672a\u5b8c\u6210","wait":"\u672a\u5f00\u59cb","doing":"\u8fdb\u884c\u4e2d","suspended":"\u5df2\u6302\u8d77","closed":"\u5df2\u5173\u95ed"},"control":"select"},"orderBy":{"name":"\u6392\u5e8f","options":{"id_asc":"ID \u9012\u589e","id_desc":"ID \u9012\u51cf","status_asc":"\u72b6\u6001\u6b63\u5e8f","status_desc":"\u72b6\u6001\u5012\u5e8f"},"control":"select"},"count":{"name":"\u6570\u91cf","default":20,"control":"input"}}'); //获取计划参数 diff --git a/module/block/test/model/getprojectstatisticparams.php b/module/block/test/model/getprojectstatisticparams.php deleted file mode 100755 index 55ec0f0e0f..0000000000 --- a/module/block/test/model/getprojectstatisticparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getProjectStatisticParams(); -cid=1 -pid=1 - -获取project静态param >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getProjectStatisticParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}}'); // 获取project静态param \ No newline at end of file diff --git a/module/block/test/model/getprojectteamparams.php b/module/block/test/model/getprojectteamparams.php deleted file mode 100755 index 777d55fd01..0000000000 --- a/module/block/test/model/getprojectteamparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getProjectTeamParams(); -cid=1 -pid=1 - -测试获取项目团队 >> type:{name:类型,all=>所有,undone=>未完成,wait=>未开始,doing=>进行中,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input}; - -*/ - -$block = new blockTest(); - -r($block->getProjectTeamParamsTest()) && p() && e('type:{name:类型,all=>所有,undone=>未完成,wait=>未开始,doing=>进行中,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input};'); // 测试获取项目团队 diff --git a/module/block/test/model/getqastatisticparams.php b/module/block/test/model/getqastatisticparams.php deleted file mode 100755 index 72fb78ce21..0000000000 --- a/module/block/test/model/getqastatisticparams.php +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env php -getQaStatisticParams(); -cid=1 -pid=1 - -测试name >> 类型 -测试control >> select - -*/ - -$block = new blockTest(); - -r($block->getQaStatisticParamsTest()) && p('type:name') && e('类型'); //测试name -r($block->getQaStatisticParamsTest()) && p('type:control') && e('select');//测试control \ No newline at end of file diff --git a/module/block/test/model/getreleaseparams.php b/module/block/test/model/getreleaseparams.php deleted file mode 100755 index 385d928357..0000000000 --- a/module/block/test/model/getreleaseparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getReleaseParams(); -cid=1 -pid=1 - -测试name >> 数量,20,input - -*/ - -$block = new blockTest(); - -r($block->getReleaseParamsTest()) && p('name,default,control') && e('数量,20,input'); //测试name \ No newline at end of file diff --git a/module/block/test/model/getscrumlistparams.php b/module/block/test/model/getscrumlistparams.php deleted file mode 100755 index 09bf516922..0000000000 --- a/module/block/test/model/getscrumlistparams.php +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env php -getScrumListParams(); -cid=1 -pid=1 - -测试name和select >> 类型,select -测试options >> 未完成 -测试options >> 进行中 -测试options >> 全部 -测试options >> 我参与 - -*/ - -$block = new blockTest(); - -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 \ No newline at end of file diff --git a/module/block/test/model/getscrumproductparams.php b/module/block/test/model/getscrumproductparams.php deleted file mode 100755 index fff6bf6faf..0000000000 --- a/module/block/test/model/getscrumproductparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getScrumProductParams(); -cid=1 -pid=1 - -测试获取产品区块的参数 >> 数量;20;input - -*/ - -$block = new blockTest(); - -r($block->getScrumProductParamsTest()) && p('count:name;count:default;count:control') && e('数量;20;input'); // 测试获取产品区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getscrumroadmapparams.php b/module/block/test/model/getscrumroadmapparams.php deleted file mode 100755 index a35c36473e..0000000000 --- a/module/block/test/model/getscrumroadmapparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getScrumRoadMapParams(); -cid=1 -pid=1 - -测试获取产品路线图区块的参数 >> 0 - -*/ - -$block = new blockTest(); - -r($block->getScrumRoadMapParamsTest()) && p() && e('0'); // 测试获取产品路线图区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getscrumtestparams.php b/module/block/test/model/getscrumtestparams.php deleted file mode 100755 index cdcc4d675b..0000000000 --- a/module/block/test/model/getscrumtestparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getScrumTestParams(); -cid=1 -pid=1 - -测试获取测试单区块的参数 >> 数量;类型 - -*/ - -$block = new blockTest(); - -r($block->getScrumTestParamsTest()) && p('count:name;type:name') && e('数量;类型'); // 测试获取测试单区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getstatisticparams.php b/module/block/test/model/getstatisticparams.php deleted file mode 100755 index 7d3e20ee94..0000000000 --- a/module/block/test/model/getstatisticparams.php +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env php -getStatisticParams(); -cid=1 -pid=1 - -获取空区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"}} -获取产品区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}} -获取项目区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}} -获取执行区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"所有","involved":"我参与"},"control":"select"}} -获取测试区块的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}} - -*/ - -$block = new blockTest(); - -$data = array(); -$data[0] = $block->getStatisticParamsTest(''); -$data[1] = $block->getStatisticParamsTest('product'); -$data[2] = $block->getStatisticParamsTest('project'); -$data[3] = $block->getStatisticParamsTest('execution'); -$data[4] = $block->getStatisticParamsTest('qa'); - -r($data[0]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"}}'); // 获取空区块的参数 -r($data[1]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}'); // 获取产品区块的参数 -r($data[2]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"全部","involved":"我参与的"},"control":"select"}}'); // 获取项目区块的参数 -r($data[3]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"undone":"未完成","doing":"进行中","all":"所有","involved":"我参与"},"control":"select"}}'); // 获取执行区块的参数 -r($data[4]) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"noclosed":"未关闭","closed":"已关闭","all":"全部","involved":"我参与"},"control":"select"}}'); // 获取测试区块的参数 \ No newline at end of file diff --git a/module/block/test/model/getstoryparams.php b/module/block/test/model/getstoryparams.php deleted file mode 100755 index 05e4c1c985..0000000000 --- a/module/block/test/model/getstoryparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getStoryParams(); -cid=1 -pid=1 - -获取需求的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"assignedTo":"指派给我","openedBy":"由我创建","reviewedBy":"由我评审","closedBy":"由我关闭"},"control":"select"},"orderBy":{"name":"排序","default":"id_desc","options":{"id_asc":"ID 递增","id_desc":"ID 递减","pri_asc":"优先级递增","pri_desc":"优先级递减","status_asc":"状态正序","status_desc":"状态倒序","stage_asc":"阶段正序","stage_desc":"阶段倒序"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getStoryParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"assignedTo":"指派给我","openedBy":"由我创建","reviewedBy":"由我评审","closedBy":"由我关闭"},"control":"select"},"orderBy":{"name":"排序","default":"id_desc","options":{"id_asc":"ID 递增","id_desc":"ID 递减","pri_asc":"优先级递增","pri_desc":"优先级递减","status_asc":"状态正序","status_desc":"状态倒序","stage_asc":"阶段正序","stage_desc":"阶段倒序"},"control":"select"}}'); // 获取需求的参数 \ No newline at end of file diff --git a/module/block/test/model/gettaskparams.php b/module/block/test/model/gettaskparams.php deleted file mode 100755 index 5cdbe3e02f..0000000000 --- a/module/block/test/model/gettaskparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getTaskParams(); -cid=1 -pid=1 - -获取task的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"assignedTo":"指派给我","openedBy":"由我创建","finishedBy":"由我完成","closedBy":"由我关闭","canceledBy":"由我取消"},"control":"select"},"orderBy":{"name":"排序","default":"id_desc","options":{"id_asc":"ID 递增","id_desc":"ID 递减","pri_asc":"优先级递增","pri_desc":"优先级递减","estimate_asc":"预计时间递增","estimate_desc":"预计时间递减","status_asc":"状态正序","status_desc":"状态倒序","deadline_asc":"截止日期递增","deadline_desc":"截止日期递减"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getTaskParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"assignedTo":"指派给我","openedBy":"由我创建","finishedBy":"由我完成","closedBy":"由我关闭","canceledBy":"由我取消"},"control":"select"},"orderBy":{"name":"排序","default":"id_desc","options":{"id_asc":"ID 递增","id_desc":"ID 递减","pri_asc":"优先级递增","pri_desc":"优先级递减","estimate_asc":"预计时间递增","estimate_desc":"预计时间递减","status_asc":"状态正序","status_desc":"状态倒序","deadline_asc":"截止日期递增","deadline_desc":"截止日期递减"},"control":"select"}}'); // 获取task的参数 \ No newline at end of file diff --git a/module/block/test/model/gettesttaskparams.php b/module/block/test/model/gettesttaskparams.php deleted file mode 100755 index 4e48a6d40f..0000000000 --- a/module/block/test/model/gettesttaskparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getTesttaskParams(); -cid=1 -pid=1 - -获取testtask参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"wait":"待测版本","doing":"测试中版本","blocked":"阻塞版本","done":"已测版本","all":"全部"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getTesttaskParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":{"wait":"待测版本","doing":"测试中版本","blocked":"阻塞版本","done":"已测版本","all":"全部"},"control":"select"}}'); // 获取testtask参数 \ No newline at end of file diff --git a/module/block/test/model/gettodoparams.php b/module/block/test/model/gettodoparams.php deleted file mode 100755 index 7ca72385eb..0000000000 --- a/module/block/test/model/gettodoparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getTodoParams(); -cid=1 -pid=1 - -获取todo参数 >> {"count":{"name":"数量","default":20,"control":"input"}} - -*/ - -$block = new blockTest(); - -r($block->getTodoParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"}}'); // 获取todo参数 \ No newline at end of file diff --git a/module/block/test/model/getwaterfallissueparams.php b/module/block/test/model/getwaterfallissueparams.php deleted file mode 100755 index d026af32e5..0000000000 --- a/module/block/test/model/getwaterfallissueparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getWaterfallIssueParams(); -cid=1 -pid=1 - -获取waterfall issue的参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":null,"control":"select"},"orderBy":{"name":"排序","options":{"id_asc":"ID 递增","id_desc":"ID 递减","status_asc":"状态正序","status_desc":"状态倒序"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getWaterfallIssueParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":null,"control":"select"},"orderBy":{"name":"排序","options":{"id_asc":"ID 递增","id_desc":"ID 递减","status_asc":"状态正序","status_desc":"状态倒序"},"control":"select"}}'); // 获取waterfall issue的参数 \ No newline at end of file diff --git a/module/block/test/model/getwaterfallriskparams.php b/module/block/test/model/getwaterfallriskparams.php deleted file mode 100755 index 9139370692..0000000000 --- a/module/block/test/model/getwaterfallriskparams.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -getWaterfallRiskParams(); -cid=1 -pid=1 - -获取waterfall risk 参数 >> {"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":null,"control":"select"},"orderBy":{"name":"排序","options":{"id_asc":"ID 递增","id_desc":"ID 递减","status_asc":"状态正序","status_desc":"状态倒序"},"control":"select"}} - -*/ - -$block = new blockTest(); - -r($block->getWaterfallRiskParamsTest()) && p() && e('{"count":{"name":"数量","default":20,"control":"input"},"type":{"name":"类型","options":null,"control":"select"},"orderBy":{"name":"排序","options":{"id_asc":"ID 递增","id_desc":"ID 递减","status_asc":"状态正序","status_desc":"状态倒序"},"control":"select"}}'); // 获取waterfall risk 参数 \ No newline at end of file diff --git a/module/block/test/model/save.php b/module/block/test/model/save.php deleted file mode 100755 index 7857008401..0000000000 --- a/module/block/test/model/save.php +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env php -save(); -cid=1 -pid=1 - -测试修改block 名称 >> 欢迎test,my,8,welcome -测试修改block 模块 >> 我的贡献,my,8,dynamic -测试修改block 区块 >> 项目统计,projectteam,8,projectteam -测试修改block 变量 >> 未关闭的产品,statistic,8,statistic - -*/ - -$blockID = array('95', '99', '113'); -$source = 'product'; - -$changeTitle = new stdclass(); -$changeTitle->modules = 'welcome'; -$changeTitle->title = '欢迎test'; -$changeTitle->grid = 8; -$changeTitle->actionLink = '/block-set-95-welcome-.html'; - -$changeModules = new stdclass(); -$changeModules->modules = 'dynamic'; -$changeModules->title = '我的贡献'; -$changeModules->grid = 8; -$changeModules->actionLink = '/block-set-95-welcome-.html'; - -$changeBlock = new stdclass(); -$changeBlock->modules = 'project'; -$changeBlock->title = '项目统计'; -$changeBlock->moduleBlock = 'projectteam'; -$changeBlock->grid = 8; -$changeBlock->params = array('type' => 'all', 'orderBy' => 'id_asc', 'count' => 20); -$changeBlock->actionLink = '/block-set-95-welcome-.html'; - -$changeParams = new stdclass(); -$changeParams->modules = 'product'; -$changeParams->title = '未关闭的产品'; -$changeParams->moduleBlock = 'statistic'; -$changeParams->grid = 8; -$changeParams->params = array('type' => 'noclosed', 'count' => 30); -$changeParams->actionLink = '/block-set-95-welcome-.html'; - -$block = new blockTest(); - -r($block->saveTest($changeTitle, $blockID[0], $source, $changeTitle->modules)) && p('title,module,grid,block') && e('欢迎test,my,8,welcome'); // 测试修改block 名称 -r($block->saveTest($changeModules, $blockID[0], $source, $changeModules->modules)) && p('title,module,grid,block') && e('我的贡献,my,8,dynamic'); // 测试修改block 模块 -r($block->saveTest($changeBlock, $blockID[1], $source, $changeBlock->modules, $changeBlock->moduleBlock)) && p('title,module,grid,block') && e('项目统计,projectteam,8,projectteam'); // 测试修改block 区块 -r($block->saveTest($changeParams, $blockID[2], $source, $changeParams->modules, $changeParams->moduleBlock)) && p('title,module,grid,block') && e('未关闭的产品,statistic,8,statistic'); // 测试修改block 变量 diff --git a/module/block/test/model/update.php b/module/block/test/model/update.php index a45e8a26f8..abfbd75d78 100644 --- a/module/block/test/model/update.php +++ b/module/block/test/model/update.php @@ -8,14 +8,16 @@ su('admin'); function initData() { $block = zdTable('block'); - $block->id->range('2'); - $block->account->range('test'); - $block->vision->range('rnd'); - $block->module->range('test'); - $block->title->prefix('区块')->range('2'); - $block->order->range('5'); + $block->id->range('2-5'); + $block->account->range('admin'); + $block->vision->range('rnd,lite'); + $block->dashboard->range('my'); + $block->module->range('project'); + $block->code->range('list,statistic'); + $block->title->prefix('区块名称')->range('2-5'); + $block->order->range('1-4'); - $block->gen(1); + $block->gen(4); } /** @@ -24,18 +26,22 @@ title=测试 block 模块的update 方法 timeout=0 cid=39 -- 执行block模块的getByID方法,参数是$newBlockID - - 属性account @admin - - 属性vision @rnd - - 属性module @my - - 属性title @区块123 - - 属性source @my - - 属性block @bug - - 属性order @5 +- 测试获取正常的block的内容 + - 属性account @admin2 + - 属性vision @lite + - 属性dashboard @scrumproject + - 属性module @project + - 属性code @statistic + - 属性title @项目统计区块 + - 属性order @1 -- 执行blockTest模块的create方法,参数是$accoutTooLangBlock,属性account @『所属用户』长度应当不超过『30』,且大于『0』。 +- 测试所属模块为空 @『所属模块』不能为空。 +- 测试所属区块为空 @『区块』不能为空。 +- 测试区块名称为空 @『区块名称』不能为空。 + +- 测试account 字段字符超出长度 @『所属用户』长度应当不超过『30』,且大于『0』。 */ @@ -44,25 +50,43 @@ $tester->loadModel('block'); initData(); -$newBlock = new stdclass(); -$newBlock->id = '2'; -$newBlock->account = 'newadmin'; -$newBlock->vision = 'lite'; -$newBlock->module = 'newmy'; -$newBlock->title = 'new区块'; -$newBlock->params = ''; -$newBlock->order = '5'; +$block = new stdclass(); +$block->id = '2'; +$block->account = 'admin2'; +$block->vision = 'lite'; +$block->dashboard = 'scrumproject'; +$block->module = 'project'; +$block->code = 'statistic'; +$block->title = '项目统计区块'; +$block->order = '1'; -$accoutTooLangBlock = new stdclass(); -$accoutTooLangBlock->id = '2'; -$accoutTooLangBlock->account = 'adminadminadminadminadminadminadminadmin1'; -$accoutTooLangBlock->vision = 'rnd'; -$accoutTooLangBlock->module = 'my'; -$accoutTooLangBlock->title = 'long account'; -$accoutTooLangBlock->order = '5'; +$accountTooLangBlock = new stdclass(); +$accountTooLangBlock->id = '3'; +$accountTooLangBlock->account = 'adminadminadminadminadminadminadminadmin1'; +$accountTooLangBlock->vision = 'rnd'; +$accountTooLangBlock->dashboard = 'my'; +$accountTooLangBlock->module = 'project'; +$accountTooLangBlock->code = 'statistic'; +$accountTooLangBlock->title = '项目统计区块2'; +$accountTooLangBlock->order = '2'; + +$emptyModuleBlock = new stdclass(); +$emptyModuleBlock->id = '4'; +$emptyModuleBlock->module = ''; + +$emptyCodeBlock = new stdclass(); +$emptyCodeBlock->id = '4'; +$emptyCodeBlock->code = ''; + +$emptyTitleBlock = new stdclass(); +$emptyTitleBlock->id = '4'; +$emptyTitleBlock->title = ''; $blockTest = new blockTest(); -$newBlockID = $blockTest->updateTest($newBlock); +$newBlockID = $blockTest->updateTest($block); -r($tester->block->getByID($newBlockID)) && p('account,vision,module,title,order') && e("newadmin,lite,newmy,new区块,5"); // 测试获取正常的block的内容 -r($blockTest->updateTest($accoutTooLangBlock)) && p('account:0') && e('『所属用户』长度应当不超过『30』,且大于『0』。'); // 测试account 字段字符超出长度 +r($tester->block->getByID($newBlockID)) && p('account,vision,dashboard,module,code,title,order') && e("admin2,lite,scrumproject,project,statistic,项目统计区块,1"); // 测试获取正常的block的内容 +r($blockTest->updateTest($emptyModuleBlock)) && p('module:0') && e('『所属模块』不能为空。'); // 测试所属模块为空 +r($blockTest->updateTest($emptyCodeBlock)) && p('code:0') && e('『区块』不能为空。'); // 测试所属区块为空 +r($blockTest->updateTest($emptyTitleBlock)) && p('title:0') && e('『区块名称』不能为空。'); // 测试区块名称为空 +r($blockTest->updateTest($accountTooLangBlock)) && p('account:0') && e('『所属用户』长度应当不超过『30』,且大于『0』。'); // 测试account 字段字符超出长度 \ No newline at end of file diff --git a/test/data/block.yaml b/test/data/block.yaml index a1091c08e0..b6b79656a0 100644 --- a/test/data/block.yaml +++ b/test/data/block.yaml @@ -4,25 +4,3 @@ version: "1.0" fields: - field: id range: 1-10000 - - field: account - fields: - - field: account1 - range: - - field: account2 - range: - - field: module - range: my{16},product{5},project{5},qa{4} - - field: title - range: '[欢迎,最新动态,我的贡献,待处理,我的待办,项目统计,我近期参与的项目,项目人力投入,项目列表,版本列表,执行统计,执行总览,执行列表,任务列表,产品统计,测试统计,产品统计,未关闭的产品,指派给我的软件需求,发布列表,计划列表,项目概况,迭代列表,待测版本,迭代总览,最新动态,测试统计,由我创建的Bug,指派给我的用例,所有版本列表]' - - field: source - range: '[]{4},todo,project{4},execution{5},product,qa,product{5},project{5},qa{4}' - - field: params - range: '[]{3},`{"todoCount":"20","taskCount":"20","bugCount":"20","riskCount":"20","issueCount":"20","storyCount":"20","meetingCount":"20"}`,`{"count":"10"}`,`{"type":"undone","count":"15"}`, , ,`{"orderBy":"id_desc","count":"15"}`,`{"count":"20"}`,`{"type":"undone","count":"20"}`, ,`{"type":"doing","count":"20"}`,`{"type":"assignedTo","count":"20","orderBy":"id_desc"}`,`{"type":"all","count":"20"}`,`{"type":"all","count":"20"}`,`{"type":"closed","count":"20"}`,`{"count":"15","type":"noclosed"}`,`{"count":"15","orderBy":"id_desc","type":"assignedTo"}`,`{"count":"10"}`,`{"count":"10"}`,`{"count":"10"}`,`{"type":"involved","count":"10"}`,`{"type":"wait","count":"15"}`, , ,`{"type":"noclosed","count":"20"}`,`{"count":"15","orderBy":"id_asc","type":"openedBy"}`,`{"count":"15","orderBy":"pri_asc","type":"assigntome"}`,`{"count":"15","orderBy":"id_desc","type":"all"}`' - - field: order - range: 1-16,1-5,1-5,1-4 - - field: grid - range: 8{2},4,8,4{3},8{4},4,8{5},4{3},8,4{2},8{4},4{2},8 - - field: height - range: 0 - - field: hidden - range: 0 diff --git a/test/data/zt_block.sql b/test/data/zt_block.sql index 17e581eeab..2905f9d53c 100644 --- a/test/data/zt_block.sql +++ b/test/data/zt_block.sql @@ -1,36 +1 @@ truncate `zt_block`; -INSERT INTO `zt_block` (`id`, `account`, `vision`, `module`, `type`, `title`, `source`, `block`, `params`, `order`, `grid`, `height`, `hidden`) VALUES -(102, 'admin', 'rnd', 'my', '', '待处理', '', 'assigntome', '{\"todoCount\":\"20\",\"taskCount\":\"20\",\"bugCount\":\"20\",\"riskCount\":\"20\",\"issueCount\":\"20\",\"storyCount\":\"20\",\"meetingCount\":\"20\"}', 8, 8, 0, 0), -(101, 'admin', 'rnd', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 7, 8, 0, 0), -(100, 'admin', 'rnd', 'my', '', '我的贡献', '', 'contribute', '', 6, 4, 0, 0), -(97, 'admin', 'rnd', 'my', '', '流程图', '', 'flowchart', '', 3, 8, 0, 0), -(98, 'admin', 'rnd', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 4, 4, 0, 0), -(99, 'admin', 'rnd', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 5, 8, 0, 0), -(95, 'admin', 'rnd', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0), -(96, 'admin', 'rnd', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0), -(41, 'admin', 'lite', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0), -(42, 'admin', 'lite', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0), -(43, 'admin', 'lite', 'my', '', '流程图', '', 'flowchart', '', 3, 8, 0, 0), -(44, 'admin', 'lite', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 4, 4, 0, 0), -(45, 'admin', 'lite', 'my', '', '看板列表', 'execution', 'scrumlist', '{\"count\":\"15\",\"type\":\"doing\",\"orderBy\":\"id_desc\"}', 5, 8, 0, 0), -(46, 'admin', 'lite', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 7, 8, 0, 0), -(47, 'admin', 'lite', 'my', '', '待处理', '', 'assigntome', '{\"todoCount\":\"20\",\"taskCount\":\"20\",\"bugCount\":\"20\",\"riskCount\":\"20\",\"issueCount\":\"20\",\"storyCount\":\"20\",\"meetingCount\":\"20\"}', 8, 8, 0, 0), -(48, 'admin', 'lite', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 10, 8, 0, 0), -(110, 'admin', 'rnd', 'qa', '', '待测版本列表', 'qa', 'testtask', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"wait\"}', 4, 8, 0, 0), -(109, 'admin', 'rnd', 'qa', '', '指派给我的用例', 'qa', 'case', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assigntome\"}', 3, 4, 0, 0), -(108, 'admin', 'rnd', 'qa', '', '指派给我的Bug', 'qa', 'bug', '{\"count\":15,\"orderBy\":\"id_desc\",\"type\":\"assignedTo\"}', 2, 4, 0, 0), -(107, 'admin', 'rnd', 'qa', '', '测试统计', 'qa', 'statistic', '{\"type\":\"noclosed\",\"count\":\"20\"}', 1, 8, 0, 0), -(53, '', 'rnd', 'my', '', '欢迎', '', 'welcome', '', 1, 8, 0, 0), -(54, '', 'rnd', 'my', '', '最新动态', '', 'dynamic', '', 2, 4, 0, 0), -(55, '', 'rnd', 'my', '', '流程图', '', 'flowchart', '', 3, 8, 0, 0), -(56, '', 'rnd', 'my', '', '我的待办', 'todo', 'list', '{\"count\":\"20\"}', 4, 4, 0, 0), -(57, '', 'rnd', 'my', '', '项目统计', 'project', 'statistic', '{\"count\":\"20\"}', 5, 8, 0, 0), -(58, '', 'rnd', 'my', '', '我的贡献', '', 'contribute', '', 6, 4, 0, 0), -(59, '', 'rnd', 'my', '', '我近期参与的项目', 'project', 'recentproject', '', 7, 8, 0, 0), -(60, '', 'rnd', 'my', '', '待处理', '', 'assigntome', '{\"todoCount\":\"20\",\"taskCount\":\"20\",\"bugCount\":\"20\",\"riskCount\":\"20\",\"issueCount\":\"20\",\"storyCount\":\"20\",\"meetingCount\":\"20\"}', 8, 8, 0, 0), -(61, '', 'rnd', 'my', '', '项目人力投入', 'project', 'projectteam', '', 9, 8, 0, 0), -(62, '', 'rnd', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 10, 8, 0, 0), -(106, 'admin', 'rnd', 'project', 'waterfall', '最新动态', 'project', 'projectdynamic', '', 6, 4, 0, 0), -(105, 'admin', 'rnd', 'project', 'waterfall', '项目计划', 'project', 'waterfallgantt', '', 3, 8, 0, 0), -(103, 'admin', 'rnd', 'my', '', '项目人力投入', 'project', 'projectteam', '', 9, 8, 0, 0), -(104, 'admin', 'rnd', 'my', '', '项目列表', 'project', 'project', '{\"orderBy\":\"id_desc\",\"count\":\"15\"}', 10, 8, 0, 0); diff --git a/test/data/zt_block.yaml b/test/data/zt_block.yaml index 59638d88af..76452f2624 100644 --- a/test/data/zt_block.yaml +++ b/test/data/zt_block.yaml @@ -4,80 +4,4 @@ author: automated export version: "1.0" fields: - field: id - note: "Id" range: 1-10000 - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: account - note: "所属用户" - from: common.user.v1.yaml - use: user - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: module - note: "所属模块" - range: product,project,qa,my - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: title - note: "区块名称" - range: 1-10000 - prefix: "这是区块名称" - postfix: "" - loop: 0 - format: "" - - field: source - range: 0,todo,project,qa,product - note: "来源模块" - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: block - note: "来源区块" - range: product,project,qa,todo,assigntome,dynamic,flowchart,welcome,html,statistic,overview,list,story,plan,release,task,build,bug,case,testtask - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: params - note: "设置参数" - range: 1-10000 - prefix: "这是json格式参数" - postfix: "" - loop: 0 - format: "" - - field: order - note: "排序" - range: 1-100 - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: grid - note: "位置" - range: 8,4 - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: height - note: "高度" - range: 0 - prefix: "" - postfix: "" - loop: 0 - format: "" - - field: hidden - note: "隐藏" - range: 0 - prefix: "" - postfix: "" - loop: 0 - format: "" diff --git a/test/devdata/block.yaml b/test/devdata/block.yaml index fc569bbf3d..b6b79656a0 100644 --- a/test/devdata/block.yaml +++ b/test/devdata/block.yaml @@ -4,29 +4,3 @@ version: "1.0" fields: - field: id range: 1-10000 - - field: account - fields: - - field: account1 - range: - - field: account2 - range: - - field: module - range: my{16},product{5},project{5},qa{4} - - field: type - range: []{21},scrum{5},[]{4} - - field: title - range: [欢迎,最新动态,我的贡献,待处理,我的待办,项目统计,我近期参与的项目,项目人力投入,项目列表,版本列表,执行统计,执行总览,执行列表,任务列表,产品统计,测试统计,产品统计,未关闭的产品,指派给我的软件需求,发布列表,计划列表,项目概况,迭代列表,待测版本,迭代总览,最新动态,测试统计,由我创建的Bug,指派给我的用例,所有版本列表] - - field: source - range: []{4},todo,project{4},execution{5},product,qa,product{5},project{5},qa{4} - - field: block - range: [welcome,dynamic,contribute,assigntome,list,statistic,recentproject,projectteam,project,build,statistic,overview,list,task,statistic,statistic,statistic,list,story,release,plan,scrumoverview,scrumlist,scrumtest,sprint,projectdynamic,statistic,bug,case,testtask] - - field: params - range: []{3},`{"todoCount":"20","taskCount":"20","bugCount":"20","riskCount":"20","issueCount":"20","storyCount":"20","meetingCount":"20"}`,`{"count":"10"}`,`{"type":"undone","count":"15"}`, , ,`{"orderBy":"id_desc","count":"15"}`,`{"count":"20"}`,`{"type":"undone","count":"20"}`, ,`{"type":"doing","count":"20"}`,`{"type":"assignedTo","count":"20","orderBy":"id_desc"}`,`{"type":"all","count":"20"}`,`{"type":"all","count":"20"}`,`{"type":"closed","count":"20"}`,`{"count":"15","type":"noclosed"}`,`{"count":"15","orderBy":"id_desc","type":"assignedTo"}`,`{"count":"10"}`,`{"count":"10"}`,`{"count":"10"}`,`{"type":"involved","count":"10"}`,`{"type":"wait","count":"15"}`, , ,`{"type":"noclosed","count":"20"}`,`{"count":"15","orderBy":"id_asc","type":"openedBy"}`,`{"count":"15","orderBy":"pri_asc","type":"assigntome"}`,`{"count":"15","orderBy":"id_desc","type":"all"}` - - field: order - range: 1-16,1-5,1-5,1-4 - - field: grid - range: 8{2},4,8,4{3},8{4},4,8{5},4{3},8,4{2},8{4},4{2},8 - - field: height - range: 0 - - field: hidden - range: 0