From 03edd3440f97162fed6fcae49aba74b30b0eb679 Mon Sep 17 00:00:00 2001
From: liuhong <liuhong@easycorp.ltd>
Date: Mon, 8 May 2023 16:44:21 +0800
Subject: [PATCH] * submit unit test.

---
 .../project/test/model/getprogrammaxend.php   | 16 +++++-------
 .../project/test/model/getprogramminbegin.php | 24 +++++++++++++++++
 .../model/yaml/getprogrammaxend/project.yaml  |  4 +--
 .../yaml/getprogramminbegin/project.yaml      | 26 +++++++++++++++++++
 4 files changed, 57 insertions(+), 13 deletions(-)
 create mode 100644 module/project/test/model/getprogramminbegin.php
 create mode 100644 module/project/test/model/yaml/getprogramminbegin/project.yaml

diff --git a/module/project/test/model/getprogrammaxend.php b/module/project/test/model/getprogrammaxend.php
index 22e75d8070..53f3e1fdcf 100755
--- a/module/project/test/model/getprogrammaxend.php
+++ b/module/project/test/model/getprogrammaxend.php
@@ -15,14 +15,10 @@ pid=1
 global $tester;
 
 $tester->loadModel('project');
-$project1 = $tester->project->getProgramMaxEnd(1);
-$project2 = $tester->project->getProgramMaxEnd(3);
-$project3 = $tester->project->getProgramMaxEnd(6);
+$project4 = $tester->project->getProgramMaxEnd(1);
+$project5 = $tester->project->getProgramMaxEnd(3);
+$project6 = $tester->project->getProgramMaxEnd(6);
 
-a($project1);die;
-r($project1) && p() && e(); //获取一级项目集最小开始时间
-r($project1) && p() && e(); //获取一级项目集最大结束时间
-r($project2) && p() && e(); //获取二级项目集最小开始时间
-r($project2) && p() && e(); //获取二级项目集最大结束时间
-r($project3) && p() && e(); //获取三级项目集最小开始时间
-r($project3) && p() && e(); //获取三级项目集最大结束时间
+r($project6) && p('maxEnd')   && e('2023-06-12'); //获取一级项目集最大结束时间:尾级项目结束时间最大
+r($project5) && p('maxEnd')   && e('2023-07-03'); //获取二级项目集最大结束时间:顶级项目结束时间最大
+r($project4) && p('maxEnd')   && e('2023-05-08'); //获取三级项目集最大结束时间:开始时间等于结束时间
diff --git a/module/project/test/model/getprogramminbegin.php b/module/project/test/model/getprogramminbegin.php
new file mode 100644
index 0000000000..6a76ce2df8
--- /dev/null
+++ b/module/project/test/model/getprogramminbegin.php
@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+include dirname(__FILE__, 5) . "/test/lib/init.php";
+su('admin');
+
+$project = zdTable('project')->config('project')->gen(6);
+
+/**
+
+title=测试 projectModel->getProgramMinBegin();
+cid=1
+pid=1
+*/
+
+global $tester;
+
+$tester->loadModel('project');
+$project1 = $tester->project->getProgramMinBegin(1);
+$project2 = $tester->project->getProgramMinBegin(3);
+$project3 = $tester->project->getProgramMinBegin(6);
+
+r($project1) && p('minBegin') && e('2023-05-01'); //获取一级项目集最小开始时间:顶级项目开始时间最小
+r($project2) && p('minBegin') && e('2023-04-22'); //获取二级项目集最小开始时间:次级项目开始时间最小
+r($project3) && p('minBegin') && e('2023-05-08'); //获取三级项目集最小开始时间:开始时间等于结束时间
diff --git a/module/project/test/model/yaml/getprogrammaxend/project.yaml b/module/project/test/model/yaml/getprogrammaxend/project.yaml
index 25ed2bb9ad..230181f50b 100644
--- a/module/project/test/model/yaml/getprogrammaxend/project.yaml
+++ b/module/project/test/model/yaml/getprogrammaxend/project.yaml
@@ -22,7 +22,5 @@ fields:
       range: '项目集1, 项目集1-1, 项目1-1-2, 项目集3, 项目3-4, 无迭代无产品项目6'
     - field: code
       range: 'program1, program1-1, project1-1-2, program3, project3-4, project6'
-    - field: begin
-      range: "'2023-05-01', '2023-05-07', '2023-05-20', '2023-04-04', '2023-05-01', '2023-05-08'"
     - field: end
-      range: "'2023-06-01', '2023-05-19', '2023-06-12', '2023-07-03', '2023-06-03', '2023-05-08'"
+      range: '2023-06-01', '2023-05-19', '2023-06-12', '2023-07-03', '2023-06-03', '2023-05-08'
diff --git a/module/project/test/model/yaml/getprogramminbegin/project.yaml b/module/project/test/model/yaml/getprogramminbegin/project.yaml
new file mode 100644
index 0000000000..aef1007a25
--- /dev/null
+++ b/module/project/test/model/yaml/getprogramminbegin/project.yaml
@@ -0,0 +1,26 @@
+title: zt_project
+author: liuhong
+version: "1.0"
+fields:
+    - field: id
+      range: 1-6
+    - field: project
+      range: 0
+    - field: model
+      range: ', , ,scrum, ,scrum,scrum'
+    - field: type
+      range: 'program,program,project,program,project,project'
+    - field: status
+      range: 'wait,doing,closed,suspended'
+    - field: parent
+      range: 0, 1, 2, 0, 3, 0
+    - field: grade
+      range: 1, 2, 3, 1, 2, 1
+    - field: path
+      range: '`,1,`, `,1,2,`, `,1,2,3,`, `,4,`, `,4,5,`, `,6,`'
+    - field: name
+      range: '项目集1, 项目集1-1, 项目1-1-2, 项目集3, 项目3-4, 无迭代无产品项目6'
+    - field: code
+      range: 'program1, program1-1, project1-1-2, program3, project3-4, project6'
+    - field: begin
+      range: '2023-05-01', '2023-05-07', '2023-05-20', '2023-05-01', '2023-04-22', '2023-05-08'