From 0029ebdafe39c64fe279ae2d8a76df62dadd725f Mon Sep 17 00:00:00 2001
From: qixinzhi <qixinzhi@easycorp.ltd>
Date: Wed, 24 Jan 2024 16:39:38 +0800
Subject: [PATCH] * Fix unit test.

---
 module/metric/test/model/getcalcinstancelist.php | 4 ++--
 module/metric/test/model/getgrouptable.php       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/module/metric/test/model/getcalcinstancelist.php b/module/metric/test/model/getcalcinstancelist.php
index e5ced9802c..6d9f652301 100755
--- a/module/metric/test/model/getcalcinstancelist.php
+++ b/module/metric/test/model/getcalcinstancelist.php
@@ -26,7 +26,7 @@ cid=1
  - 第ac_of_all_in_waterfall条的dataset属性 @~~
  - 第ac_of_all_in_waterfall条的id属性 @231
 - 测试count_of_pending_story_in_user的数据源和编号
- - 第count_of_pending_story_in_user条的dataset属性 @getDevStories
+ - 第count_of_pending_story_in_user条的dataset属性 @getAllDevStories
  - 第count_of_pending_story_in_user条的id属性 @251
 
 */
@@ -43,4 +43,4 @@ r($metric->getCalcInstanceList()) && p('count_of_user_in_project:dataset,id')
 r($metric->getCalcInstanceList()) && p('count_of_valid_story_in_project:dataset,id')    && e('getDevStoriesWithProject,208'); // 测试count_of_valid_story_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('consume_of_all_in_project:dataset,id')          && e('~~,229');                       // 测试consume_of_all_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('ac_of_all_in_waterfall:dataset,id')             && e('~~,231');                       // 测试ac_of_all_in_waterfall的数据源和编号
-r($metric->getCalcInstanceList()) && p('count_of_pending_story_in_user:dataset,id')     && e('getDevStories,251');            // 测试count_of_pending_story_in_user的数据源和编号
\ No newline at end of file
+r($metric->getCalcInstanceList()) && p('count_of_pending_story_in_user:dataset,id')     && e('getAllDevStories,251');         // 测试count_of_pending_story_in_user的数据源和编号
\ No newline at end of file
diff --git a/module/metric/test/model/getgrouptable.php b/module/metric/test/model/getgrouptable.php
index fc7288f5ff..d2d3a47b72 100755
--- a/module/metric/test/model/getgrouptable.php
+++ b/module/metric/test/model/getgrouptable.php
@@ -71,7 +71,7 @@ $resultData3[] = (object) array('date' => '2023-10-20', 'dateString' => '2023-10
 $resultData3[] = (object) array('date' => '2023-11-12', 'dateString' => '2023-11-12', 'dateType' => 'day', 'value' => 1, 'calcTime' => '2021-11-23 0:23');
 $resultData3[] = (object) array('date' => '2023-11-13', 'dateString' => '2023-11-13', 'dateType' => 'day', 'value' => 1, 'calcTime' => '2021-11-23 0:23');
 
-$group1 = $metric->getGroupTable($resultHeader1, $resultData1);
+$group1 = (array)$metric->getGroupTable($resultHeader1, $resultData1);
 r($group1) && p('0:name;1:name') && e('date,value'); // 传入resultHeader1和resultData1，获取header
 
 $group1 = $metric->getGroupTable($resultHeader1, $resultData1, false, false);
@@ -85,7 +85,7 @@ $group2 = $metric->getGroupTable($resultHeader2, $resultData2, false, false);
 r($group2[0]) && p('scope;2023:0') && e('开源,3');  // 传入resultHeader2和resultData2，获取data[0]
 r($group2[1]) && p('scope;2022:0') && e('ddddw,9'); // 传入resultHeader2和resultData2，获取data[1]
 
-$group3 = $metric->getGroupTable($resultHeader3, $resultData3);
+$group3 = (array)$metric->getGroupTable($resultHeader3, $resultData3);
 r($group3) && p('0:name;1:name') && e('date,value'); // 传入resultHeader2和resultData2，获取header
 
 $group3 = $metric->getGroupTable($resultHeader3, $resultData3, false, false);