From b7c55b8e40fd8a65b24f291cecf089a11d6c2a5b Mon Sep 17 00:00:00 2001 From: songchenxuan Date: Thu, 25 Jul 2024 16:39:43 +0800 Subject: [PATCH] * [misc] modify cron test case. --- module/cron/test/model/checkchange.php | 19 +++-------- module/cron/test/model/create.php | 6 +++- module/cron/test/model/getbyid.php | 4 +-- module/cron/test/model/getcrons.php | 6 ++-- module/cron/test/model/getlasttime.php | 2 +- module/cron/test/model/logcron.php | 2 +- module/cron/test/model/parsecron.php | 4 +-- module/cron/test/model/update.php | 6 +++- test/data/cron.sql | 45 ++++++++++++++------------ 9 files changed, 48 insertions(+), 46 deletions(-) diff --git a/module/cron/test/model/checkchange.php b/module/cron/test/model/checkchange.php index 75617d22d3..5d520c519f 100755 --- a/module/cron/test/model/checkchange.php +++ b/module/cron/test/model/checkchange.php @@ -15,20 +15,11 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/cron.unittest.class.php'; su('admin'); +global $app; +include($app->getModuleRoot() . '/cron/control.php'); +$app->control = new cron(); + $cron = new cronTest(); $cron->init(); -r($cron->checkChangeTest()) && p() && e('0'); //判断是否存在时间是0000-00-00 00:00:00状态不是stop的定时任务存在 - -$cron1 = new stdClass(); -$cron1->m = '55'; -$cron1->h = '23'; -$cron1->dom = '30'; -$cron1->mon = '12'; -$cron1->dow = '6'; -$cron1->remark = ''; -$cron1->type = 'zentao' ; -$cron1->command = 'moduleName=test&methodName=test'; -$cron->updateTest(1, $cron1); - -r($cron->checkChangeTest()) && p() && e('1'); //修改定时任务后，判断是否存在时间是0000-00-00 00:00:00状态不是stop的定时任务存在 \ No newline at end of file +r($cron->checkChangeTest()) && p() && e('1'); //判断是否存在时间是0000-00-00 00:00:00状态不是stop的定时任务存在 diff --git a/module/cron/test/model/create.php b/module/cron/test/model/create.php index fa7cc21656..e55f4f47a8 100755 --- a/module/cron/test/model/create.php +++ b/module/cron/test/model/create.php @@ -23,6 +23,10 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/cron.unittest.class.php'; su('admin'); +global $app; +include($app->getModuleRoot() . '/cron/control.php'); +$app->control = new cron(); + $cron = new cronTest(); $cron1 = new stdClass(); $cron1->m = '55'; @@ -40,4 +44,4 @@ $result2 = $cron->createTest($cron1); r($result1) && p('command') && e('『命令』不能为空。'); //命令为空时候返回值 r($result2) && p('command,type') && e('test comand,zentao'); //添加之后对比添加数据信息 -r($result2) && p('m,h,dom,mon,dow') && e('55,23,30,12,6'); //添加之后对比添加数据信息 \ No newline at end of file +r($result2) && p('m,h,dom,mon,dow') && e('55,23,30,12,6'); //添加之后对比添加数据信息 diff --git a/module/cron/test/model/getbyid.php b/module/cron/test/model/getbyid.php index 71ca629322..e529af5649 100755 --- a/module/cron/test/model/getbyid.php +++ b/module/cron/test/model/getbyid.php @@ -29,7 +29,7 @@ $cron = new cronTest(); $cron->init(); $cronInfo1 = $cron->getByIdTest(2); -$cronInfo2 = $cron->getByIdTest(16); +$cronInfo2 = $cron->getByIdTest(11); r($cronInfo1) && p('command,remark,m,h,status') && e('moduleName=execution&methodName=computeburn,更新燃尽图,30,23,normal'); //获取ID为2的定时的命令，备注，分，时 -r($cronInfo2) && p('command,remark,m,h,status') && e('moduleName=effort&methodName=remindNotRecord,提醒录入日志,30,7,stop'); //获取ID为16的定时的命令，备注，分，时 \ No newline at end of file +r($cronInfo2) && p('command,remark,m,h,status') && e('moduleName=todo&methodName=createCycle,生成周期性待办,1,1,normal'); //获取ID为11的定时的命令，备注，分，时 diff --git a/module/cron/test/model/getcrons.php b/module/cron/test/model/getcrons.php index 19d780d556..7038644273 100755 --- a/module/cron/test/model/getcrons.php +++ b/module/cron/test/model/getcrons.php @@ -24,6 +24,6 @@ $cron->init(); $list = $cron->getCronsTest(); $noStopList = $cron->getCronsTest('nostop'); -r(count($list)) && p() && e('17'); // 没有筛选条件时候，获取所有定时任务 -r(count($noStopList)) && p() && e('14'); // 有筛选条件时候，获取定时任务 -r($list) && p('12:remark,command') && e('同步DevOps构建任务状态,moduleName=ci&methodName=checkCompileStatus'); // 获取某个定时任务的信息 \ No newline at end of file +r(count($list)) && p() && e('22'); // 没有筛选条件时候，获取所有定时任务 +r(count($noStopList)) && p() && e('19'); // 有筛选条件时候，获取定时任务 +r($list) && p('12:remark,command') && e('创建周期性任务,moduleName=ci&methodName=initQueue'); // 获取某个定时任务的信息 diff --git a/module/cron/test/model/getlasttime.php b/module/cron/test/model/getlasttime.php index c33b49321c..6af583a581 100755 --- a/module/cron/test/model/getlasttime.php +++ b/module/cron/test/model/getlasttime.php @@ -17,4 +17,4 @@ su('admin'); $cron = new cronTest(); $lastTime = $cron->getLastTimeTest(); -r(strlen($lastTime)) && p() && e('0'); //获取最后执行时间进行对比 +r(strlen($lastTime)) && p() && e('19'); //获取最后执行时间进行对比 diff --git a/module/cron/test/model/logcron.php b/module/cron/test/model/logcron.php index 3f2549ea2a..f46d3ccbe2 100755 --- a/module/cron/test/model/logcron.php +++ b/module/cron/test/model/logcron.php @@ -22,4 +22,4 @@ $cron->logCronTest('cronlogtest'); $info = file_get_contents($file); $strExists = strpos($info, 'cronlogtest'); -r($strExists) && p() && e('0');// 调用日志方法查看日志文件该字符串位置 +r($strExists) && p() && e('14');// 调用日志方法查看日志文件该字符串位置 diff --git a/module/cron/test/model/parsecron.php b/module/cron/test/model/parsecron.php index 2205eb2e2f..5b09a0ce88 100755 --- a/module/cron/test/model/parsecron.php +++ b/module/cron/test/model/parsecron.php @@ -23,5 +23,5 @@ $crons = $tester->cron->getCrons('nostop'); $parse = $cron->parseCronTest($crons); r($parse) && p('2:command') && e('moduleName=execution&methodName=computeburn'); //获取id为2的定时任务的定时信息和命令信息 -r($parse) && p('3:command') && e('moduleName=report&methodName=remind'); //获取id为3的定时任务的定时信息和命令信息 -r($parse) && p('1:command') && e('~~'); //获取id为1的定时任务的定时信息和命令信息 \ No newline at end of file +r($parse) && p('3:command') && e('moduleName=execution&methodName=computecfd'); //获取id为3的定时任务的定时信息和命令信息 +r($parse) && p('1:command') && e('~~'); //获取id为1的定时任务的定时信息和命令信息 diff --git a/module/cron/test/model/update.php b/module/cron/test/model/update.php index 562f40082b..cff0a45594 100755 --- a/module/cron/test/model/update.php +++ b/module/cron/test/model/update.php @@ -23,6 +23,10 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/lib/cron.unittest.class.php'; su('admin'); +global $app; +include($app->getModuleRoot() . '/cron/control.php'); +$app->control = new cron(); + $cron = new cronTest(); $cronID = 1; $cron1 = new stdClass(); @@ -41,4 +45,4 @@ $result2 = $cron->updateTest($cronID, $cron1); r($result1) && p('command') && e('『命令』不能为空。'); //命令为空时候返回值 r($result2) && p('command,type') && e('test comand,zentao'); //更新之后对比更新数据信息 -r($result2) && p('m,h,dom,mon,dow') && e('55,23,30,12,6'); //更新之后对比更新数据信息 \ No newline at end of file +r($result2) && p('m,h,dom,mon,dow') && e('55,23,30,12,6'); //更新之后对比更新数据信息 diff --git a/test/data/cron.sql b/test/data/cron.sql index 7d85f257b3..5e24bf08b2 100644 --- a/test/data/cron.sql +++ b/test/data/cron.sql @@ -1,22 +1,25 @@ truncate `zt_cron`; -INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES -('*', '*', '*', '*', '*', '', '监控定时任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('30', '23', '*', '*', '*', 'moduleName=execution&methodName=computeburn', '更新燃尽图', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('0', '8', '*', '*', '*', 'moduleName=report&methodName=remind', '每日任务提醒', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=svn&methodName=run', '同步SVN', 'zentao', 1, 'stop', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=git&methodName=run', '同步GIT', 'zentao', 1, 'stop', '0000-00-00 00:00:00'), -('30', '0', '*', '*', '*', 'moduleName=backup&methodName=backup', '备份数据和附件', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=mail&methodName=asyncSend', '异步发信', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=webhook&methodName=asyncSend', '异步发送Webhook', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('1', '0', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步DevOps构建任务状态', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行DevOps构建任务', 'zentao', 1, 'normal', '0000-00-00 00:00:00'), -('*/5', '*', '*', '*', '*', 'moduleName=mr&methodName=syncMR', '定时同步GitLab合并数据到禅道数据库', 'zentao', 1, 'normal', '0000-00-00 00:00:00'); -INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('30', '23', '*', '*', '*', 'moduleName=execution&methodName=computeTaskEffort', '计算任务剩余工时', 'zentao', '1', 'normal', '0000-00-00 00:00:00'); -INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('30', '7', '*', '*', '*', 'moduleName=effort&methodName=remindNotRecord', '提醒录入日志', 'zentao', '1', 'stop', '0000-00-00 00:00:00'); -REPLACE INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES -('1','0','*','*','*','moduleName=weekly&methodName=computeWeekly','更新项目周报','system',0,'normal','2020-08-27 10:07:53'), -('1','0','*','*','*','moduleName=measurement&methodName=initCrontabQueue','初始化度量队列','zentao',0,'normal','2020-07-07 14:51:48'), -('*/5','*','*','*','*','moduleName=measurement&methodName=execCrontabQueue','执行度量队列','zentao',0,'running','2020-07-10 13:10:58'); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`) VALUES +('*', '*', '*', '*', '*', '', '监控定时任务', 'zentao', 1, 'normal'), +('30', '23', '*', '*', '*', 'moduleName=execution&methodName=computeburn', '更新燃尽图', 'zentao', 1, 'normal'), +('30', '23', '*', '*', '*', 'moduleName=execution&methodName=computecfd', '更新累积流图', 'zentao', 1, 'normal'), +('0', '8', '*', '*', '*', 'moduleName=report&methodName=remind', '每日任务提醒', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=svn&methodName=run', '同步SVN', 'zentao', 1, 'stop'), +('*/5', '*', '*', '*', '*', 'moduleName=git&methodName=run', '同步GIT', 'zentao', 1, 'stop'), +('30', '0', '*', '*', '*', 'moduleName=backup&methodName=backup', '备份数据和附件', 'zentao', 1, 'normal'), +('*/1', '*', '*', '*', '*', 'moduleName=mail&methodName=asyncSend', '异步发信', 'zentao', 1, 'normal'), +('*/1', '*', '*', '*', '*', 'moduleName=webhook&methodName=asyncSend', '异步发送Webhook', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=admin&methodName=deleteLog', '删除过期日志', 'zentao', 1, 'normal'), +('1', '1', '*', '*', '*', 'moduleName=todo&methodName=createCycle', '生成周期性待办', 'zentao', 1, 'normal'), +('1', '0', '*', '*', '*', 'moduleName=ci&methodName=initQueue', '创建周期性任务', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=checkCompileStatus', '同步DevOps构建任务状态', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=ci&methodName=exec', '执行DevOps构建任务', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=mr&methodName=syncMR', '定时同步GitLab合并数据到禅道数据库', 'zentao', 1, 'normal'), +('*/5', '*', '*', '*', '*', 'moduleName=compile&methodName=syncCompile', '定时同步构建记录', 'zentao', 1, 'normal'), +('0', '*', '*', '*', '*', 'moduleName=misc&methodName=cleanCache', '清理缓存文件', 'zentao', 1, 'normal'); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`) VALUES ('30', '23', '*', '*', '*', 'moduleName=execution&methodName=computeTaskEffort', '计算任务剩余工时', 'zentao', '1', 'normal'); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`) VALUES ('30', '7', '*', '*', '*', 'moduleName=effort&methodName=remindNotRecord', '提醒录入日志', 'zentao', '1', 'stop'); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('1', '1', '*', '*', '*', 'moduleName=metric&methodName=updateMetricLib', '计算度量数据', 'zentao', 1, 'normal', NUll); +INSERT INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`, `lastTime`) VALUES ('0', '*/1', '*', '*', '*', 'moduleName=metric&methodName=updateDashboardMetricLib', '计算仪表盘数据', 'zentao', 1, 'normal', NUll); +REPLACE INTO `zt_cron` (`m`, `h`, `dom`, `mon`, `dow`, `command`, `remark`, `type`, `buildin`, `status`) VALUES +('1','0','*','*','*','moduleName=weekly&methodName=computeWeekly','更新项目周报','zentao',0,'normal');