From 7a40f39e1749fbe5bbc1814ec5bfda0a69d3b096 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 27 Sep 2023 16:32:21 +0800
Subject: [PATCH] * Modify unit test of projectreleaseModel::getList.

---
 module/projectrelease/model.php               |  1 +
 module/projectrelease/test/model/getlist.php  | 29 +++++++++----------
 .../test/projectrelease.class.php             | 25 +++++++---------
 3 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/module/projectrelease/model.php b/module/projectrelease/model.php
index bf5b1e2db3..e6de358907 100644
--- a/module/projectrelease/model.php
+++ b/module/projectrelease/model.php
@@ -14,6 +14,7 @@
 class projectreleaseModel extends model
 {
     /**
+     * 获取项目发布列表。
      * Get list of releases.
      *
      * @param  int    $projectID
diff --git a/module/projectrelease/test/model/getlist.php b/module/projectrelease/test/model/getlist.php
index 20c23f4225..5580e3258f 100755
--- a/module/projectrelease/test/model/getlist.php
+++ b/module/projectrelease/test/model/getlist.php
@@ -2,6 +2,11 @@
 <?php
 include dirname(__FILE__, 5) . '/test/lib/init.php';
 include dirname(__FILE__, 2) . '/projectrelease.class.php';
+
+zdTable('release')->gen(20);
+zdTable('product')->gen(20);
+zdTable('user')->gen(1);
+
 su('admin');
 
 /**
@@ -10,25 +15,17 @@ title=测试 projectreleaseModel->getList();
 cid=1
 pid=1
 
-查询projectID正常存在,type为all的发布 >> 产品1发布9,normal
-查询projectID正常存在,type为normal的发布 >> 产品1发布9,normal
-查询projectID正常存在,type为terminate的发布 >> 0
-查询projectID正常存在,type为''的发布 >> 0
-查询projectID正常存在的发布 >> 产品1发布9,normal
-查询projectID不存在,type为all的发布 >> 0
-查询projectID为空,type为all的发布 >> 8
-
 */
 
-$projectID = array(11, 1000, '');
+$projectID = array(11, 1000, 0);
 $type      = array('all', 'normal', 'terminate', '');
 
 $projectrelease = new projectreleaseTest();
 
-r($projectrelease->getListTest($projectID[0], $type[0])) && p('0:name,status') && e('产品1发布9,normal');    //查询projectID正常存在,type为all的发布
-r($projectrelease->getListTest($projectID[0], $type[1])) && p('0:name,status') && e('产品1发布9,normal');    //查询projectID正常存在,type为normal的发布
-r($projectrelease->getListTest($projectID[0], $type[2])) && p()                && e('0');                    //查询projectID正常存在,type为terminate的发布
-r($projectrelease->getListTest($projectID[0], $type[3])) && p()                && e('0');                    //查询projectID正常存在,type为''的发布
-r($projectrelease->getListTest($projectID[0]))           && p('0:name,status') && e('产品1发布9,normal');    //查询projectID正常存在的发布
-r($projectrelease->getListTest($projectID[1], $type[0])) && p()                && e('0');                    //查询projectID不存在,type为all的发布
-r($projectrelease->getListTest($projectID[2], $type[0])) && p('0:id')          && e('8');                    //查询projectID为空,type为all的发布
+r($projectrelease->getListTest($projectID[0], $type[0])) && p() && e('9,19'); // 查询projectID正常存在,type为all的发布
+r($projectrelease->getListTest($projectID[0], $type[1])) && p() && e('9,19'); // 查询projectID正常存在,type为normal的发布
+r($projectrelease->getListTest($projectID[0], $type[2])) && p() && e('0');    // 查询projectID正常存在,type为terminate的发布
+r($projectrelease->getListTest($projectID[0], $type[3])) && p() && e('0');    // 查询projectID正常存在,type为''的发布
+r($projectrelease->getListTest($projectID[0]))           && p() && e('9,19'); // 查询projectID正常存在的发布
+r($projectrelease->getListTest($projectID[1], $type[0])) && p() && e('0');    // 查询projectID不存在,type为all的发布
+r($projectrelease->getListTest($projectID[2], $type[0])) && p() && e('8,18'); // 查询projectID为空,type为all的发布
diff --git a/module/projectrelease/test/projectrelease.class.php b/module/projectrelease/test/projectrelease.class.php
index 43c7787eb0..f9b52a973b 100644
--- a/module/projectrelease/test/projectrelease.class.php
+++ b/module/projectrelease/test/projectrelease.class.php
@@ -8,24 +8,21 @@ class projectreleaseTest
     }
 
     /**
-    * Test get list of releases.
-    *
-    * @param  int    $projectID
-    * @param  string $type
-    * @access public
-    * @return array
-    */
-    public function getListTest($projectID, $type = 'all')
+     * 测试获取项目发布列表。
+     * Test get list of releases.
+     *
+     * @param  int    $projectID
+     * @param  string $type
+     * @access public
+     * @return array|string
+     */
+    public function getListTest(int $projectID, string $type = 'all'): array|string
     {
         $objects = $this->objectModel->getList($projectID, $type);
 
-        if(dao::isError())
-        {
-            $error = dao::getError();
-            return $error[0];
-        }
+        if(dao::isError()) return dao::getError();
 
-        return $objects;
+        return implode(',', array_column($objects, 'id'));
     }
 
     /**