From d6b7fa0a433112d35cef4bc9be582b463b4eba76 Mon Sep 17 00:00:00 2001
From: zenggang <zenggang@easycorp.ltd>
Date: Wed, 3 Jan 2024 12:16:08 +0000
Subject: [PATCH] * Adjust saveobjecttopms unit test.

---
 module/repo/test/model/saveobjecttopms.php | 20 ++++++++++----------
 module/repo/test/repo.class.php            |  4 ++--
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/module/repo/test/model/saveobjecttopms.php b/module/repo/test/model/saveobjecttopms.php
index 5669f260af..9949d11d17 100644
--- a/module/repo/test/model/saveobjecttopms.php
+++ b/module/repo/test/model/saveobjecttopms.php
@@ -12,19 +12,19 @@ cid=1
 
 - 开始任务
  - 第1条的objectID属性 @1
- - 第1条的objectType属性 @tasks
+ - 第1条的objectType属性 @task
 - 完成任务
  - 第8条的objectID属性 @8
- - 第8条的objectType属性 @tasks
+ - 第8条的objectType属性 @task
 - 工时计算
  - 第2条的objectID属性 @2
- - 第2条的objectType属性 @tasks
+ - 第2条的objectType属性 @task
 - 修复bug1
  - 第1条的objectID属性 @1
- - 第1条的objectType属性 @bugs
+ - 第1条的objectType属性 @bug
 - 修复bug2
  - 第2条的objectID属性 @2
- - 第2条的objectType属性 @bugs
+ - 第2条的objectType属性 @bug
 
 */
 
@@ -58,11 +58,11 @@ $action->action = 'gitcommited';
 
 $repo = new repoTest();
 $result = $repo->saveObjectToPmsTest($log, $action, $repoID, 'task');
-r($result) && p('1:objectID,objectType') && e('1,tasks'); //开始任务
-r($result) && p('8:objectID,objectType') && e('8,tasks'); //完成任务
-r($result) && p('2:objectID,objectType') && e('2,tasks'); //工时计算
+r($result) && p('1:objectID,objectType') && e('1,task'); //开始任务
+r($result) && p('8:objectID,objectType') && e('8,task'); //完成任务
+r($result) && p('2:objectID,objectType') && e('2,task'); //工时计算
 
 $log->msg = $log->comment = 'Fix bug#1,2';
 $result = $repo->saveObjectToPmsTest($log, $action, $repoID, 'bug');
-r($result) && p('1:objectID,objectType') && e('1,bugs'); //修复bug1
-r($result) && p('2:objectID,objectType') && e('2,bugs'); //修复bug2
+r($result) && p('1:objectID,objectType') && e('1,bug'); //修复bug1
+r($result) && p('2:objectID,objectType') && e('2,bug'); //修复bug2
\ No newline at end of file
diff --git a/module/repo/test/repo.class.php b/module/repo/test/repo.class.php
index 4a3715a3f1..9472d41c82 100644
--- a/module/repo/test/repo.class.php
+++ b/module/repo/test/repo.class.php
@@ -513,7 +513,7 @@ class repoTest
         if($type == 'task')
         {
             $records = $this->objectModel->dao->select('*')->from(TABLE_ACTION)
-                ->where('objectType')->eq('tasks')
+                ->where('objectType')->eq('task')
                 ->andWhere('objectID')->in('1,2,8')
                 ->andWhere('extra')->eq($action->extra)
                 ->andWhere('action')->eq($action->action)
@@ -522,7 +522,7 @@ class repoTest
         elseif($type == 'bug')
         {
             $records = $this->objectModel->dao->select('*')->from(TABLE_ACTION)
-                ->where('objectType')->eq('bugs')
+                ->where('objectType')->eq('bug')
                 ->andWhere('objectID')->in('1,2')
                 ->andWhere('extra')->eq($action->extra)
                 ->andWhere('action')->eq($action->action)