From 81e7e16b2fcfc102a38729f24fd9da760ba729be Mon Sep 17 00:00:00 2001
From: wangxuepeng <wangxuepeng@easycorp.ltd>
Date: Wed, 3 Jan 2024 18:38:40 +0800
Subject: [PATCH] * Correct report's unit test.

---
 .../test/model/getuseryearcontributions.php      | 14 +++++++-------
 module/report/test/model/getuseryearproducts.php |  2 +-
 module/report/test/model/getuseryeartodos.php    |  2 +-
 module/report/test/yaml/action_year.yaml         | 10 ++++++++++
 module/report/test/yaml/todo_year.yaml           | 16 ++++++++++++++++
 5 files changed, 35 insertions(+), 9 deletions(-)
 create mode 100644 module/report/test/yaml/action_year.yaml
 create mode 100644 module/report/test/yaml/todo_year.yaml

diff --git a/module/report/test/model/getuseryearcontributions.php b/module/report/test/model/getuseryearcontributions.php
index 036fc128be..7101f9abb2 100755
--- a/module/report/test/model/getuseryearcontributions.php
+++ b/module/report/test/model/getuseryearcontributions.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/report.class.php';
 
-zdTable('action')->gen('100');
+zdTable('action')->config('action_year')->gen('100');
 zdTable('case')->gen('20');
 zdTable('testrun')->gen('20');
 zdTable('testresult')->gen('10');
@@ -23,9 +23,9 @@ $accounts = array(array('admin'), array('dev17'), array('test18'), array('admin'
 
 $report = new reportTest();
 
-r($report->getUserYearContributionsTest($accounts[0])) && p('', '|') && e('repo:svnCommit:1;doc:create:1;case:run:10;');                                                              // 测试获取本年度 admin 的贡献数
-r($report->getUserYearContributionsTest($accounts[1])) && p('', '|') && e('bug:close:1;product:close:1;repo:gitCommit:1;case:run:0;');                                                // 测试获取本年度 dev17 的贡献数
-r($report->getUserYearContributionsTest($accounts[2])) && p('', '|') && e('productplan:create:1;case:run:0;');                                                                        // 测试获取本年度 test18 的贡献数
-r($report->getUserYearContributionsTest($accounts[3])) && p('', '|') && e('bug:close:1;repo:svnCommit:1,gitCommit:1;doc:create:1;product:close:1;case:run:10;');                      // 测试获取本年度 admin dev17 的贡献数
-r($report->getUserYearContributionsTest($accounts[4])) && p('', '|') && e('repo:svnCommit:1;doc:create:1;productplan:create:1;case:run:10;');                                         // 测试获取本年度 admin test18 的贡献数
-r($report->getUserYearContributionsTest($accounts[5])) && p('', '|') && e('bug:close:1;repo:svnCommit:1,gitCommit:1;doc:create:1;product:close:1;productplan:create:1;case:run:10;'); // 测试获取本年度 所有用户 的贡献数
+r($report->getUserYearContributionsTest($accounts[0])) && p() && e('repo:svnCommit:1;doc:create:1;case:run:10;');                                                              // 测试获取本年度 admin 的贡献数
+r($report->getUserYearContributionsTest($accounts[1])) && p() && e('bug:close:1;product:close:1;repo:gitCommit:1;case:run:0;');                                                // 测试获取本年度 dev17 的贡献数
+r($report->getUserYearContributionsTest($accounts[2])) && p() && e('productplan:create:1;case:run:0;');                                                                        // 测试获取本年度 test18 的贡献数
+r($report->getUserYearContributionsTest($accounts[3])) && p() && e('bug:close:1;repo:svnCommit:1,gitCommit:1;doc:create:1;product:close:1;case:run:10;');                      // 测试获取本年度 admin dev17 的贡献数
+r($report->getUserYearContributionsTest($accounts[4])) && p() && e('repo:svnCommit:1;doc:create:1;productplan:create:1;case:run:10;');                                         // 测试获取本年度 admin test18 的贡献数
+r($report->getUserYearContributionsTest($accounts[5])) && p() && e('bug:close:1;repo:svnCommit:1,gitCommit:1;doc:create:1;product:close:1;productplan:create:1;case:run:10;'); // 测试获取本年度 所有用户 的贡献数
diff --git a/module/report/test/model/getuseryearproducts.php b/module/report/test/model/getuseryearproducts.php
index 961bb2311f..312104abff 100755
--- a/module/report/test/model/getuseryearproducts.php
+++ b/module/report/test/model/getuseryearproducts.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/report.class.php';
 
-zdTable('action')->gen(200);
+zdTable('action')->config('action_year')->gen(200);
 zdTable('product')->gen(20);
 zdTable('story')->gen(20);
 zdTable('productplan')->gen(20);
diff --git a/module/report/test/model/getuseryeartodos.php b/module/report/test/model/getuseryeartodos.php
index 8da5df2012..4472e6510f 100755
--- a/module/report/test/model/getuseryeartodos.php
+++ b/module/report/test/model/getuseryeartodos.php
@@ -4,7 +4,7 @@ declare(strict_types=1);
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/report.class.php';
 
-zdTable('todo')->config('todo')->gen(50);
+zdTable('todo')->config('todo_year')->gen(50);
 zdTable('user')->gen(1);
 
 su('admin');
diff --git a/module/report/test/yaml/action_year.yaml b/module/report/test/yaml/action_year.yaml
new file mode 100644
index 0000000000..a133d35932
--- /dev/null
+++ b/module/report/test/yaml/action_year.yaml
@@ -0,0 +1,10 @@
+title: action.
+desc: action data.
+author: Wang XuePeng
+version: "1.0"
+fields:
+  - field: date
+    note: "日期"
+    range: "(-1D)-(0m):1s"
+    type: timestamp
+    format: "YYYY-MM-DD hh:mm:ss"
diff --git a/module/report/test/yaml/todo_year.yaml b/module/report/test/yaml/todo_year.yaml
new file mode 100644
index 0000000000..c5bf8fcd77
--- /dev/null
+++ b/module/report/test/yaml/todo_year.yaml
@@ -0,0 +1,16 @@
+title: todo.
+desc: todo data.
+author: Wang XuePeng
+version: "1.0"
+fields:
+  - field: account
+    fields:
+    - field: account1
+      range: admin,user{3},test{3},dev{3},pm{3},po{3},td{3},pd{3},qd{3},top{3},outside{3}
+    - field: account2
+      range: "[],1-3,1-3,1-3,1-3,1-3,1-3,1-3,1-3,1-3,1-3"
+  - field: date
+    note: "日期"
+    range: "(-1D)-(0m):1s"
+    type: timestamp
+    format: "YYYY-MM-DD hh:mm:ss"