From 2eadae31ab5644cc85fc9c231f14a3bc545decf7 Mon Sep 17 00:00:00 2001
From: sunguangming <sunguangming@easycorp.ltd>
Date: Sun, 30 Jun 2024 04:36:40 +0000
Subject: [PATCH]  * [misc] code for unit test.

---
 module/story/test/model/setstage.php         | 12 ++++++------
 module/story/test/tao/computeparentstage.php | 14 +++++++-------
 module/story/zen.php                         |  2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/module/story/test/model/setstage.php b/module/story/test/model/setstage.php
index 190bab9193..638704ec4a 100755
--- a/module/story/test/model/setstage.php
+++ b/module/story/test/model/setstage.php
@@ -8,10 +8,10 @@ timeout=0
 cid=0
 
 - 不传入需求; @0
-- 传入已经分解任务的需求，检查需求阶段。属性stage @planning
+- 传入已经分解任务的需求，检查需求阶段。属性stage @testing
 - 传入已关闭的需求，检查需求阶段。属性stage @closed
 - 传入只关联的计划的需求，检查需求阶段。属性stage @planned
-- 传入只关联的项目的需求，检查需求阶段。属性stage @planning
+- 传入只关联的项目的需求，检查需求阶段。属性stage @projected
 - 传入关联多分支，并分解成任务的需求，检查需求阶段。属性stage @testing
 - 传入关联多分支，并分解成任务的需求，检查分支 0 的需求阶段。属性stage @testing
 - 传入关联多分支，并分解成任务的需求，检查分支 1 的需求阶段。属性stage @tested
@@ -73,10 +73,10 @@ $storyModel = $tester->loadModel('story');
 r($storyModel->setStage(0)) && p() && e('0'); //不传入需求;
 
 $storyTest = new storyTest();
-r($storyTest->setStageTest(1)) && p('stage') && e('planning'); //传入已经分解任务的需求，检查需求阶段。
-r($storyTest->setStageTest(3)) && p('stage') && e('closed');   //传入已关闭的需求，检查需求阶段。
-r($storyTest->setStageTest(4)) && p('stage') && e('planned');  //传入只关联的计划的需求，检查需求阶段。
-r($storyTest->setStageTest(5)) && p('stage') && e('planning'); //传入只关联的项目的需求，检查需求阶段。
+r($storyTest->setStageTest(1)) && p('stage') && e('testing');   //传入已经分解任务的需求，检查需求阶段。
+r($storyTest->setStageTest(3)) && p('stage') && e('closed');    //传入已关闭的需求，检查需求阶段。
+r($storyTest->setStageTest(4)) && p('stage') && e('planned');   //传入只关联的计划的需求，检查需求阶段。
+r($storyTest->setStageTest(5)) && p('stage') && e('projected'); //传入只关联的项目的需求，检查需求阶段。
 
 $story = $storyTest->setStageTest(2);
 r($story) && p('stage') && e('testing');             //传入关联多分支，并分解成任务的需求，检查需求阶段。
diff --git a/module/story/test/tao/computeparentstage.php b/module/story/test/tao/computeparentstage.php
index 08cccab4dd..636d87db8f 100755
--- a/module/story/test/tao/computeparentstage.php
+++ b/module/story/test/tao/computeparentstage.php
@@ -3,26 +3,26 @@
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 su('admin');
 
-$product = zdTable('product')->gen(1);
+$product = zenData('product')->gen(1);
 
-$project = zdTable('project');
+$project = zenData('project');
 $project->id->range('11-20');
 $project->type->range('project,project,sprint,kanban');
 $project->model->range('scrum,kanban');
 $project->gen(10);
 
-$projectStory = zdTable('projectstory');
+$projectStory = zenData('projectstory');
 $projectStory->story->range('6-20');
 $projectStory->product->range('1');
 $projectStory->project->range('11-20');
 $projectStory->gen(15);
 
-$projectProduct = zdTable('projectproduct');
+$projectProduct = zenData('projectproduct');
 $projectProduct->product->range('1');
 $projectProduct->project->range('11-20');
 $projectProduct->gen(10);
 
-$story = zdTable('story');
+$story = zenData('story');
 $story->product->range('1');
 $story->plan->range('`1,2`,2,3,4,5');
 $story->type->range('story');
@@ -32,13 +32,13 @@ $story->isParent->range('1{5},0{15}');
 $story->stage->range('wait,planned,developing,tested,released');
 $story->gen(20)->fixPath();
 
-$task = zdTable('task');
+$task = zenData('task');
 $task->story->range('6-20');
 $task->execution->range('11-20');
 $task->type->range('devel,test,design');
 $task->gen(100);
 
-$release = zdTable('release');
+$release = zenData('release');
 $release->stories->range('6-10');
 $release->gen(5);
 
diff --git a/module/story/zen.php b/module/story/zen.php
index dfa846a3e3..9e92214c38 100644
--- a/module/story/zen.php
+++ b/module/story/zen.php
@@ -1497,7 +1497,7 @@ class storyZen extends story
 
             if(in_array($this->app->tab, array('project', 'execution')))
             {
-                $story->stage = $storyType == 'story' ? 'projected' : 'planning';
+                $story->stage = 'projected';
             }
 
             !empty($story->assignedTo) && $story->assignedDate = $now;