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

success my and weekly

Browse Source
This commit is contained in:
lanzongjun
2022-08-26 15:28:19 +08:00
parent 9b13b72041
commit 0e77885d3c
16 changed files with 74 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/class/my.class.php
+1 -4
View File
@@ -104,10 +104,7 @@ class myTest
$tester->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
$actionID = $tester->loadModel('action')->create('task', 6, 'assigned', '', '', 'admin', '');
$actionID = $tester->loadModel('action')->create('bug', 6, 'assigned', '', '', 'admin', '');
$actionID = $tester->loadModel('action')->create('story', 5, 'assigned', '', '', 'admin', '');
$objects = $this->objectModel->getAssignedByMe($account, $limit, $pager, $orderBy, $projectID, $objectType);
$objects = $this->objectModel->getAssignedByMe($account, $limit, $pager, $orderBy, $objectType);
if(dao::isError()) return dao::getError();
test/model/my/getassignedbyme.php
+2 -2
View File
@@ -13,7 +13,7 @@ pid=1
当插入一条action为admin指派了task的动态时，查询结果为1条数据 >> 1
当插入一条action为admin指派了bug的动态时，查询结果为1条数据 >> 1
当插入一条action为admin指派了需求的动态时，查询结果为1条数据 >> 0
当插入一条action为admin指派了需求的动态时，查询结果为0条数据 >> 0
*/
@@ -24,6 +24,6 @@ $story = array('admin', 0, '', 'id_desc', 0, 'story');
r($my->getAssignedByMeTest($task[0], $task[1], $task[2], $task[3], $task[4], $task[5])) && p() && e('1'); // 当插入一条action为admin指派了task的动态时，查询结果为1条数据
r($my->getAssignedByMeTest($bug[0], $bug[1], $bug[2], $bug[3], $bug[4], $bug[5])) && p() && e('1'); // 当插入一条action为admin指派了bug的动态时，查询结果为1条数据
r($my->getAssignedByMeTest($story[0], $story[1], $story[2], $story[3], $story[4], $story[5])) && p() && e('1'); // 当插入一条action为admin指派了需求的动态时，查询结果为0条数据
r($my->getAssignedByMeTest($story[0], $story[1], $story[2], $story[3], $story[4], $story[5])) && p() && e('0'); // 当插入一条action为admin指派了需求的动态时，查询结果为0条数据
$db->restoreDB();
test/model/my/gettestcasesbysearch.php
+1 -1
View File
@@ -27,4 +27,4 @@ $cases2 = $my->getTestcasesBySearchTest(0, $type[1], $order);
r($cases1) && p('560:title,status') && e('com.ngtesting.autotest.test.TestLogin账号过期,normal');//获取testcase状态的项目
r(count($cases1)) && p() && e('20'); //获取testcase的统计
r($cases2) && p('439:title,status') && e('com.ngtesting.autotest.test.TestLogin密码错误,normal');//获取testcase状态的项目
r(count($cases2)) && p() && e('18'); //获取testcase的统计
r(count($cases2)) && p() && e('18'); //获取testcase的统计
test/model/user/batchcreate.php
+1 -1
View File
@@ -20,7 +20,7 @@ $user = new userTest();
$normalUser = array();
$normalUser['account'] = array(1 => 'newtestuser1', 2 => 'newtestuser2', 3 => 'newtestuser3');
$normalUser['realname'] = array(1 => '新测试用户1', 2 => '新测试用户2', 3 => '新测试用户3');
$normalUser['visions'] = array(1 => 'rnd', 2 => 'rnd,lite', 3 => 'lite');
$normalUser['visions'] = array(1 => array('rnd'), 2 => array('rnd','lite'), 3 => array('lite'));
$normalUser['role'] = array(1 => 'qa', 2 => 'dev', 3 => 'pm');
$normalUser['email'] = array(1 => 'testasd@163.com', 2 => '', 3 => '11773@qq.com');
$normalUser['password'] = array(1 => 'e10adc3949ba59abbe56e057f20f883e', 2 => 'e10adc3949ba59abbe56e057f20f883e', 3 => 'e10adc3949ba59abbe56e057f20f883e');
test/model/user/processaccountsort.php
Regular → Executable
View File
test/model/weekly/getac.php
+10 -10
View File
@@ -10,11 +10,11 @@ title=测试 weeklyModel->getAC();
cid=1
pid=1
测试project值为0，date值为2022-05-01 >> 4191
测试project值为0，date值为空 >> 4191
测试project值为11，date值为2022-05-01 >> 21
测试project值为11，date值为空 >> 21
测试project值为41，date值为2022-05-01 >> 42
测试project值为0，date值为2022-05-01 >> 0
测试project值为0，date值为空 >> 4209
测试project值为11，date值为2022-05-01 >> 0
测试project值为11，date值为空 >> 39
测试project值为41，date值为2022-05-01 >> 0
测试project值为41，date值为空 >> 42
*/
@@ -23,9 +23,9 @@ $dateList = array('2022-05-01', '');
$weekly = new weeklyTest();
r($weekly->getACTest($projectList[0], $dateList[0])) && p() && e('4191'); //测试project值为0，date值为2022-05-01
r($weekly->getACTest($projectList[0], $dateList[1])) && p() && e('4191'); //测试project值为0，date值为空
r($weekly->getACTest($projectList[1], $dateList[0])) && p() && e('21'); //测试project值为11，date值为2022-05-01
r($weekly->getACTest($projectList[1], $dateList[1])) && p() && e('21'); //测试project值为11，date值为空
r($weekly->getACTest($projectList[2], $dateList[0])) && p() && e('42'); //测试project值为41，date值为2022-05-01
r($weekly->getACTest($projectList[0], $dateList[0])) && p() && e('0'); //测试project值为0，date值为2022-05-01
r($weekly->getACTest($projectList[0], $dateList[1])) && p() && e('4209'); //测试project值为0，date值为空
r($weekly->getACTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为11，date值为2022-05-01
r($weekly->getACTest($projectList[1], $dateList[1])) && p() && e('39'); //测试project值为11，date值为空
r($weekly->getACTest($projectList[2], $dateList[0])) && p() && e('0'); //测试project值为41，date值为2022-05-01
r($weekly->getACTest($projectList[2], $dateList[1])) && p() && e('42'); //测试project值为41，date值为空
test/model/weekly/getev.php
+8 -8
View File
@@ -10,10 +10,10 @@ title=测试 weeklyModel->getEV();
cid=1
pid=1
测试projectID值为0，date值为2022-05-01 >> 771.55
测试projectID值为0，date值为空 >> 2342.78
测试projectID值为11，date值为2022-05-01 >> 15.3
测试projectID值为11，date值为空 >> 54.18
测试projectID值为0，date值为2022-05-01 >> 768.75
测试projectID值为0，date值为空 >> 2347.38
测试projectID值为11，date值为2022-05-01 >> 12.5
测试projectID值为11，date值为空 >> 53.63
测试projectID值为41，date值为2022-05-01 >> 6.91
测试projectID值为41，date值为空 >> 19.87
@@ -23,9 +23,9 @@ $dateList = array('2022-05-01', '');
$weekly = new weeklyTest();
r($weekly->getEVTest($projectIDList[0], $dateList[0])) && p() && e('771.55'); //测试projectID值为0，date值为2022-05-01
r($weekly->getEVTest($projectIDList[0], $dateList[1])) && p() && e('2342.78'); //测试projectID值为0，date值为空
r($weekly->getEVTest($projectIDList[1], $dateList[0])) && p() && e('15.3'); //测试projectID值为11，date值为2022-05-01
r($weekly->getEVTest($projectIDList[1], $dateList[1])) && p() && e('54.18'); //测试projectID值为11，date值为空
r($weekly->getEVTest($projectIDList[0], $dateList[0])) && p() && e('768.75'); //测试projectID值为0，date值为2022-05-01
r($weekly->getEVTest($projectIDList[0], $dateList[1])) && p() && e('2347.38'); //测试projectID值为0，date值为空
r($weekly->getEVTest($projectIDList[1], $dateList[0])) && p() && e('12.5'); //测试projectID值为11，date值为2022-05-01
r($weekly->getEVTest($projectIDList[1], $dateList[1])) && p() && e('53.63'); //测试projectID值为11，date值为空
r($weekly->getEVTest($projectIDList[2], $dateList[0])) && p() && e('6.91'); //测试projectID值为41，date值为2022-05-01
r($weekly->getEVTest($projectIDList[2], $dateList[1])) && p() && e('19.87'); //测试projectID值为41，date值为空
test/model/weekly/getlastday.php
+6 -7
View File
@@ -10,16 +10,15 @@ title=测试 weeklyModel->getLastDay();
cid=1
pid=1
查询日期为星期日 >> 2022-05-07
查询日期为其他 >> 2022-05-01
查询日期为空 >> 2022-05-10
查询日期为星期日 >> 2022-05-06
查询日期为其他 >> 2022-04-29
查询日期为空 >> 2022-08-29
*/
$date = array('2022-05-08', '2022-04-29', '');
$weekly = new weeklyTest();
r($weekly->getLastDayTest($date[0])) && p() && e('2022-05-07'); //查询日期为星期日
r($weekly->getLastDayTest($date[1])) && p() && e('2022-05-01'); //查询日期为其他
r($weekly->getLastDayTest($date[2])) && p() && e('2022-05-10'); //查询日期为空
r($weekly->getLastDayTest($date[0])) && p() && e('2022-05-06'); //查询日期为星期日
r($weekly->getLastDayTest($date[1])) && p() && e('2022-04-29'); //查询日期为其他
r($weekly->getLastDayTest($date[2])) && p() && e('2022-08-29'); //查询日期为空
test/model/weekly/getpagenav.php
+3 -3
View File
@@ -1,4 +1,4 @@
usr/bin/env php
#!/usr/bin/env php
<?php
include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
include dirname(dirname(dirname(__FILE__))) . '/class/weekly.class.php';
@@ -24,8 +24,8 @@ $productID = array('19', '13', '17', '18');
$date = array('2022-05-07', '');
$weekly = new weeklyTest();
r($weekly->getPageNavTest($productID[0], $date[0])) && p() && e('周报-项目9'); //查询项目为未开始，日期为当天的数据
r($weekly->getPageNavTest($productID[0], $date[1])) && p() && e('周报-项目9'); //查询项目为未开始，日期为一周前的数据
r($weekly->getPageNavTest($productID[0], $date[0])) && p() && e('周报-项目9'); //查询项目为未开始，日期为当天的数据
r($weekly->getPageNavTest($productID[0], $date[1])) && p() && e('周报-项目9'); //查询项目为未开始，日期为一周前的数据
r($weekly->getPageNavTest($productID[1], $date[0])) && p() && e('周报-项目3'); //查询项目为进行中，日期为当天的数据
r($weekly->getPageNavTest($productID[1], $date[1])) && p() && e('周报-项目3'); //查询项目为进行中，日期为一周前的数据
r($weekly->getPageNavTest($productID[2], $date[0])) && p() && e('周报-项目7'); //查询项目为已挂起，日期为当天的数据
test/model/weekly/getplanedtaskbyweek.php
+6 -6
View File
@@ -11,11 +11,11 @@ cid=1
pid=1
测试project值为0，date值为2022-05-01 >> 子任务5
测试project值为0，date值为空 >> 开发任务610
测试project值为0，date值为空 >> 0
测试project值为1，date值为2022-05-01 >> 0
测试project值为1，date值为空 >> 0
测试project值为11，date值为2022-05-01 >> 开发任务11
测试project值为11，date值为空 >> 开发任务11
测试project值为11，date值为空 >> 0
*/
$projectList = array(0, 1, 11);
@@ -24,8 +24,8 @@ $dateList = array('2022-05-01', '');
$weekly = new weeklyTest();
r($weekly->getPlanedTaskByWeekTest($projectList[0], $dateList[0])) && p('905:name') && e('子任务5'); //测试project值为0，date值为2022-05-01
r($weekly->getPlanedTaskByWeekTest($projectList[0], $dateList[1])) && p('600:name') && e('开发任务610'); //测试project值为0，date值为空
r($weekly->getPlanedTaskByWeekTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-05-01
r($weekly->getPlanedTaskByWeekTest($projectList[1], $dateList[1])) && p() && e('0'); //测试project值为1，date值为空
r($weekly->getPlanedTaskByWeekTest($projectList[0], $dateList[1])) && p('600:name') && e('0'); //测试project值为0，date值为空
r($weekly->getPlanedTaskByWeekTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-05-01
r($weekly->getPlanedTaskByWeekTest($projectList[1], $dateList[1])) && p() && e('0'); //测试project值为1，date值为空
r($weekly->getPlanedTaskByWeekTest($projectList[2], $dateList[0])) && p('1:name') && e('开发任务11'); //测试project值为11，date值为2022-05-01
r($weekly->getPlanedTaskByWeekTest($projectList[2], $dateList[1])) && p('1:name') && e('开发任务11'); //测试project值为11，date值为空
r($weekly->getPlanedTaskByWeekTest($projectList[2], $dateList[1])) && p('1:name') && e('0'); //测试project值为11，date值为空
test/model/weekly/getpostponed.php
+11 -11
View File
@@ -10,22 +10,22 @@ title=测试 weeklyModel->getPostponed();
cid=1
pid=1
测试project值为0，date值为2022-05-01 >> 子任务4
测试project值为0，date值为空 >> 开发任务608
测试project值为1，date值为2022-05-01 >> 0
测试project值为0，date值为2022-07-30 >> 更多任务202
测试project值为0，date值为空 >> 0
测试project值为1，date值为2022-07-30 >> 0
测试project值为1，date值为空 >> 0
测试project值为11，date值为2022-05-01 >> 开发任务101
测试project值为11，date值为空 >> 开发任务461
测试project值为11，date值为2022-07-30 >> 更多任务272
测试project值为11，date值为空 >> 0
*/
$projectList = array(0, 1, 11);
$dateList = array('2022-05-01', '');
$dateList = array('2022-07-30', '');
$weekly = new weeklyTest();
r($weekly->getPostponedTest($projectList[0], $dateList[0])) && p('92:name') && e('子任务4'); //测试project值为0，date值为2022-05-01
r($weekly->getPostponedTest($projectList[0], $dateList[1])) && p('56:name') && e('开发任务608'); //测试project值为0，date值为空
r($weekly->getPostponedTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-05-01
r($weekly->getPostponedTest($projectList[0], $dateList[0])) && p('92:name') && e('更多任务202'); //测试project值为0，date值为2022-07-30
r($weekly->getPostponedTest($projectList[0], $dateList[1])) && p('56:name') && e('0'); //测试project值为0，date值为空
r($weekly->getPostponedTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-07-30
r($weekly->getPostponedTest($projectList[1], $dateList[1])) && p() && e('0'); //测试project值为1，date值为空
r($weekly->getPostponedTest($projectList[2], $dateList[0])) && p('5:name') && e('开发任务101'); //测试project值为11，date值为2022-05-01
r($weekly->getPostponedTest($projectList[2], $dateList[1])) && p('1:name') && e('开发任务461'); //测试project值为11，date值为空
r($weekly->getPostponedTest($projectList[2], $dateList[0])) && p('2:name') && e('更多任务272'); //测试project值为11，date值为2022-07-30
r($weekly->getPostponedTest($projectList[2], $dateList[1])) && p('1:name') && e('0'); //测试project值为11，date值为空
test/model/weekly/gettasksofnextweek.php
+12 -13
View File
@@ -10,23 +10,22 @@ title=测试 weeklyModel->getTasksOfNextWeek();
cid=1
pid=1
测试project值为0，date值为2022-05-01 >> 子任务10
测试project值为0，date值为空 >> 开发任务606
测试project值为1，date值为2022-05-01 >> 0
测试project值为0，date值为2022-07-30 >> 子任务6
测试project值为0，date值为空 >> 0
测试project值为1，date值为2022-07-30 >> 0
测试project值为1，date值为空 >> 0
测试project值为11，date值为2022-05-01 >> 开发任务551
测试project值为11，date值为空 >> 开发任务11
测试project值为11，date值为2022-07-30 >> 开发任务371
测试project值为11，date值为空 >> 0
*/
$projectList = array(0, 1, 11);
$dateList = array('2022-05-01', '');
$dateList = array('2022-07-30', '');
$weekly = new weeklyTest();
r($weekly->getTasksOfNextWeekTest($projectList[0], $dateList[0])) && p('910:name') && e('子任务10'); //测试project值为0，date值为2022-05-01
r($weekly->getTasksOfNextWeekTest($projectList[0], $dateList[1])) && p('596:name') && e('开发任务606'); //测试project值为0，date值为空
r($weekly->getTasksOfNextWeekTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-05-01
r($weekly->getTasksOfNextWeekTest($projectList[1], $dateList[1])) && p() && e('0'); //测试project值为1，date值为空
r($weekly->getTasksOfNextWeekTest($projectList[2], $dateList[0])) && p('541:name') && e('开发任务551'); //测试project值为11，date值为2022-05-01
r($weekly->getTasksOfNextWeekTest($projectList[2], $dateList[1])) && p('1:name') && e('开发任务11'); //测试project值为11，date值为空
r($weekly->getTasksOfNextWeekTest($projectList[0], $dateList[0])) && p('906:name') && e('子任务6'); //测试project值为0，date值为2022-07-30
r($weekly->getTasksOfNextWeekTest($projectList[0], $dateList[1])) && p() && e('0'); //测试project值为0，date值为空
r($weekly->getTasksOfNextWeekTest($projectList[1], $dateList[0])) && p() && e('0'); //测试project值为1，date值为2022-07-30
r($weekly->getTasksOfNextWeekTest($projectList[1], $dateList[1])) && p() && e('0'); //测试project值为1，date值为空
r($weekly->getTasksOfNextWeekTest($projectList[2], $dateList[0])) && p('361:name') && e('开发任务371'); //测试project值为11，date值为2022-07-30
r($weekly->getTasksOfNextWeekTest($projectList[2], $dateList[1])) && p() && e('0'); //测试project值为11，date值为空
test/model/weekly/getthismonday.php
+3 -3
View File
@@ -12,13 +12,13 @@ pid=1
查询日期为星期日 >> 2022-05-02
查询日期为其他 >> 2022-04-25
查询日期为空 >> 2022-05-04
查询日期为空 >> 2022-03-21
*/
$date = array('2022-05-08', '2022-04-29', '');
$date = array('2022-05-08', '2022-04-29', '2022-03-25');
$weekly = new weeklyTest();
r($weekly->getThisMondayTest($date[0])) && p() && e('2022-05-02'); //查询日期为星期日
r($weekly->getThisMondayTest($date[1])) && p() && e('2022-04-25'); //查询日期为其他
r($weekly->getThisMondayTest($date[2])) && p() && e('2022-05-04'); //查询日期为空
r($weekly->getThisMondayTest($date[2])) && p() && e('2022-03-21'); //查询日期为空
test/model/weekly/getthissunday.php
+3 -3
View File
@@ -12,13 +12,13 @@ pid=1
查询日期为星期日 >> 2022-05-08
查询日期为其他 >> 2022-05-01
查询日期为空 >> 2022-05-10
查询日期为空 >> 2022-03-06
*/
$date = array('2022-05-08', '2022-04-29', '');
$date = array('2022-05-08', '2022-04-29', '2022-03-01');
$weekly = new weeklyTest();
r($weekly->getThisSundayTest($date[0])) && p() && e('2022-05-08'); //查询日期为星期日
r($weekly->getThisSundayTest($date[1])) && p() && e('2022-05-01'); //查询日期为其他
r($weekly->getThisSundayTest($date[2])) && p() && e('2022-05-10'); //查询日期为空
r($weekly->getThisSundayTest($date[2])) && p() && e('2022-03-06'); //查询日期为空
test/model/weekly/getworkloadbytype.php
+4 -4
View File
@@ -10,9 +10,9 @@ title=测试 weeklyModel->getWorkloadByType();
cid=1
pid=1
测试project值为0 >> 574.00,568.00,563.00,556.00,557.00,571.00,563.00,566.00
测试project值为0 >> 577.00,568.00,563.00,556.00,557.00,571.00,563.00,566.00
测试project值为1 >> 0
测试project值为11 >> 24.00,11.00,16.00,3.00,9.00,5.00,18.00,14.00
测试project值为11 >> 27.00,11.00,16.00,3.00,9.00,5.00,18.00,14.00
测试project值为41 >> 13.00,12.00,3.00,7.00
*/
@@ -20,7 +20,7 @@ $projectList = array(0, 1, 11, 41);
$weekly = new weeklyTest();
r($weekly->getWorkloadByTypeTest($projectList[0])) && p('design,devel,test,study,discuss,ui,affair,misc') && e('574.00,568.00,563.00,556.00,557.00,571.00,563.00,566.00'); //测试project值为0
r($weekly->getWorkloadByTypeTest($projectList[0])) && p('design,devel,test,study,discuss,ui,affair,misc') && e('577.00,568.00,563.00,556.00,557.00,571.00,563.00,566.00'); //测试project值为0
r($weekly->getWorkloadByTypeTest($projectList[1])) && p() && e('0'); //测试project值为1
r($weekly->getWorkloadByTypeTest($projectList[2])) && p('design,devel,test,study,discuss,ui,affair,misc') && e('24.00,11.00,16.00,3.00,9.00,5.00,18.00,14.00'); //测试project值为11
r($weekly->getWorkloadByTypeTest($projectList[2])) && p('design,devel,test,study,discuss,ui,affair,misc') && e('27.00,11.00,16.00,3.00,9.00,5.00,18.00,14.00'); //测试project值为11
r($weekly->getWorkloadByTypeTest($projectList[3])) && p('affair,test,study,discuss') && e('13.00,12.00,3.00,7.00'); //测试project值为41
test/ztest
+3
View File
@@ -181,6 +181,9 @@ switch($argv[1])
case 'user':
ztfRun('model/user');
break;
case 'weekly':
ztfRun('model/weekly');
break;
case 'gitlab':
ztfRun('model/gitlab');
break;