From 3cba2fa09b4384720fad86befbf416e5d35ff643 Mon Sep 17 00:00:00 2001
From: songchenxuan <songchenxuan@easycorp.ltd>
Date: Wed, 24 Jul 2024 14:38:12 +0800
Subject: [PATCH] * [misc] modify metric test.

---
 .../calc/execution/rate/progress_of_task_in_execution.php     | 2 +-
 module/metric/test/model/getcalcinstancelist.php              | 4 ++--
 module/metric/test/model/getcontroloptions.php                | 4 ++--
 module/metric/test/yaml/execution.yaml                        | 2 ++
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/module/metric/test/calc/execution/rate/progress_of_task_in_execution.php b/module/metric/test/calc/execution/rate/progress_of_task_in_execution.php
index 14a2199182..11612f48cb 100755
--- a/module/metric/test/calc/execution/rate/progress_of_task_in_execution.php
+++ b/module/metric/test/calc/execution/rate/progress_of_task_in_execution.php
@@ -28,4 +28,4 @@ r(count($calc->getResult())) && p('') && e('10'); // 测试分组数。
 r($calc->getResult(array('execution' => 11))) && p('0:value') && e('0.5'); // 测试执行11的进度
 r($calc->getResult(array('execution' => 12))) && p('0:value') && e('0.5'); // 测试执行12的进度
 r($calc->getResult(array('execution' => 13))) && p('0:value') && e('0.5'); // 测试执行13的进度
-r($calc->getResult(array('execution' => 110))) && p('') && e('0');         // 测试不存在执行的进度
\ No newline at end of file
+r($calc->getResult(array('execution' => 110))) && p('') && e('0');         // 测试不存在执行的进度
diff --git a/module/metric/test/model/getcalcinstancelist.php b/module/metric/test/model/getcalcinstancelist.php
index e461250db1..a4a8cdde7a 100755
--- a/module/metric/test/model/getcalcinstancelist.php
+++ b/module/metric/test/model/getcalcinstancelist.php
@@ -38,9 +38,9 @@ su('admin');
 $metric = new metricTest();
 
 r($metric->getCalcInstanceList()) && p('count_of_task_in_project:dataset,id')           && e('getTasks,221');                 // 测试count_of_task_in_project的数据源和编号
-r($metric->getCalcInstanceList()) && p('count_of_unclosed_story_in_project:dataset,id') && e('getDevStoriesWithProject,213'); // 测试count_of_unclosed_story_in_project的数据源和编号
+r($metric->getCalcInstanceList()) && p('count_of_unclosed_story_in_project:dataset,id') && e('getAllStoriesWithProject,213'); // 测试count_of_unclosed_story_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('count_of_user_in_project:dataset,id')           && e('getTeamMembers,236');           // 测试count_of_user_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('count_of_valid_story_in_project:dataset,id')    && e('getDevStoriesWithProject,216'); // 测试count_of_valid_story_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('consume_of_all_in_project:dataset,id')          && e('getProjectEfforts,237');        // 测试consume_of_all_in_project的数据源和编号
 r($metric->getCalcInstanceList()) && p('ac_of_weekly_all_in_waterfall:dataset,id')      && e('getWaterfallEfforts,239');      // 测试ac_of_all_in_waterfall的数据源和编号
-r($metric->getCalcInstanceList()) && p('count_of_pending_story_in_user:dataset,id')     && e('getAllDevStories,259');         // 测试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,259');         // 测试count_of_pending_story_in_user的数据源和编号
diff --git a/module/metric/test/model/getcontroloptions.php b/module/metric/test/model/getcontroloptions.php
index 3d22539b3f..746abfcf35 100755
--- a/module/metric/test/model/getcontroloptions.php
+++ b/module/metric/test/model/getcontroloptions.php
@@ -22,6 +22,6 @@ $metric = new metricTest();
 zenData('user')->loadYaml('user', true)->gen(30);
 zenData('product')->loadYaml('product', true)->gen(10);
 
-r(count($metric->getControlOptions('user')))      && p('') && e('11'); // 测试user对象数
+r(count($metric->getControlOptions('user')))      && p('') && e('12'); // 测试user对象数
 r(count($metric->getControlOptions('product')))   && p('') && e('5');  // 测试product对象数
-r(count($metric->getControlOptions('waterfall'))) && p('') && e('1');  // 测试传入错误参数的结果
\ No newline at end of file
+r(count($metric->getControlOptions('waterfall'))) && p('') && e('1');  // 测试传入错误参数的结果
diff --git a/module/metric/test/yaml/execution.yaml b/module/metric/test/yaml/execution.yaml
index dde67a8f12..517b2fad89 100644
--- a/module/metric/test/yaml/execution.yaml
+++ b/module/metric/test/yaml/execution.yaml
@@ -29,4 +29,6 @@ fields:
   range: "20120101 000000-20220101 000000:10D"
   type: timestamp
   format: YYYY-MM-DD
+- field: progress
+  range: 50
 ...