From d7c1089c2fb754c5ddefdbbd26fa7ddf90c30410 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 2 Aug 2023 10:58:34 +0800
Subject: [PATCH] * Add unit test for metric.

---
 .../global/scale/count_of_doing_program.php   |  2 +-
 .../count_of_annual_closed_top_program.php    |  2 +-
 .../count_of_annual_created_top_program.php   |  2 +-
 .../global/scale/count_of_closed_program.php  |  6 ++---
 .../scale/count_of_closed_top_program.php     |  2 +-
 .../global/scale/count_of_doing_program.php   | 19 +++++++++++++++
 .../global/scale/count_of_top_program.php     |  6 ++---
 module/metric/test/yaml/program.yaml          |  2 +-
 module/metric/test/yaml/program_closed.yaml   | 24 +++++++++++++++++++
 9 files changed, 54 insertions(+), 11 deletions(-)
 create mode 100755 module/metric/test/calc/global/scale/count_of_doing_program.php
 create mode 100644 module/metric/test/yaml/program_closed.yaml

diff --git a/module/metric/calc/global/scale/count_of_doing_program.php b/module/metric/calc/global/scale/count_of_doing_program.php
index d94625d43c..c7c9a3f385 100644
--- a/module/metric/calc/global/scale/count_of_doing_program.php
+++ b/module/metric/calc/global/scale/count_of_doing_program.php
@@ -35,7 +35,7 @@ class count_of_doing_program extends baseCalc
 
     public function getResult($options = array())
     {
-        $records = array(array('value' => $this->result));
+        $records = $this->getRecords(array('value'));
         return $this->filterByOptions($records, $options);
     }
 }
diff --git a/module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php b/module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php
index cfd1fbc5c8..83c0f304b8 100755
--- a/module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php
+++ b/module/metric/test/calc/global/scale/count_of_annual_closed_top_program.php
@@ -3,7 +3,7 @@
 include dirname(__FILE__, 7) . '/test/lib/init.php';
 include dirname(__FILE__, 4) . '/calc.class.php';
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(356, true, false);
 
 $metric = new metricTest();
 $calc = $metric->calcMetric(__FILE__);
diff --git a/module/metric/test/calc/global/scale/count_of_annual_created_top_program.php b/module/metric/test/calc/global/scale/count_of_annual_created_top_program.php
index 67903d1d76..03cecc9a17 100755
--- a/module/metric/test/calc/global/scale/count_of_annual_created_top_program.php
+++ b/module/metric/test/calc/global/scale/count_of_annual_created_top_program.php
@@ -3,7 +3,7 @@
 include dirname(__FILE__, 7) . '/test/lib/init.php';
 include dirname(__FILE__, 4) . '/calc.class.php';
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(356, true, false);
 
 $metric = new metricTest();
 $calc = $metric->calcMetric(__FILE__);
diff --git a/module/metric/test/calc/global/scale/count_of_closed_program.php b/module/metric/test/calc/global/scale/count_of_closed_program.php
index dda6222b14..6ce8513fdc 100755
--- a/module/metric/test/calc/global/scale/count_of_closed_program.php
+++ b/module/metric/test/calc/global/scale/count_of_closed_program.php
@@ -13,14 +13,14 @@ cid=1
 
 */
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(356, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('180'); // 测试356条项目集数。
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(652, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(652, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('328'); // 测试652条项目集数。
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(1265, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(1265, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('633'); // 测试1265条项目集数。
diff --git a/module/metric/test/calc/global/scale/count_of_closed_top_program.php b/module/metric/test/calc/global/scale/count_of_closed_top_program.php
index c5eeb7d6a9..ba906bec92 100755
--- a/module/metric/test/calc/global/scale/count_of_closed_top_program.php
+++ b/module/metric/test/calc/global/scale/count_of_closed_top_program.php
@@ -3,7 +3,7 @@
 include dirname(__FILE__, 7) . '/test/lib/init.php';
 include dirname(__FILE__, 4) . '/calc.class.php';
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(356, true, false);
 
 $metric = new metricTest();
 $calc = $metric->calcMetric(__FILE__);
diff --git a/module/metric/test/calc/global/scale/count_of_doing_program.php b/module/metric/test/calc/global/scale/count_of_doing_program.php
new file mode 100755
index 0000000000..772421ed38
--- /dev/null
+++ b/module/metric/test/calc/global/scale/count_of_doing_program.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 7) . '/test/lib/init.php';
+include dirname(__FILE__, 4) . '/calc.class.php';
+
+zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+
+$metric = new metricTest();
+$calc = $metric->calcMetric(__FILE__);
+
+/**
+
+title=count_of_doing_program
+timeout=0
+cid=1
+
+*/
+
+r($calc->getResult()) && p('0:value') && e('45'); // 测试进行中的项目集数量
diff --git a/module/metric/test/calc/global/scale/count_of_top_program.php b/module/metric/test/calc/global/scale/count_of_top_program.php
index 9cfda79f01..cb9a799388 100755
--- a/module/metric/test/calc/global/scale/count_of_top_program.php
+++ b/module/metric/test/calc/global/scale/count_of_top_program.php
@@ -13,14 +13,14 @@ cid=1
 
 */
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(356, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(356, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('45'); // 测试356条项目集数。
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(652, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(652, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('82'); // 测试652条项目集数。
 
-zdTable('project')->config('program', $useCommon = true, $levels = 4)->gen(1265, true, false);
+zdTable('project')->config('program_closed', $useCommon = true, $levels = 4)->gen(1265, true, false);
 $calc = $metric->calcMetric(__FILE__);
 r($calc->getResult()) && p('0:value') && e('159'); // 测试1265条项目集数。
diff --git a/module/metric/test/yaml/program.yaml b/module/metric/test/yaml/program.yaml
index fa92093674..268a9d45c9 100644
--- a/module/metric/test/yaml/program.yaml
+++ b/module/metric/test/yaml/program.yaml
@@ -10,7 +10,7 @@ fields:
 - field: grade
   range: 1{1},2{1},3{1},4{1}
 - field: status
-  range: closed
+  range: wait{1},doing{1},suspended{1},closed{1}
 - field: openedDate
   range: "20100101 000000-20210101 230000:10D"
   type: timestamp
diff --git a/module/metric/test/yaml/program_closed.yaml b/module/metric/test/yaml/program_closed.yaml
new file mode 100644
index 0000000000..fa92093674
--- /dev/null
+++ b/module/metric/test/yaml/program_closed.yaml
@@ -0,0 +1,24 @@
+---
+title: zt_project
+author: qixinzhi
+version: "1.0"
+fields:
+- field: id
+  range: 1-10000
+- field: type
+  range: program
+- field: grade
+  range: 1{1},2{1},3{1},4{1}
+- field: status
+  range: closed
+- field: openedDate
+  range: "20100101 000000-20210101 230000:10D"
+  type: timestamp
+  format: YYYY-MM-DD hh:mm:ss
+- field: closedDate
+  range: "20110101 000000-20210101 230000:10D"
+  type: timestamp
+  format: YYYY-MM-DD hh:mm:ss
+- field: deleted
+  range: 0{4},1{4}
+---