Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Modified testcase of block.

Browse Source
This commit is contained in:
tianshujie
2022-08-13 13:43:15 +08:00
parent af3abfdd93
commit 51608525d2
12 changed files with 140 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/model.php
+4 -3
View File
@@ -254,6 +254,8 @@ class blockModel extends model
*/
public function initBlock($module, $type = '')
{
if(empty($module)) return;
$flow = isset($this->config->global->flow) ? $this->config->global->flow : 'full';
$account = $this->app->user->account;
$vision = $this->config->vision;
@@ -507,7 +509,7 @@ class blockModel extends model
$this->app->loadLang('project');
$params = new stdclass();
$params->type['name'] = $this->lang->block->type;
$params->type['options'] = $this->lang->project->featureBar;
$params->type['options'] = $this->lang->project->featureBar['browse'];
$params->type['control'] = 'select';
$params->orderBy['name'] = $this->lang->block->orderBy;
@@ -969,11 +971,10 @@ class blockModel extends model
/**
* Get project dynamic params.
*
* @param string $module
* @access public
* @return string
*/
public function getProjectDynamicParams($module = '')
public function getProjectDynamicParams()
{
$params = $this->appendCountParams();
test/class/block.class.php
+107 -36
View File
@@ -158,7 +158,7 @@ class blockTest
$object->blockversion = $tester->loadModel('setting')->getItem("owner=$account&module=$module&section=block&key=initVersion");
$blockData = $this->objectModel->getBlockList($module, $type);
$object->blockData = current($blockData);
$object->blockData = empty($module) ? 0 : current($blockData);
return $object;
}
@@ -311,6 +311,12 @@ class blockTest
return $objects->count;
}
/**
* Get project params.
*
* @access public
* @return string
*/
public function getProjectParamsTest()
{
$objects = $this->objectModel->getProjectParams();
@@ -320,6 +326,12 @@ class blockTest
return $objects;
}
/**
* Get project team params.
*
* @access public
* @return string
*/
public function getProjectTeamParamsTest()
{
$objects = $this->objectModel->getProjectTeamParams();
@@ -364,13 +376,37 @@ class blockTest
return $objects;
}
/**
* Get product params.
*
* @access public
* @return string
*/
public function getProductParamsTest()
{
$objects = $this->objectModel->getProductParams();
if(dao::isError()) return dao::getError();
return $objects;
$return = '';
$objects = json_decode($objects);
foreach($objects as $type => $params)
{
$return .= "$type:{";
foreach($params as $param => $paramValue)
{
if(is_object($paramValue))
{
foreach($paramValue as $key => $value) $return .= "$key=>$value,";
}
else
{
$return .= "$param:$paramValue,";
}
}
$return = trim($return, ',');
$return .= '};';
}
return $return;
}
/**
@@ -389,13 +425,37 @@ class blockTest
return json_encode(json_decode($objects), JSON_UNESCAPED_UNICODE);
}
/**
* Get product statistic params.
*
* @access public
* @return string
*/
public function getProductStatisticParamsTest()
{
$objects = $this->objectModel->getProductStatisticParams();
if(dao::isError()) return dao::getError();
return $objects;
$return = '';
$objects = json_decode($objects);
foreach($objects as $type => $params)
{
$return .= "$type:{";
foreach($params as $param => $paramValue)
{
if(is_object($paramValue))
{
foreach($paramValue as $key => $value) $return .= "$key=>$value,";
}
else
{
$return .= "$param:$paramValue,";
}
}
$return = trim($return, ',');
$return .= '};';
}
return $return;
}
/**
@@ -428,6 +488,12 @@ class blockTest
return $objects;
}
/**
* Get qa statistic params.
*
* @access public
* @return object
*/
public function getQaStatisticParamsTest()
{
$object = $this->objectModel->getQaStatisticParams();
@@ -437,15 +503,6 @@ class blockTest
return json_decode($object);
}
public function getRecentProjectParamsTest()
{
$objects = $this->objectModel->getRecentProjectParams();
if(dao::isError()) return dao::getError();
return $objects;
}
/**
* Test get waterfall issue param.
*
@@ -578,6 +635,13 @@ class blockTest
return $bool ? 1 : 2;
}
/**
* Check API for ranzhi.
*
* @param string $hash
* @access public
* @return bool
*/
public function checkAPITest($hash)
{
$objects = $this->objectModel->checkAPI($hash);
@@ -602,6 +666,13 @@ class blockTest
return $objects;
}
/**
* Get scrum project list params.
*
* @param string $module
* @access public
* @return string
*/
public function getScrumListParamsTest($module = '')
{
$objects = $this->objectModel->getScrumListParams($module = '');
@@ -613,15 +684,6 @@ class blockTest
return $objects->type;
}
public function getScrumOverviewParamsTest($module = '')
{
$objects = $this->objectModel->getScrumOverviewParams($module = '');
if(dao::isError()) return dao::getError();
return $objects;
}
/**
* Get scrum roadmap list params.
*
@@ -652,22 +714,31 @@ class blockTest
return $objects;
}
public function getProjectDynamicParamsTest($module = '')
public function getProjectDynamicParamsTest()
{
$objects = $this->objectModel->getProjectDynamicParams($module = '');
$objects = $this->objectModel->getProjectDynamicParams();
if(dao::isError()) return dao::getError();
return $objects;
}
public function getSprintParamsTest($module = '')
{
$objects = $this->objectModel->getSprintParams($module = '');
if(dao::isError()) return dao::getError();
return $objects;
$return = '';
$objects = json_decode($objects);
foreach($objects as $type => $params)
{
$return .= "$type:{";
foreach($params as $param => $paramValue)
{
if(is_object($paramValue))
{
foreach($paramValue as $key => $value) $return .= "$key=>$value,";
}
else
{
$return .= "$param:$paramValue,";
}
}
$return = trim($return, ',');
$return .= '};';
}
return $return;
}
/**
test/data/zt_config.sql
+2 -1
View File
@@ -34,4 +34,5 @@ INSERT INTO `zt_config` (`id`, `vision`, `owner`, `module`, `section`, `key`, `v
(33, 'rnd', 'system', 'common', 'global', 'skipIntroduction', ',admin'),
(34, 'rnd', 'system', 'common', 'global', 'skipTutorial', ',admin'),
(35, 'rnd', 'system', 'common', 'global', 'skipYoungBlueTheme', ',admin'),
(36, 'rnd', 'system', 'common', 'global', ' scoreStatus', '1');
(36, 'rnd', 'system', 'common', 'global', 'scoreStatus', '1'),
(37, 'rnd', 'system', 'sso', '' , 'key', '858640a724c2c981983935eb2bbc4ad8');
test/model/block/checkapi.php
+6 -2
View File
@@ -10,10 +10,14 @@ title=测试 blockModel->checkAPI();
cid=1
pid=1
测试空哈希值 >> 0
测试正确的哈希值 >> 1
测试错误的哈希值 >> 0
*/
$block = new blockTest();
r($block->checkAPITest()) && p() && e();
r($block->checkAPITest('')) && p('') && e('0'); // 测试空哈希值
r($block->checkAPITest('858640a724c2c981983935eb2bbc4ad8')) && p('') && e('1'); // 测试正确的哈希值
r($block->checkAPITest('858640a724c2c98198')) && p('') && e('0'); // 测试错误的哈希值
test/model/block/getproductparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->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();
r($block->getProductParamsTest()) && p() && e('type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select};count:{name:数量,default:20,control:input};'); // 获取产品区块的参数
test/model/block/getproductstatisticparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->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();
r($block->getProductStatisticParamsTest()) && p() && e('count:{name:数量,default:20,control:input};type:{name:类型,noclosed=>未关闭,closed=>已关闭,all=>全部,involved=>我参与,control:select};'); // 获取产品统计区块的参数
test/model/block/getprojectdynamicparams.php
+2 -3
View File
@@ -10,10 +10,9 @@ title=测试 blockModel->getProjectDynamicParams();
cid=1
pid=1
获取项目动态区块参数 >> count:{name:数量,default:20,control:input};
*/
$block = new blockTest();
r($block->getProjectDynamicParamsTest()) && p() && e();
r($block->getProjectDynamicParamsTest()) && p() && e('count:{name:数量,default:20,control:input};'); // 获取项目动态区块参数
test/model/block/getprojectparams.php
+2 -3
View File
@@ -10,10 +10,9 @@ title=测试 blockModel->getProjectParams();
cid=1
pid=1
获取计划参数 >> {"type":{"name":"\u7c7b\u578b","options":{"all":"\u6240\u6709","doing":"\u8fdb\u884c\u4e2d","wait":"\u672a\u5f00\u59cb","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"}}
获取计划参数 >> {"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","doing":"\u8fdb\u884c\u4e2d","wait":"\u672a\u5f00\u59cb","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"}}'); //获取计划参数
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"}}'); //获取计划参数
test/model/block/getprojectteamparams.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->getProjectTeamParams();
cid=1
pid=1
测试获取项目团队 >> type:{name:类型,all=>所有,doing=>进行中,wait=>未开始,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input};
测试获取项目团队 >> 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=>所有,doing=>进行中,wait=>未开始,suspended=>已挂起,closed=>已关闭,control:select};orderBy:{name:排序,id_asc=>ID 递增,id_desc=>ID 递减,status_asc=>状态正序,status_desc=>状态倒序,control:select};count:{name:数量,default:20,control:input};'); // 测试获取项目团队
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};'); // 测试获取项目团队
test/model/block/getwelcomeblockdata.php
+2 -2
View File
@@ -10,10 +10,10 @@ title=测试 blockModel->getWelcomeBlockData();
cid=1
pid=1
获取欢迎区块的数据 >> {"tasks":"0","doneTasks":"0","bugs":85,"stories":0,"executions":739,"products":80,"delayTask":0,"delayBug":74,"delayProject":0}
*/
$block = new blockTest();
r($block->getWelcomeBlockDataTest()) && p() && e();
r($block->getWelcomeBlockDataTest()) && p() && e('{"tasks":"0","doneTasks":"0","bugs":85,"stories":0,"executions":739,"products":80,"delayTask":0,"delayBug":74,"delayProject":0}'); // 获取欢迎区块的数据
test/model/block/initblock.php
+1 -1
View File
@@ -59,4 +59,4 @@ r($dataList[6]) && p("blockData:module;blockData:type") && e('qa;');
r($dataList[7]) && p("blockInited;blockversion") && e('1;2'); // 获取空区块版本
r($dataList[7]) && p("blockData") && e('0'); // 获取空区块数据
$db->restoreDB();
$db->restoreDB();
test/model/block/save.php
+8 -8
View File
@@ -13,13 +13,13 @@ pid=1
测试修改block 名称 >> 欢迎test,my,8,welcome
测试修改block 模块 >> 我的贡献,my,8,dynamic
测试修改block 区块 >> 项目统计,my,8,projectteam
测试修改block 变量 >> 未关闭的产品,product,8,statistic
测试修改block 区块 >> 项目统计,projectteam,8,projectteam
测试修改block 变量 >> 未关闭的产品,statistic,8,statistic
*/
$blockID = array('95', '99', '113');
$module = 'product';
$source = 'product';
$changeTitle = new stdclass();
$changeTitle->modules = 'welcome';
@@ -51,8 +51,8 @@ $changeParams->actionLink = '/block-set-95-welcome-.html';
$block = new blockTest();
r($block->saveTest($changeTitle, $blockID[0], $changeTitle->modules)) && p('title,module,grid,block') && e('欢迎test,my,8,welcome'); // 测试修改block 名称
r($block->saveTest($changeModules, $blockID[0], $changModules->modules)) && p('title,module,grid,block') && e('我的贡献,my,8,dynamic'); // 测试修改block 模块
r($block->saveTest($changeBlock, $blockID[1], $changeBlock->modules, $changeBlock->moduleBlock)) && p('title,module,grid,block') && e('项目统计,my,8,projectteam'); // 测试修改block 区块
r($block->saveTest($changeParams, $blockID[2], $changeParams->modules, $changeParams->moduleBlock, $module)) && p('title,module,grid,block') && e('未关闭的产品,product,8,statistic'); // 测试修改block 变量
$db->restoreDB();
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 变量
$db->restoreDB();