diff --git a/extension/lite/group/ext/lang/en/lite.php b/extension/lite/group/ext/lang/en/lite.php
index 58d3cdaab8..b25ad3c432 100644
--- a/extension/lite/group/ext/lang/en/lite.php
+++ b/extension/lite/group/ext/lang/en/lite.php
@@ -8,4 +8,8 @@ if($this->config->edition != 'open')
     $lang->resource->company->allTodo   = 'allTodo';
     $lang->resource->company->effort    = 'companyEffort';
     $lang->resource->company->alleffort = 'allEffort';
+    $lang->resource->sms                = new stdclass();
+    $lang->resource->sms->index         = 'index';
+    $lang->resource->sms->test          = 'test';
+    $lang->resource->sms->reset         = 'reset';
 }
\ No newline at end of file
diff --git a/extension/lite/group/ext/lang/zh-cn/lite.php b/extension/lite/group/ext/lang/zh-cn/lite.php
index 58d3cdaab8..b25ad3c432 100644
--- a/extension/lite/group/ext/lang/zh-cn/lite.php
+++ b/extension/lite/group/ext/lang/zh-cn/lite.php
@@ -8,4 +8,8 @@ if($this->config->edition != 'open')
     $lang->resource->company->allTodo   = 'allTodo';
     $lang->resource->company->effort    = 'companyEffort';
     $lang->resource->company->alleffort = 'allEffort';
+    $lang->resource->sms                = new stdclass();
+    $lang->resource->sms->index         = 'index';
+    $lang->resource->sms->test          = 'test';
+    $lang->resource->sms->reset         = 'reset';
 }
\ No newline at end of file
diff --git a/framework/control.class.php b/framework/control.class.php
index 76f24e658e..9d36e0bc4f 100644
--- a/framework/control.class.php
+++ b/framework/control.class.php
@@ -35,11 +35,7 @@ class control extends baseControl
 
         $this->app->setOpenApp();
 
-        if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE != 'api'))
-        {
-            $this->setPreference();
-            $this->forceUpgrade();
-        }
+        if(defined('IN_USE') or (defined('RUN_MODE') and RUN_MODE != 'api')) $this->setPreference();
 
         if(!isset($this->config->bizVersion)) return false;
 
@@ -127,39 +123,6 @@ class control extends baseControl
         }
     }
 
-    /**
-     * If change the edition, trigger the upgrade process.
-     *
-     * @access public
-     * @return void
-     */
-    public function forceUpgrade()
-    {
-        $installedVersion = $this->loadModel('setting')->getVersion();
-
-        /* Means open source upgrade to biz or max. */
-        if(is_numeric($installedVersion[0]) and $this->config->edition != 'open')
-        {
-            $this->loadModel('setting')->setItem('system.common.global.version', $this->config->version);
-            $this->loadModel('effort')->convertEstToEffort();
-            $this->loadModel('upgrade')->importBuildinModules();
-            $this->upgrade->addSubStatus();
-        }
-
-        /* Max only has new system mode. */
-        if($installedVersion[0] != 'm' and $this->config->edition == 'max')
-        {
-            $this->loadModel('setting')->setItem('system.common.global.version', $this->config->version);
-            if($this->config->systemMode == 'classic' and $this->app->getModuleName() != 'upgrade')
-            {
-                $this->loadModel('setting')->setItem('system.common.global.mode', 'new');
-                $this->locate(helper::createLink('upgrade', 'mergeTips'));
-            }
-        }
-
-        return true;
-    }
-
     /**
      * 企业版部分功能是从然之合并过来的。然之代码中调用loadModel方法时传递了一个非空的appName，在禅道中会导致错误。
      * 调用父类的loadModel方法来避免这个错误。
diff --git a/module/index/css/index.css b/module/index/css/index.css
index 79cc5c8256..6d2db1a098 100644
--- a/module/index/css/index.css
+++ b/module/index/css/index.css
@@ -72,7 +72,7 @@ body.menu-hide {padding-left: 0;}
 #flodNav .dropdown-submenu:focus > a, #flodNav .dropdown-submenu:hover > a {background-color: rgba(0,0,0,.2);}
 #poweredBy {width: 40%; position: absolute; top: 4px; right: 0; padding: 0;}
 
-#globalSearchDiv {width: 52%; float: right; margin-right: 4px;}
+#globalSearchDiv {width: 200px; float: right; margin-right: 4px;}
 #globalSearchDiv .input-group {width: 194px; float: right; margin-top: 2px;}
 #searchbox .dropdown-menu.show-quick-go.with-active {min-width: 270px;}
 #searchbox .dropdown-menu.show-quick-go > li {padding: 0 5px;}
diff --git a/test/class/bug.class.php b/test/class/bug.class.php
new file mode 100644
index 0000000000..fb0bf4dc0f
--- /dev/null
+++ b/test/class/bug.class.php
@@ -0,0 +1,162 @@
+<?php
+class bugTest
+{
+    public function __construct()
+    {
+        global $tester;
+        $this->objectModel = $tester->loadModel('bug');
+    }
+
+    /**
+     * Test create a bug.
+     *
+     * @param  array  $param
+     * @access public
+     * @return object
+     */
+    public function createObject($param = array())
+    {
+        $createFields['title']       = '测试创建bug';
+        $createFields['type']        = 'codeerror';
+        $createFields['product']     = 1;
+        $createFields['execution']   = 101;
+        $createFields['openedBuild'] = 'trunk';
+        $createFields['pri']         = 3;
+        $createFields['severity']    = 3;
+        $createFields['status']      = 'active';
+        $createFields['deadline']    = '2021-03-19';
+        $createFields['openedBy']    = 'admin';
+        $createFields['openedDate']  = '2021-03-19';
+
+        foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
+
+        foreach($param as $key => $value) $_POST[$key] = $value;
+
+        $object   = $this->objectModel->create();
+        $objectID = $object['id'];
+        unset($_POST);
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            $object = $this->objectModel->getByID($objectID);
+            return $object;
+        }
+    }
+
+    public function batchCreateObject($productID, $param = array())
+    {
+        $modules      = array('0', '0', '0');
+        $executions   = array('101', '101', '0');
+        $openedBuilds = array('', '', '');
+        $title        = array('', '', '');
+        $deadlines    = array('0000-00-00', '0000-00-00', '0000-00-00');
+        $stepses      = array('', '', '');
+        $types        = array('', '', '');
+        $severities   = array(3, 3, 3);
+        $oses         = array('', '', '');
+        $browsers     = array('', '', '');
+        $pris         = array(3, 3, 3);
+        $color        = array('', '', '');
+        $keywords     = array('', '', '');
+
+        $createFields['modules']      = $modules;
+        $createFields['executions']   = $executions;
+        $createFields['openedBuilds'] = $openedBuilds;
+        $createFields['title']        = $title;
+        $createFields['deadlines']    = $deadlines;
+        $createFields['stepses']      = $stepses;
+        $createFields['types']        = $types;
+        $createFields['severities']   = $severities;
+        $createFields['oses']         = $oses;
+        $createFields['browsers']     = $browsers;
+        $createFields['pris']         = $pris;
+        $createFields['color']        = $color;
+        $createFields['keywords']     = $keywords;
+
+        foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
+
+        foreach($param as $key => $value) $_POST[$key] = $value;
+
+        $object = $this->objectModel->batchCreate($productID);
+
+        $bug = array();
+        if(is_array($object))
+        {
+            foreach($object as $bugID => $actionID)
+            {
+                $bug[] = $this->objectModel->getByID($bugID);
+            }
+        }
+
+        unset($_POST);
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return empty($bug) ? $object : $bug;
+        }
+    }
+
+    /**
+     * Test create bug from gitlab issue.
+     *
+     * @param  array  $bug
+     * @param  int    $executionID
+     * @access public
+     * @return int
+     */
+    public function createBugFromGitlabIssueTest($bug, $executionID)
+    {
+        $objectID = $this->objectModel->createBugFromGitlabIssue($bug, $executionID);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            $object = $objectID ? $this->objectModel->getById($objectID) : 0;
+            return $object;
+        }
+    }
+
+    /**
+     * Test get bugs.
+     *
+     * @access public
+     * @return int
+     */
+    public function getBugsTest($product, $branch, $browseType, $module)
+    {
+        global $tester;
+
+        /* Load pager. */
+        $tester->app->loadClass('pager', $static = true);
+        $pager = new pager(0, 20 ,1);
+
+        $projectID  = 0;
+        $sort       = 'id_desc';
+        $queryID    = 0;
+        $executions = $tester->loadModel('execution')->getPairs($projectID, 'all', 'empty|withdelete');
+
+        $bugs = $this->objectModel->getBugs($product, $executions, $branch, $browseType, $module, $queryID, $sort, $pager, $projectID);
+
+        $title = '';
+        foreach($bugs as $bug) $title .= ',' . $bug->title;
+        $title = trim($title, ',');
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $title;
+        }
+    }
+}
diff --git a/test/class/execution.class.php b/test/class/execution.class.php
index 5dfe58cbeb..ad0c193582 100644
--- a/test/class/execution.class.php
+++ b/test/class/execution.class.php
@@ -2,22 +2,50 @@
 class executionTest
 {
 
+    /**
+     * __construct loadModel execution
+     *
+     * @access public
+     */
     public function __construct()
     {
         global $tester;
         $this->objectModel = $tester->loadModel('execution');
     }
 
+    /**
+     * get todate
+     *
+     * @access public
+     * @return string
+     */
     public function getHour()
     {
         return date('Y-m-d');
     }
 
+    /**
+     * get Reduce date
+     *
+     * @param  string $dayNum
+     * @access public
+     * @return string
+     */
     public function getReduceHour($dayNum)
     {
         return date('Y-m-d',strtotime("-$dayNum day"));
     }
 
+    /**
+     * function create test by execution
+     *
+     * @param  array  $param
+     * @param  string $project
+     * @param  string $dayNum
+     * @param  string $days
+     * @access public
+     * @return array
+     */
     public function createObject($param = array(), $project, $dayNum, $days)
     {
         $products  = array('');
@@ -26,17 +54,19 @@ class executionTest
         $beginData = date('Y-m-d');
         $endData   = date('Y-m-d',strtotime("+$dayNum day"));
         $delta     = intval($dayNum) + 1;
+
         $createFields = array('project' => $project, 'name' => '', 'code' => '', 'begin' => $beginData, 'end' => $endData,
             'lifetime' => 'short', 'status' => 'wait', 'products' => $products, 'delta' => $delta, 'days' => $days,
             'plans' => $plans, 'team' => '', 'teams' => '0', 'PO' => '', 'QD' => '', 'PM' => '', 'RD' => '', 'whitelist' => '',
             'desc' => '', 'acl' => 'private');
 
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
-
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $objectID = $this->objectModel->create();
+
         unset($_POST);
+
         if(dao::isError())
         {
             return dao::getError();
@@ -48,19 +78,30 @@ class executionTest
         }
     }
 
+    /**
+     * function update test by execution
+     *
+     * @param  string $objectID
+     * @param  array $param
+     * @access public
+     * @return array
+     */
     public function updateObject($objectID, $param = array())
     {
         global $tester;
+
         $products = array('1','81','91');
-        $object = $tester->dbh->query("SELECT `project`,`name`,`code`,`begin`,`end`,`days`,`lifetime`,`team`,`status`,`PO`,`QD`,`PM`,
+        $object   = $tester->dbh->query("SELECT `project`,`name`,`code`,`begin`,`end`,`days`,`lifetime`,`team`,`status`,`PO`,`QD`,`PM`,
             `RD`,`desc`,`acl` FROM zt_project WHERE id = $objectID ")->fetch();
         $object->products = $products;
-        foreach($object as $field => $defaultValue) $_POST[$field] = $defaultValue;
 
+        foreach($object as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $change = $this->objectModel->update($objectID);
+
         if($change == array()) $change = '没有数据更新';
+
         unset($_POST);
 
         if(dao::isError())
@@ -73,6 +114,14 @@ class executionTest
         }
     }
 
+    /**
+     * function batchUpdate test by execution
+     *
+     * @param  array  $param
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function batchUpdateObject($param = array(), $executionID = '')
     {
         $executionIDList = array($executionID => $executionID);
@@ -89,14 +138,16 @@ class executionTest
         $descs           = array($executionID => '');
         $teams           = array($executionID => '');
         $dayses          = array($executionID => '');
-        $createFields = array('executionIDList' => $executionIDList, 'names' => $name, 'codes' => $codes, 'PMs' => $pms, 'lifetimes' => $lifetimes,
-            'begins' => $begins, 'ends' => $ends, 'descs' => $descs, 'statuses' => $statuses, 'teams'=>$teams, 'dayses' => $dayses,'POs' => $pos,
-            'QDs' => $qds, 'RDs' => $rds);
-        foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
 
+        $createFields = array('executionIDList' => $executionIDList, 'names' => $name, 'codes' => $codes, 'PMs' => $pms, 'lifetimes' => $lifetimes,
+            'begins' => $begins, 'ends' => $ends, 'descs' => $descs, 'statuses' => $statuses, 'teams' => $teams, 'dayses' => $dayses,'POs' => $pos,
+            'QDs' => $qds, 'RDs' => $rds);
+
+        foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $object = $this->objectModel->batchUpdate();
+
         unset($_POST);
 
         if(dao::isError())
@@ -110,14 +161,27 @@ class executionTest
         }
     }
 
+    /**
+     * function start test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function startTest($executionID,$param = array())
     {
         $data = date('Y-m-d');
+
         $createFields = array( 'comment' => '开始描述测试', 'realBegan' => $data);
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $obj = $this->objectModel->start($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -136,15 +200,28 @@ class executionTest
         }
     }
 
+    /**
+     * function putoff test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function putoffTest($executionID, $param = array())
     {
         $begin = date('Y-m-d');
         $end   = date('Y-m-d',strtotime("+5 day"));
+
         $createFields = array('status' => 'wait', 'days' => '5', 'comment' => '延期描述测试', 'begin' => $begin, 'end' => $end);
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $obj = $this->objectModel->putoff($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -156,13 +233,25 @@ class executionTest
         }
     }
 
+    /**
+     * function suspend test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function suspendTest($executionID, $param = array())
     {
         $createFields = array('status' => 'suspended', 'comment' => '挂起描述测试');
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $obj = $this->objectModel->suspend($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -174,16 +263,30 @@ class executionTest
         }
     }
 
+    /**
+     * function activate test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function activateTest($executionID, $param = array())
     {
         self::suspendTest($executionID);
+
         $begin = date('Y-m-d');
         $end   = date('Y-m-d',strtotime("+5 day"));
+
         $createFields = array('status' => 'doing', 'comment' => '激活描述测试', 'begin' => $begin, 'end' => $end);
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $obj = $this->objectModel->activate($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -195,14 +298,27 @@ class executionTest
         }
     }
 
+    /**
+     * function close test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function closeTest($executionID, $param = array())
     {
         $todate = date('Y-m-d');
+
         $createFields = array('status' => 'closed', 'comment' => '关闭描述测试', 'realEnd' => $todate);
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $obj = $this->objectModel->close($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -214,9 +330,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getPairs test by execution
+     *
+     * @param  string $projectID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getPairsTest($projectID,$count)
     {
         $object = $this->objectModel->getPairs($projectID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -232,9 +357,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getByID test by execution
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function getByIDTest($executionID)
     {
         $object = $this->objectModel->getByID($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -246,9 +379,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getByIdList test by execution
+     *
+     * @param  array $executionIdList
+     * @access public
+     * @return array
+     */
     public function getByIdListTest($executionIdList)
     {
         $object = $this->objectModel->getByIdList($executionIdList);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -260,9 +401,22 @@ class executionTest
         }
     }
 
+    /**
+     * function getList test by execution
+     *
+     * @param  string $projectID
+     * @param  string $type
+     * @param  array  $status
+     * @param  string $limit
+     * @param  string $productID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getListTest($projectID, $type, $status, $limit, $productID, $count)
     {
         $object = $this->objectModel->getList($projectID, $type, $status, $limit, $productID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -278,9 +432,20 @@ class executionTest
         }
     }
 
+    /**
+     * fnction getInvolvedExecutionList test by execution
+     *
+     * @param  string $projectID
+     * @param  string $limit
+     * @param  string $productID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getInvolvedExecutionListTest($projectID, $limit, $productID, $count)
     {
         $object = $this->objectModel->getInvolvedExecutionList($projectID,$status = 'involved',$limit, $productID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -296,9 +461,20 @@ class executionTest
         }
     }
 
+    /**
+     * function getByProject test by execution
+     *
+     * @param  string $projectID
+     * @param  array  $status
+     * @param  string $limit
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getByProjectTest($projectID, $status, $limit, $count)
     {
         $object = $this->objectModel->getByProject($projectID, $status, $limit);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -314,9 +490,19 @@ class executionTest
         }
     }
 
+    /**
+     * function getIdList test execution
+     *
+     * @param  string $projectID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getIdListTest($projectID, $count)
     {
         $object = $this->objectModel->getIdList($projectID);
+
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -332,9 +518,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getBranches test execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getBranchesTest($executionID, $count)
     {
         $object = $this->objectModel->getBranches($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -350,9 +545,18 @@ class executionTest
         }
     }
 
-    public function getTreeTest_bak($executionID, $count)
+    /**
+     * function getTree test execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
+    public function getTreeTest($executionID, $count)
     {
         $object = $this->objectModel->getTree($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -368,9 +572,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getRelatedExecutions test execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getRelatedExecutionsTest($executionID, $count)
     {
         $object = $this->objectModel->getRelatedExecutions($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -386,9 +599,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getChildExecutions test execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getChildExecutionsTest($executionID, $count)
     {
         $object = $this->objectModel->getChildExecutions($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -404,9 +626,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getProductGroupList test execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getProductGroupListTest($count)
     {
         $object = $this->objectModel->getProductGroupList();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -422,13 +652,29 @@ class executionTest
         }
     }
 
+    /**
+     * function getTasks test by execution
+     *
+     * @param  string $productID
+     * @param  string $executionID
+     * @param  string $browseType
+     * @param  string $queryID
+     * @param  string $moduleID
+     * @param  string $sort
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getTasksTest($productID, $executionID, $browseType, $queryID, $moduleID, $sort, $count)
     {
         global $tester;
+
         $execution  = $tester->dbh->query("select * from zt_project where id = $executionID")->fetch();
         $executions = array($executionID => $execution->name);
         $page       = 'NULL';
+
         $object = $this->objectModel->getTasks($productID, $executionID, $executions, $browseType, $queryID, $moduleID, $sort, $page);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -444,9 +690,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getDefaultManagers test by execution
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function getDefaultManagersTest($executionID)
     {
         $object = $this->objectModel->getDefaultManagers($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -458,9 +712,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getBranchByProduct test by execution
+     *
+     * @param  string $productID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getBranchByProductTest($productID, $count)
     {
         $object = $this->objectModel->getBranchByProduct($productID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -476,9 +739,19 @@ class executionTest
         }
     }
 
+    /**
+     * function getOrderedExecutions test exection
+     *
+     * @param  string $projectID
+     * @param  string $status
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getOrderedExecutionsTest($projectID, $status, $count)
     {
         $object = $this->objectModel->getOrderedExecutions($projectID,$status);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -494,9 +767,19 @@ class executionTest
         }
     }
 
+    /**
+     * function getToImport test execution
+     *
+     * @param  string $executionIds
+     * @param  string $type
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getToImportTest($executionIds, $type, $count)
     {
         $object = $this->objectModel->getToImport($executionIds, $type);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -512,16 +795,30 @@ class executionTest
         }
     }
 
+    /**
+     * function updateProducts test by execution
+     *
+     * @param  string $executionID
+     * @param  array $param
+     * @access public
+     * @return array
+     */
     public function updateProductsTest($executionID,$param = array())
     {
         global $tester;
+
         $products = array();
         $branch   = array();
+
         $createFields = array('products' => $products, 'branch' => $branch, 'post' => 'post');
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $this->objectModel->updateProducts($executionID);
+
         unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -535,11 +832,20 @@ class executionTest
         }
     }
 
+    /**
+     * function getTasks2Imported test by execution
+     *
+     * @param  string $toExecution
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getTasks2ImportedTest($toExecution, $count)
     {
         $branches = $this->objectModel->getBranches($toExecution);
 
         $object = $this->objectModel->getTasks2Imported($toExecution, $branches);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -555,9 +861,19 @@ class executionTest
         }
     }
 
+    /**
+     * function importTask test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function importTaskTest($executionID, $count, $param = array())
     {
         global $tester;
+
         $tasks        = array();
         $createFields = array('tasks' => $tasks);
 
@@ -565,6 +881,9 @@ class executionTest
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $this->objectModel->importTask($executionID);
+
+        unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -582,9 +901,17 @@ class executionTest
         }
     }
 
+    /**
+     * function statRelatedData test by execution
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function statRelatedDataTest($executionID)
     {
         $object = $this->objectModel->statRelatedData($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -596,6 +923,15 @@ class executionTest
         }
     }
 
+    /**
+     * function importBug test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function importBugTest($executionID, $count, $param = array())
     {
         $import     = array();
@@ -604,6 +940,7 @@ class executionTest
         $assignedTo = array();
         $estimate   = array();
         $deadline   = array();
+
         $createFields = array('import' => $import, 'id' => $id, 'pri' => $pri, 'assignedTo' => $assignedTo,
             'estimate' => $estimate, 'deadline' => $deadline);
 
@@ -611,6 +948,9 @@ class executionTest
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $object = $this->objectModel->importBug($executionID);
+
+        unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -626,9 +966,19 @@ class executionTest
         }
     }
 
+    /**
+     * function updateChilds test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  array $param
+     * @access public
+     * @return array
+     */
     public function updateChildsTest($executionID, $count, $param = array())
     {
         global $tester;
+
         $childs = array();
         $createFields = array('childs' => $childs);
 
@@ -636,6 +986,9 @@ class executionTest
         foreach($param as $key => $value) $_POST[$key] = $value;
 
         $object = $this->objectModel->updateChilds($executionID);
+
+        unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -653,10 +1006,22 @@ class executionTest
         }
     }
 
+    /**
+     * function changeProject test by execution
+     *
+     * @param  string $newProject
+     * @param  string $oldProject
+     * @param  string $executionID
+     * @param  array  $syncStories
+     * @access public
+     * @return array
+     */
     public function changeProjectTest($newProject, $oldProject, $executionID, $syncStories = 'no')
     {
         global $tester;
+
         $this->objectModel->changeProject($newProject, $oldProject, $executionID, $syncStories);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -669,18 +1034,33 @@ class executionTest
         }
     }
 
+    /**
+     * function linkStory test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function linkStoryTest($executionID, $count, $param = array())
     {
         global $tester;
+
         $stories  = array();
         $products = array();
+
         $createFields = array('stories' => $stories, 'products' => $products);
 
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $tester->dbh->query("delete from zt_projectstory where project = $executionID");
 
         $this->objectModel->linkStory($executionID);
+
+        unset($_POST);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -698,12 +1078,24 @@ class executionTest
         }
     }
 
+    /**
+     * function linkCases test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  string $productID
+     * @param  string $storyID
+     * @access public
+     * @return array
+     */
     public function linkCasesTest($executionID, $count, $productID, $storyID)
     {
         global $tester;
+
         $tester->dbh->query("delete from zt_projectcase where project = $executionID");
 
         $this->objectModel->linkCases($executionID, $productID, $storyID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -721,20 +1113,36 @@ class executionTest
         }
     }
 
+    /**
+     * function unlinkStory test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  string $storyID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function unlinkStoryTest($executionID, $count, $storyID, $param = array())
     {
         global $tester;
+
         $stories  = array();
         $products = array();
+
         $createFields = array('stories' => $stories, 'products' => $products);
 
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $tester->dbh->query("delete from zt_projectstory where project = $executionID");
 
         $this->objectModel->linkStory($executionID);
+
         unset($_POST);
+
         $this->objectModel->unlinkStory($executionID, $storyID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -759,13 +1167,24 @@ class executionTest
         }
     }
 
+    /**
+     * function unlinkCases test by execution
+     *
+     * @param  string $executionID
+     * @param  string $productID
+     * @param  string $storyID
+     * @access public
+     * @return array
+     */
     public function unlinkCasesTest($executionID, $productID, $storyID)
     {
         global $tester;
+
         $tester->dbh->query("delete from zt_projectcase where project = $executionID");
 
         $this->objectModel->linkCases($executionID, $productID, $storyID);
         $this->objectModel->unlinkCases($executionID, $storyID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -778,9 +1197,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getTeamMembers test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getTeamMembersTest($executionID, $count)
     {
         $object = $this->objectModel->getTeamMembers($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -796,9 +1224,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getMembersByIdList test by execution
+     *
+     * @param  array  $executionIdList
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getMembersByIdListTest($executionIdList, $count)
     {
         $object = $this->objectModel->getMembersByIdList($executionIdList);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -814,11 +1251,22 @@ class executionTest
         }
     }
 
+    /**
+     * function getTeamSkip test by execution
+     *
+     * @param  string $taskID
+     * @param  string $begin
+     * @param  string $end
+     * @access public
+     * @return array
+     */
     public function getTeamSkipTest($taskID, $begin, $end)
     {
         global $tester;
         $teams = $tester->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($taskID)->andWhere('type')->eq('task')->orderBy('order')->fetchAll('account');
+
         $object = $this->objectModel->getTeamSkip($teams, $begin, $end);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -837,9 +1285,19 @@ class executionTest
         }
     }
 
+    /**
+     * function getTeams2Import test by execution
+     *
+     * @param  string $account
+     * @param  string $currentExecution
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getTeams2ImportTest($account, $currentExecution, $count)
     {
         $object = $this->objectModel->getTeams2Import($account, $currentExecution);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -862,9 +1320,19 @@ class executionTest
         }
     }
 
+    /**
+     * function getMembers2Import test by execution
+     *
+     * @param  string $execution
+     * @param  array  $currentMembers
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getMembers2ImportTest($execution, $currentMembers, $count)
     {
         $object = $this->objectModel->getMembers2Import($execution, $currentMembers);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -887,9 +1355,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getCanCopyObjects test by execution
+     *
+     * @param  int    $projectID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getCanCopyObjectsTest($projectID = 0, $count)
     {
         $object = $this->objectModel->getCanCopyObjects($projectID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -912,23 +1389,39 @@ class executionTest
         }
     }
 
+    /**
+     * function manageMembers test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  array $param
+     * @access public
+     * @return array
+     */
     public function manageMembersTest($executionID, $count, $param = array())
     {
         global $tester;
         $tester->dbh->query("delete from zt_team where root = $executionID");
+
         $realnames = array();
         $roles     = array();
         $days      = array();
         $hours     = array();
         $accounts  = array();
         $limited   = array();
+
         $createFields = array('realnames' => $realnames, 'roles' => $roles, 'hours' => $hours, 'accounts' => $accounts,
             'limited' => $limited, 'days' => $days);
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $object = $this->objectModel->manageMembers($executionID);
+
         unset($_POST);
+
         $object = $tester->dbh->query("select * from zt_team where root = $executionID")->fetchAll();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -951,13 +1444,25 @@ class executionTest
         }
     }
 
+    /**
+     * function addProjectMembers test by execution
+     *
+     * @param  int    $projectID
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function addProjectMembersTest($projectID = 0, $executionID, $count)
     {
         global $tester;
         $tester->dbh->query("delete from zt_team where root = $projectID");
         $executionMembers = $tester->dao->select('`root`,`account`,`join`,`role`,`days`,`type`,`hours`')->from(TABLE_TEAM)->where('root')->eq($executionID)->fetchAll('account');
+
         $this->objectModel->addProjectMembers($projectID, $executionMembers);
+
         $object = $tester->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($projectID)->fetchAll();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -973,12 +1478,24 @@ class executionTest
         }
     }
 
+    /**
+     * function unlinkMember test by execution
+     *
+     * @param  string $sprintID
+     * @param  string $account
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function unlinkMemberTest($sprintID, $account, $count)
     {
         global $tester;
         $oldObject = $tester->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($sprintID)->fetchAll();
+
         $this->objectModel->unlinkMember($sprintID, $account);
+
         $object = $tester->dao->select('*')->from(TABLE_TEAM)->where('root')->eq($sprintID)->fetchAll();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -994,9 +1511,17 @@ class executionTest
         }
     }
 
+    /**
+     * function computeBurn test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function computeBurnTest($count)
     {
         $object = $this->objectModel->computeBurn();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1012,17 +1537,32 @@ class executionTest
         }
     }
 
+    /**
+     * function fixFirst test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $param
+     * @access public
+     * @return array
+     */
     public function fixFirstTest($executionID, $param = array())
     {
         global $tester;
+
         $date = date('Y-m-d');
+
         $createFields = array('estimate' => '');
+
         foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue;
         foreach($param as $key => $value) $_POST[$key] = $value;
+
         $this->objectModel->computeBurn();
         $this->objectModel->fixFirst($executionID);
+
         unset($_POST);
+
         $object = $tester->dao->select('*')->from(TABLE_BURN)->where('execution')->eq($executionID)->andWhere('date')->eq($date)->fetchAll();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1041,9 +1581,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getBurnDataFlot test by execution
+     *
+     * @param  int $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getBurnDataFlotTest($executionID = 0, $count)
     {
         $object = $this->objectModel->getBurnDataFlot($executionID, $burnBy = 'left');
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1059,11 +1608,24 @@ class executionTest
         }
     }
 
+    /**
+     * function processBurnData test by execution
+     *
+     * @param  string $executionID
+     * @param  array  $itemCounts
+     * @param  string $begin
+     * @param  string $end
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function processBurnDataTest($executionID, $itemCounts, $begin, $end, $count)
     {
         global $tester;
         $sets = $tester->dao->select('execution, `date` as name, `left` as value')->from(TABLE_BURN)->where('execution')->eq($executionID)->fetchAll('name');
+
         $object = $this->objectModel->processBurnData($sets, $itemCounts, $begin, $end);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1079,14 +1641,23 @@ class executionTest
         }
     }
 
+    /**
+     * function summary test by execution
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function summaryTest($executionID)
     {
         global $tester;
         $execution  = $tester->dbh->query("select * from zt_project where id = $executionID")->fetch();
         $executions = array($executionID => $execution->name);
         $page       = 'NULL';
-        $tasks = $this->objectModel->getTasks('0', $executionID, $executions,'all', '0', '0', 'status,id_desc', $page);
+        $tasks      = $this->objectModel->getTasks('0', $executionID, $executions,'all', '0', '0', 'status,id_desc', $page);
+
         $object = $this->objectModel->summary($tasks);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1098,9 +1669,18 @@ class executionTest
         }
     }
 
+    /**
+     * function isClickable test by execution
+     *
+     * @param  string $execution
+     * @param  string $action
+     * @access public
+     * @return array
+     */
     public function isClickableTest($execution, $action)
     {
         $object = $this->objectModel->isClickable($execution, $action);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1119,9 +1699,21 @@ class executionTest
         }
     }
 
+    /**
+     * function getDateList test by execution
+     *
+     * @param  string $begin
+     * @param  string $end
+     * @param  string $type
+     * @param  string $count
+     * @param  int $interval
+     * @access public
+     * @return array
+     */
     public function getDateListTest($begin, $end, $type, $count, $interval = 0)
     {
         $object = $this->objectModel->getDateList($begin, $end, $type, $interval);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1144,9 +1736,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getTotalEstimate test by execution
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
     public function getTotalEstimateTest($executionID)
     {
         $object = $this->objectModel->getTotalEstimate($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1158,11 +1758,20 @@ class executionTest
         }
     }
 
+    /**
+     * function fixOrder test by execution
+     *
+     * @access public
+     * @return array
+     */
     public function fixOrderTest()
     {
         global $tester;
+
         $this->objectModel->fixOrder();
+
         $object = $tester->dao->select('id,`order`')->from(TABLE_EXECUTION)->fetchAll('id');
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1174,9 +1783,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanTasks test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanTasksTest($executionID, $count)
     {
         $object = $this->objectModel->getKanbanTasks($executionID);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1192,9 +1810,17 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanSetting test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanSettingTest($count)
     {
         $object = $this->objectModel->getKanbanSetting();
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1210,10 +1836,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanColumns test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanColumnsTest($count)
     {
         $kanbanSetting = $this->objectModel->getKanbanSetting();
-        $object = $this->objectModel->getKanbanColumns($kanbanSetting);
+        $object        = $this->objectModel->getKanbanColumns($kanbanSetting);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1229,10 +1863,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanStatusMap test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanStatusMapTest($count)
     {
         $kanbanSetting = $this->objectModel->getKanbanSetting();
-        $object = $this->objectModel->getKanbanStatusMap($kanbanSetting);
+        $object        = $this->objectModel->getKanbanStatusMap($kanbanSetting);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1248,10 +1890,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanStatusList test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanStatusListTest($count)
     {
         $kanbanSetting = $this->objectModel->getKanbanSetting();
-        $object = $this->objectModel->getKanbanStatusList($kanbanSetting);
+        $object        = $this->objectModel->getKanbanStatusList($kanbanSetting);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1267,10 +1917,18 @@ class executionTest
         }
     }
 
+    /**
+     * function getKanbanColorList test by execution
+     *
+     * @param  string $count
+     * @access public
+     * @return array
+     */
     public function getKanbanColorListTest($count)
     {
         $kanbanSetting = $this->objectModel->getKanbanSetting();
-        $object = $this->objectModel->getKanbanColorList($kanbanSetting);
+        $object        = $this->objectModel->getKanbanColorList($kanbanSetting);
+
         if(dao::isError())
         {
             $error = dao::getError();
@@ -1285,4 +1943,118 @@ class executionTest
             return $object;
         }
     }
+
+    /**
+     * function buildBurnData test by execution
+     *
+     * @param  string $executionID
+     * @param  string $count
+     * @param  string $type
+     * @access public
+     * @return array
+     */
+    public function buildBurnDataTest($executionID, $count, $type = 'noweek')
+    {
+        $begin = '2022-01-07';
+        $end   = '2022-01-17';
+
+        $dateList = $this->objectModel->getDateList($begin, $end, $type, 0, $format = 'Y-m-d');
+
+        $object = $this->objectModel->buildBurnData($executionID, $dateList[0], $type);
+
+        if(dao::isError())
+        {
+            $error = dao::getError();
+            return $error;
+        }
+        elseif($count == 1)
+        {
+            return count($object);
+        }
+        else
+        {
+            return $object;
+        }
+    }
+
+    /**
+     * function getPlans test by execution
+     *
+     * @param array  $products
+     * @param string $executionID
+     * @param string $count
+     * @access public
+     * @return array
+     */
+    public function getPlansTest($products, $executionID, $count)
+    {
+        $object = $this->objectModel->getPlans($products,'', $executionID);
+
+        if(dao::isError())
+        {
+            $error = dao::getError();
+            return $error;
+        }
+        elseif($count == 1)
+        {
+            return count($object);
+        }
+        else
+        {
+            return $object;
+        }
+    }
+
+    /**
+     * function getStageLinkProductPairs test by execution
+     *
+     * @param  array $projects
+     * @param  string $count
+     * @access public
+     * @return array
+     */
+    public function getStageLinkProductPairsTest($projects, $count)
+    {
+        $object = $this->objectModel->getStageLinkProductPairs($projects);
+
+        if(dao::isError())
+        {
+            $error = dao::getError();
+            return $error;
+        }
+        elseif($count == 1)
+        {
+            return count($object);
+        }
+        else
+        {
+            return $object;
+        }
+    }
+
+    /**
+     * function setTreePath test by executon
+     *
+     * @param  string $executionID
+     * @access public
+     * @return array
+     */
+    public function setTreePathTest($executionID)
+    {
+        global $tester;
+
+        $this->objectModel->setTreePath($executionID);
+
+        $object = $tester->dao->select('id,project,parent,path')->from(TABLE_EXECUTION)->where('id')->eq($executionID)->fetchAll('id');
+
+        if(dao::isError())
+        {
+            $error = dao::getError();
+            return $error;
+        }
+        else
+        {
+            return $object;
+        }
+    }
 }
diff --git a/test/class/task.class.php b/test/class/task.class.php
index 7a0e7ed53b..0199f8ea2d 100644
--- a/test/class/task.class.php
+++ b/test/class/task.class.php
@@ -18,7 +18,7 @@ class taskTest
      */
     public function createObject($param = array(), $executionID = '')
     {
-        $assignedTo = array('');
+        $assignedTo   = array('');
         $createFields = array('module' => '', 'story' => '', 'name' => '', 'type' => '', 'assignedTo' => $assignedTo,
             'pri' => 3, 'estimate' => '', 'estStarted' => '2021-01-10', 'deadline' => '2021-03-19', 'desc' => '');
 
diff --git a/test/class/user.class.php b/test/class/user.class.php
index 854110c622..c74010d5b8 100644
--- a/test/class/user.class.php
+++ b/test/class/user.class.php
@@ -427,4 +427,221 @@ class userTest
 
         return $user;
     }
+
+    /**
+     * Test authorize user.
+     * 
+     * @param  string $account
+     * @access public
+     * @return void
+     */
+    public function authorizeTest($account)
+    {
+        $user = $this->objectModel->authorize($account);
+
+        return $user;
+    }
+
+    /**
+     * Test login user.
+     * 
+     * @param  object $user
+     * @access public
+     * @return void
+     */
+    public function loginTest($user)
+    {
+        $user = $this->objectModel->login($user);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $user;
+        }
+    }
+
+    /**
+     * Test get groups by user.
+     * 
+     * @param  string $account
+     * @param  string $password
+     * @access public
+     * @return void
+     */
+    public function getGroupsTest($account)
+    {
+        $groups = $this->objectModel->getGroups($account);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $groups;
+        }
+    }
+
+    /**
+     * Test get groups by visions.
+     * 
+     * @param  string $visions 
+     * @access public
+     * @return void
+     */
+    public function getGroupsByVisionsTest($visions)
+    {
+        $groups = $this->objectModel->getGroupsByVisions($visions);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $groups;
+        }
+    }
+
+    /**
+     * Test get my objects.
+     * 
+     * @param  string $account 
+     * @param  string $type 
+     * @param  string $status 
+     * @param  string $orderBy 
+     * @access public
+     * @return void
+     */
+    public function getObjectsTest($account, $type, $status, $orderBy)
+    {
+        $myObjects = $this->objectModel->getObjects($account, $type, $status, $orderBy);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $myObjects;
+        }
+    }
+
+    /**
+     * Test get contact list.
+     * 
+     * @param  string $account 
+     * @param  string $params
+     * @access public
+     * @return void
+     */
+    public function getContactListsTest($account = '', $params = '')
+    {
+        $contacts = $this->objectModel->getContactLists($account, $params);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $contacts;
+        }
+    }
+
+    /**
+     * Test get list by account method.
+     * 
+     * @param  string $account 
+     * @access public
+     * @return void
+     */
+    public function getListByAccountTest($account)
+    {
+        return $this->objectModel->getListByAccount($account);
+    }
+
+    /**
+     * Test get parent stage authed users.
+     * 
+     * @param  int    $stageID 
+     * @access public
+     * @return void
+     */
+    public function getParentStageAuthedUsersTest($stageID)
+    {
+        return $this->objectModel->getParentStageAuthedUsers($stageID);
+    }
+
+    /**
+     * Test get contact list by id.
+     * 
+     * @param  int    $listID 
+     * @access public
+     * @return void
+     */
+    public function getContactListByIDTest($listID)
+    {
+        return $this->objectModel->getContactListByID($listID);
+    }
+
+    /**
+     * Test get contact user pairs.
+     * 
+     * @param  array $accountList 
+     * @access public
+     * @return void
+     */
+    public function getContactUserPairsTest($accountList)
+    {
+        return $this->objectModel->getContactListByID($listID);
+    }
+
+    /**
+     * Test create contact list.
+     * 
+     * @param  string $listName 
+     * @param  array  $userList 
+     * @access public
+     * @return void
+     */
+    public function createContactListTest($listName = '', $userList = array())
+    {
+        $listID = $this->objectModel->createContactList($listName, $userList); 
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $listID;
+        }
+    }
+
+    /**
+     * Test update contact list.
+     * 
+     * @param  int    $listID 
+     * @param  string $listName 
+     * @param  array  $userList 
+     * @access public
+     * @return void
+     */
+    public function updateContactListTest($listID = 0, $listName = '', $userList = array())
+    {
+        $this->objectModel->updateContactList($listID, $listName, $userList);
+
+        if(dao::isError())
+        {
+            return dao::getError();
+        }
+        else
+        {
+            return $this->objectModel->getContactListByID($listID);
+        }
+    }
 }
diff --git a/test/data/execution.yaml b/test/data/execution.yaml
index 35587270c9..33cc7708a3 100644
--- a/test/data/execution.yaml
+++ b/test/data/execution.yaml
@@ -38,11 +38,11 @@ fields:
       - field: path2
         prefix: ","
         range: 101-700
-      - field: path3
-        range: []
         postfix: ","
   - field: acl
     range: open{4},private{4}
+  - field: openedVersion
+    range: "16.5"
   - field: whitelist
     froms:
       - from: common.user.v1.yaml
diff --git a/test/data/executionson.yaml b/test/data/executionson.yaml
index 49ec1af958..2384886896 100644
--- a/test/data/executionson.yaml
+++ b/test/data/executionson.yaml
@@ -37,10 +37,10 @@ fields:
        range: 41-70
      - field: path2
        prefix: ","
+       postfix: ","
        range: 131-160
      - field: path6
-       prefix: ","
-       range: [701-730]
+       range: 701-730
        postfix: ","
   - field: acl
     range: open{4},private{4}
@@ -64,6 +64,8 @@ fields:
     prefix: ""
     postfix: ""
     format: ""
+  - field: openedVersion
+    range: "16.5"
   - field: whitelist
     froms:
       - from: common.user.v1.yaml
diff --git a/test/data/program.yaml b/test/data/program.yaml
index 540219d041..ee09f51582 100644
--- a/test/data/program.yaml
+++ b/test/data/program.yaml
@@ -42,6 +42,8 @@ fields:
     prefix: "项目集描述"
   - field: acl
     range: open{4},private{4}
+  - field: openedVersion
+    range: "16.5"
   - field: whitelist
     froms:
       - from: common.user.v1.yaml
diff --git a/test/data/project.yaml b/test/data/project.yaml
index acebfb2f65..8f42782bf7 100644
--- a/test/data/project.yaml
+++ b/test/data/project.yaml
@@ -79,5 +79,7 @@ fields:
     range: open,private,custom
   - field: order
     range: 5-10000:5
+  - field: openedVersion
+    range: "16.5"
   - field: deleted
     range: 0
diff --git a/test/data/usercontact.yaml b/test/data/usercontact.yaml
new file mode 100644
index 0000000000..737ab3898e
--- /dev/null
+++ b/test/data/usercontact.yaml
@@ -0,0 +1,41 @@
+title: table zt_usercontact
+desc: "用户联系人"
+author: automated export
+version: "1.0"
+fields:
+  - field: id
+    note: "ID"
+    range: 1-10000
+    prefix: ""
+    postfix: ""
+    loop: 0
+    format: ""
+  - field: account
+    note: "用户名"
+    fields:
+      - field: account1
+        range: user,dev,test,admin
+      - field: account2
+        range: 1-20,1-20,1-20,""
+    prefix: ""
+    postfix: ""
+    format: ""
+  - field: listName
+    note: "列表名称"
+    range: 1-10000
+    prefix: "联系人列表"
+    postfix: ""
+    format: ""
+  - field: userList
+    note: "用户列表"
+    fields:
+      - field: userList1
+        range: user,dev,test
+      - field: userList2
+        range: 20-30,20-30,20-30
+        postfix: ","
+      - field: userList3
+        range: user,dev,test
+      - field: userList4
+        range: 40-50,40-5040-50
+    format: ""
diff --git a/test/data/zentao/config.php b/test/data/zentao/config.php
index 507db40578..182ba933f0 100644
--- a/test/data/zentao/config.php
+++ b/test/data/zentao/config.php
@@ -1,13 +1,14 @@
 <?php
 $builder = new stdclass();
 
-$builder->company   = array('rows' => 1,    'extends' => array('company'));
-$builder->user      = array('rows' => 1000, 'extends' => array('user'));
-$builder->todo      = array('rows' => 2000, 'extends' => array('todo'));
-$builder->effort    = array('rows' => 100, 'extends' => array('effort'));
-$builder->usergroup = array('rows' => 600, 'extends' => array('usergroup'));
-$builder->dept      = array('rows' => 100,  'extends' => array('dept'));
-$builder->action    = array('rows' => 100,  'extends' => array('action'));
+$builder->company     = array('rows' => 1,    'extends' => array('company'));
+$builder->user        = array('rows' => 1000, 'extends' => array('user'));
+$builder->todo        = array('rows' => 2000, 'extends' => array('todo'));
+$builder->effort      = array('rows' => 100, 'extends' => array('effort'));
+$builder->usergroup   = array('rows' => 600, 'extends' => array('usergroup'));
+$builder->usercontact = array('rows' => 61, 'extends' => array('usercontact'));
+$builder->dept        = array('rows' => 100,  'extends' => array('dept'));
+$builder->action      = array('rows' => 100,  'extends' => array('action'));
 
 $builder->program       = array('rows' => 10, 'extends' => array('project', 'program'));
 $builder->project       = array('rows' => 90, 'extends' => array('project', 'project'));
diff --git a/test/data/zentao/processor.php b/test/data/zentao/processor.php
index 26f11f7eb8..bf9a124e6e 100644
--- a/test/data/zentao/processor.php
+++ b/test/data/zentao/processor.php
@@ -89,6 +89,8 @@ class Processor
         $users['user2'] = array('account' => 'noprogram1', 'realname' => '不在项目集1用户');
 
         foreach($users as $account => $user) $this->dao->update(TABLE_USER)->data($user)->where('account')->eq($account)->exec();
+
+        $this->dao->update(TABLE_USERCONTACT)->set('account')->eq('admin')->where('account')->like('admin%')->exec();
     }
 
     /**
diff --git a/test/model/bug/batchcreate.php b/test/model/bug/batchcreate.php
new file mode 100755
index 0000000000..7b0a35f94f
--- /dev/null
+++ b/test/model/bug/batchcreate.php
@@ -0,0 +1,48 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/bug.class.php';
+su('admin');
+
+/**
+
+title=bugModel->batchCreate();
+cid=1
+pid=1
+
+测试正常批量创建bug1         >> 批量bug一,trunk,3,codeerror,3,3,1,101
+测试正常批量创建bug2         >> 批量bug五,trunk,codeerror,3,3,1,101
+测试正常批量创建bug3         >> 批量bug九,1,config,3,3,1,0
+测试短时间内重复批量创建bug  >> 0
+测试异常创建bug              >> <html><meta charset='utf-8'/><style>body{background:white}</style><script>alert('『影响版本』不能为空。')
+
+
+*/
+
+$productID     = 1;
+
+$title          = array('批量bug一','批量bug二','批量bug三');
+$openedBuild    = array(array('trunk', '3'), array('trunk'), array('1'));
+$type           = array('codeerror','ditto','config');
+$severity       = array('3','2','1');
+$normal_create1 = array('title' => $title, 'types' => $type, 'openedBuilds' => $openedBuild, 'severity' => $severity);
+
+$title          = array('批量bug四','批量bug五','批量bug六');
+$normal_create2 = array('title' => $title, 'types' => $type, 'openedBuilds' => $openedBuild, 'severity' => $severity);
+
+
+$title          = array('批量bug七','批量bug八','批量bug九');
+$normal_create3 = array('title' => $title, 'types' => $type, 'openedBuilds' => $openedBuild, 'severity' => $severity);
+
+$title            = array('异常一','异常二','异常三');
+$openedBuild      = array(array('trunk'), array(''), array('1'));
+$exception_create = array('title' => $title, 'openedBuilds' => $openedBuild);
+
+$bug = new bugTest();
+r($bug->batchCreateObject($productID, $normal_create1))   && p('0:title,openedBuild,type,severity,pri,product,execution')    && e('批量bug一,trunk,3,codeerror,3,3,1,101');         // 测试正常批量创建bug1
+r($bug->batchCreateObject($productID, $normal_create2))   && p('1:title,openedBuild,type,severity,pri,product,execution')    && e('批量bug五,trunk,codeerror,3,3,1,101');           // 测试正常批量创建bug2
+r($bug->batchCreateObject($productID, $normal_create3))   && p('2:title,openedBuild,type,severity,pri,product,execution')    && e('批量bug九,1,config,3,3,1,0');                    // 测试正常批量创建bug3
+r($bug->batchCreateObject($productID, $normal_create1))   && p()                                                             && e('0');                                             // 测试短时间内重复批量创建bug
+r($bug->batchCreateObject($productID, $exception_create)) && p() && e("<html><meta charset='utf-8'/><style>body{background:white}</style><script>alert('『影响版本』不能为空。')"); // 测试异常创建bug
+
+system("./ztest init");
diff --git a/test/model/bug/create.php b/test/model/bug/create.php
new file mode 100755
index 0000000000..b9197ba2ae
--- /dev/null
+++ b/test/model/bug/create.php
@@ -0,0 +1,55 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/bug.class.php';
+su('admin');
+
+/**
+
+title=bugModel->create();
+cid=1
+pid=1
+
+测试正常的创建代码错误bug >> 代码错误bug一
+测试正常的创建配置相关bug >> 1
+测试正常的创建安装部署bug >> 101
+测试正常的创建安全相关bug >> security
+测试正常的创建性能问题bug >> 3
+测试正常的创建标准规范bug >> active
+测试正常的创建测试脚本bug >> admin
+测试正常的创建设计缺陷bug >> 3
+测试正常的创建其他bug     >> 2021-03-19
+测试不输入名称创建bug     >> 『Bug标题』不能为空。
+测试不输入影响版本创建bug >> 『影响版本』不能为空。
+测试指派人bug             >> user92
+
+*/
+
+$b_codeerror    = array('title' => '代码错误bug一', 'type' => 'codeerror');
+$b_config       = array('title' => '配置相关bug一', 'type' => 'config');
+$b_install      = array('title' => '安装部署bug一', 'type' => 'install');
+$b_security     = array('title' => '安全相关bug一', 'type' => 'security');
+$b_performance  = array('title' => '性能问题bug一', 'type' => 'performance');
+$b_standard     = array('title' => '标准规范bug一', 'type' => 'standard');
+$b_automation   = array('title' => '测试脚本bug一', 'type' => 'automation');
+$b_designdefect = array('title' => '设计缺陷bug一', 'type' => 'designdefect');
+$b_others       = array('title' => '其他bug一',     'type' => 'others');
+$b_notitle      = array('title' => '',              'type' => 'codeerror');
+$b_nobuild      = array('title' => '没有影响版本',  'type' => 'codeerror', 'openedBuild' => '');
+$b_assign       = array('title' => '指派人user92',  'type' => 'codeerror', 'assignedTo' => 'user92');
+
+$bug=new bugTest();
+r($bug->createObject($b_codeerror))    && p('title')         && e('代码错误bug一');          // 测试正常的创建代码错误bug
+r($bug->createObject($b_config))       && p('product')       && e('1');                      // 测试正常的创建配置相关bug
+r($bug->createObject($b_install))      && p('execution')     && e('101');                    // 测试正常的创建安装部署bug
+r($bug->createObject($b_security))     && p('type')          && e('security');               // 测试正常的创建安全相关bug
+r($bug->createObject($b_performance))  && p('pri')           && e('3');                      // 测试正常的创建性能问题bug
+r($bug->createObject($b_standard))     && p('status')        && e('active');                 // 测试正常的创建标准规范bug
+r($bug->createObject($b_automation))   && p('openedBy')      && e('admin');                  // 测试正常的创建测试脚本bug
+r($bug->createObject($b_designdefect)) && p('severity')      && e('3');                      // 测试正常的创建设计缺陷bug
+r($bug->createObject($b_others))       && p('deadline')      && e('2021-03-19');             // 测试正常的创建其他bug
+r($bug->createObject($b_notitle))      && p('title:0')       && e('『Bug标题』不能为空。');  // 测试不输入名称创建bug
+r($bug->createObject($b_nobuild))      && p('openedBuild:0') && e('『影响版本』不能为空。'); // 测试不输入影响版本创建bug
+r($bug->createObject($b_assign))       && p('assignedTo')    && e('user92');                 // 测试指派人bug
+
+system("./ztest init");
diff --git a/test/model/bug/createbugfromgitlabissue.php b/test/model/bug/createbugfromgitlabissue.php
new file mode 100755
index 0000000000..a908ac8797
--- /dev/null
+++ b/test/model/bug/createbugfromgitlabissue.php
@@ -0,0 +1,53 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/bug.class.php';
+su('admin');
+
+/**
+
+title=bugModel->createBugFromGitlabIssue ();
+cid=1
+pid=1
+
+测试正常的创建来源于gitlab issue的bug title     >> 问题1
+测试短时间内重复创建来源于gitlab issue的bug     >> 0
+测试正常的创建来源于gitlab issue的bug execution >> 101
+测试正常的创建来源于gitlab issue的bug pri       >> 3
+测试正常的创建来源于gitlab issue的bug severity  >> 3
+测试创建没有标题 来源于gitlab issue的异常bug    >> 『Bug标题』不能为空。
+
+*/
+
+$executionID = 101;
+
+$bug1 = new stdclass();
+$bug1->title     = '问题1';
+$bug1->execution = $executionID;
+
+
+$bug2 = new stdclass();
+$bug2->title     = '问题2';
+$bug2->execution = $executionID;
+
+$bug3 = new stdclass();
+$bug3->title     = '问题3';
+$bug3->execution = $executionID;
+
+$bug4 = new stdclass();
+$bug4->title     = '问题4';
+$bug4->execution = $executionID;
+
+$bug5 = new stdclass();
+$bug5->title     = '';
+$bug5->execution = $executionID;
+
+$bug=new bugTest();
+r($bug->createBugFromGitlabIssueTest($bug1, $executionID))    && p('title')     && e('问题1');                 // 测试正常的创建来源于gitlab issue的bug title
+r($bug->createBugFromGitlabIssueTest($bug1, $executionID))    && p('task')      && e('0');                     // 测试短时间内重复创建来源于gitlab issue的bug
+r($bug->createBugFromGitlabIssueTest($bug2, $executionID))    && p('execution') && e($executionID);            // 测试正常的创建来源于gitlab issue的bug execution
+r($bug->createBugFromGitlabIssueTest($bug3, $executionID))    && p('pri')       && e('3');                     // 测试正常的创建来源于gitlab issue的bug pri
+r($bug->createBugFromGitlabIssueTest($bug4, $executionID))    && p('severity')  && e('3');                     // 测试正常的创建来源于gitlab issue的bug severity
+r($bug->createBugFromGitlabIssueTest($bug5, $executionID))    && p('title:0')   && e('『Bug标题』不能为空。'); // 测试创建没有标题 来源于gitlab issue的异常bug
+
+system("./ztest init");
diff --git a/test/model/bug/getbugs.php b/test/model/bug/getbugs.php
new file mode 100755
index 0000000000..4067cf0aa3
--- /dev/null
+++ b/test/model/bug/getbugs.php
@@ -0,0 +1,46 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/bug.class.php';
+su('admin');
+
+/**
+
+title=bugModel->getBugs();
+cid=1
+pid=1
+
+查询正常产品 没有分支 查看全部 没有模块的全部bug的标题拼接1        >> BUG3,BUG2,BUG1
+查询正常产品 不存在的分支主干 查看全部 没有模块的全部bug的标题拼接 >> BUG3,BUG2,BUG1
+查询正常产品 没有分支 查看未关闭 没有模块的全部bug的标题拼接       >> BUG3,BUG2,BUG1
+查询正常产品 没有分支 查看全部 模块1821的全部bug的标题拼接         >> 0
+查询正常产品 没有分支 查看全部 模块不存在的全部bug的标题拼接       >> BUG3,BUG2,BUG1
+查询多分支产品 没有分支 查看全部 没有模块的全部bug的标题拼接59     >> BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*'":.<>。?/（）;175
+查询多分支产品 主干 查看全部 没有模块的全部bug的标题拼接           >> BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*'":.<>。?/（）;175
+查询多分支产品 分支37 查看全部 没有模块的全部bug的标题拼接         >> 0
+查询多分支产品 没有分支 查看未关闭 没有模块的全部bug的标题拼接     >> BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*'":.<>。?/（）;175
+查询多分支产品 没有分支 查看全部 模块2053的全部bug的标题拼接       >> 0
+查询不存在的产品的全部bug的标题拼接                                >> 0
+
+*/
+
+$productIDList  = array('1', '59', '1000001');
+$branchList     = array('0', 'trunk', '37', '1000001');
+$browseTypeList = array('all', 'unclosed');
+$moduleIDList   = array('0', '1821', '2053', '1000001');
+
+$bug=new bugTest();
+
+r($bug->getBugsTest($productIDList[0], $branchList[0], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('BUG3,BUG2,BUG1'); // 查询正常产品 没有分支 查看全部 没有模块的全部bug的标题拼接1
+r($bug->getBugsTest($productIDList[0], $branchList[1], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('BUG3,BUG2,BUG1'); // 查询正常产品 不存在的分支主干 查看全部 没有模块的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[0], $branchList[0], $browseTypeList[1], $moduleIDList[0])) && p('title') && e('BUG3,BUG2,BUG1'); // 查询正常产品 没有分支 查看未关闭 没有模块的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[0], $branchList[0], $browseTypeList[0], $moduleIDList[1])) && p('title') && e('0'); // 查询正常产品 没有分支 查看全部 模块1821的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[0], $branchList[0], $browseTypeList[0], $moduleIDList[3])) && p('title') && e('BUG3,BUG2,BUG1'); // 查询正常产品 没有分支 查看全部 模块不存在的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[1], $branchList[0], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*\'":.<>。?/（）;175'); // 查询多分支产品 没有分支 查看全部 没有模块的全部bug的标题拼接59
+r($bug->getBugsTest($productIDList[1], $branchList[1], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*\'":.<>。?/（）;175'); // 查询多分支产品 主干 查看全部 没有模块的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[1], $branchList[2], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('0'); // 查询多分支产品 分支37 查看全部 没有模块的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[1], $branchList[0], $browseTypeList[1], $moduleIDList[0])) && p('title') && e('BUG177,bug176,缺陷!@()(){}|+=%^&*$#测试bug名称到底可以有多长！@#￥%&*\'":.<>。?/（）;175'); // 查询多分支产品 没有分支 查看未关闭 没有模块的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[1], $branchList[0], $browseTypeList[0], $moduleIDList[2])) && p('title') && e('0'); // 查询多分支产品 没有分支 查看全部 模块2053的全部bug的标题拼接
+r($bug->getBugsTest($productIDList[2], $branchList[0], $browseTypeList[0], $moduleIDList[0])) && p('title') && e('0'); // 查询不存在的产品的全部bug的标题拼接
+
+system("./ztest init");
diff --git a/test/model/execution/addProjectMembers.php b/test/model/execution/addprojectmembers.php
similarity index 80%
rename from test/model/execution/addProjectMembers.php
rename to test/model/execution/addprojectmembers.php
index b003ab4286..a78359df0f 100755
--- a/test/model/execution/addProjectMembers.php
+++ b/test/model/execution/addprojectmembers.php
@@ -10,12 +10,12 @@ title=测试executionModel->addProjectMembersTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷项目根据执行添加团队信息 >> po82,研发
+瀑布项目根据执行添加团队信息 >> test22,测试
+看板项目根据执行添加团队信息 >> test52,测试
+敏捷项目根据执行添加团队信息统计 >> 2
+瀑布项目根据执行添加团队信息统计 >> 1
+看板项目根据执行添加团队信息统计 >> 1
 
 */
 
@@ -30,4 +30,4 @@ r($execution->addProjectMembersTest($projectIDList[2], $executionIDList[2], $cou
 r($execution->addProjectMembersTest($projectIDList[0], $executionIDList[0], $count[1])) && p()                 && e('2');           // 敏捷项目根据执行添加团队信息统计
 r($execution->addProjectMembersTest($projectIDList[1], $executionIDList[1], $count[1])) && p()                 && e('1');           // 瀑布项目根据执行添加团队信息统计
 r($execution->addProjectMembersTest($projectIDList[2], $executionIDList[2], $count[1])) && p()                 && e('1');           // 看板项目根据执行添加团队信息统计
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/batchUpdate.php b/test/model/execution/batchupdate.php
similarity index 100%
rename from test/model/execution/batchUpdate.php
rename to test/model/execution/batchupdate.php
diff --git a/test/model/execution/buildburndata.php b/test/model/execution/buildburndata.php
new file mode 100755
index 0000000000..fcd757c70a
--- /dev/null
+++ b/test/model/execution/buildburndata.php
@@ -0,0 +1,27 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->buildBurnDataTest();
+cid=1
+pid=1
+
+敏捷执行燃尽图数据 >> 7/1
+瀑布执行燃尽图数据 >> [0,0,0,0,0,0,0,0,0,0,0]
+看板执行燃尽图数据 >> [20,18,16,14,12,10,8,6,4,2,0]
+结果统计 >> 3
+
+*/
+
+$executionIDList = array('101', '131', '161');
+$count           = array('0', '1');
+
+$execution = new executionTest();
+r($execution->buildBurnDataTest($executionIDList[0], $count[0])) && p('labels:0') && e('7/1');                           // 敏捷执行燃尽图数据
+r($execution->buildBurnDataTest($executionIDList[1], $count[0])) && p('burnLine') && e('[0,0,0,0,0,0,0,0,0,0,0]');       // 瀑布执行燃尽图数据
+r($execution->buildBurnDataTest($executionIDList[2], $count[0])) && p('baseLine') && e('[20,18,16,14,12,10,8,6,4,2,0]'); // 看板执行燃尽图数据
+r($execution->buildBurnDataTest($executionIDList[0], $count[1])) && p()           && e('3');                             // 结果统计
\ No newline at end of file
diff --git a/test/model/execution/changeProject.php b/test/model/execution/changeproject.php
similarity index 100%
rename from test/model/execution/changeProject.php
rename to test/model/execution/changeproject.php
diff --git a/test/model/execution/computeBurn.php b/test/model/execution/computeburn.php
similarity index 63%
rename from test/model/execution/computeBurn.php
rename to test/model/execution/computeburn.php
index 0c4708c18c..cf5ffb99f1 100755
--- a/test/model/execution/computeBurn.php
+++ b/test/model/execution/computeburn.php
@@ -10,12 +10,8 @@ title=测试executionModel->computeBurnTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+正常初始化 >> project600
+初始化后数据统计 >> 516
 
 */
 
@@ -23,4 +19,4 @@ $count = array('0','1');
 
 $execution = new executionTest();
 r($execution->computeBurnTest($count[0])) && p('700:executionName') && e('project600'); // 正常初始化
-r($execution->computeBurnTest($count[1])) && p()                    && e('516');        // 初始化后数据统计
+r($execution->computeBurnTest($count[1])) && p()                    && e('516');        // 初始化后数据统计
\ No newline at end of file
diff --git a/test/model/execution/getTree.php.BAK b/test/model/execution/filltasksintree.php.bak
similarity index 96%
rename from test/model/execution/getTree.php.BAK
rename to test/model/execution/filltasksintree.php.bak
index cf8b2018cf..d247c127cc 100755
--- a/test/model/execution/getTree.php.BAK
+++ b/test/model/execution/filltasksintree.php.bak
@@ -17,7 +17,7 @@ pid=1
 
 */
 
-$executionIDList = array('601','146', '617', '121');
+$executionIDList = array('101','131', '161');
 $count         = array('0','1');
 
 $execution = new executionTest();
diff --git a/test/model/execution/fixFirst.php b/test/model/execution/fixfirst.php
similarity index 79%
rename from test/model/execution/fixFirst.php
rename to test/model/execution/fixfirst.php
index a05e4fb500..6cdb009d44 100755
--- a/test/model/execution/fixFirst.php
+++ b/test/model/execution/fixfirst.php
@@ -10,12 +10,9 @@ title=测试executionModel->fixFirstTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+不传入withLeft >> 26
+敏捷执行更新首日剩余工时 >> 26
+瀑布执行更新首日剩余工时 >> 17
 
 */
 
@@ -28,4 +25,4 @@ $waterfallEstimate = array('estimate' => '17', 'withLeft' => '1');
 $execution = new executionTest();
 r($execution->fixFirstTest($executionIDList[0], $scrumEstimate))     && p('0:estimate') && e('26'); // 不传入withLeft
 r($execution->fixFirstTest($executionIDList[0], $withLeft))          && p('0:estimate') && e('26'); // 敏捷执行更新首日剩余工时
-r($execution->fixFirstTest($executionIDList[1], $waterfallEstimate)) && p('0:left')     && e('17'); // 瀑布执行更新首日剩余工时
+r($execution->fixFirstTest($executionIDList[1], $waterfallEstimate)) && p('0:left')     && e('17'); // 瀑布执行更新首日剩余工时
\ No newline at end of file
diff --git a/test/model/execution/fixOrder.php b/test/model/execution/fixorder.php
similarity index 59%
rename from test/model/execution/fixOrder.php
rename to test/model/execution/fixorder.php
index 1f9faa817e..96e3c5e422 100755
--- a/test/model/execution/fixOrder.php
+++ b/test/model/execution/fixorder.php
@@ -10,14 +10,9 @@ title=测试executionModel->fixOrderTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+重置order >> 15
 
 */
 
 $execution = new executionTest();
-r($execution->fixOrderTest()) && p('101:order') && e('15');  // 重置order
+r($execution->fixOrderTest()) && p('101:order') && e('15');  // 重置order
\ No newline at end of file
diff --git a/test/model/execution/formattasksfortree.php.bak b/test/model/execution/formattasksfortree.php.bak
new file mode 100755
index 0000000000..d247c127cc
--- /dev/null
+++ b/test/model/execution/formattasksfortree.php.bak
@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->getTreeTest();
+cid=1
+pid=1
+
+敏捷执行关闭 >> status,wait,getTreed
+瀑布执行关闭 >> status,doing,getTreed
+看板执行关闭 >> status,doing,getTreed
+不输入实际完成时间校验 >> 『realEnd』不能为空。
+
+*/
+
+$executionIDList = array('101','131', '161');
+$count         = array('0','1');
+
+$execution = new executionTest();
+var_dump($execution->getTreeTest($executionIDList[0],$count[0]));die;
+r($execution->getTreeTest($executionIDList[0],$count[0])) && p('91')  && e('0,101,102'); // 敏捷项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[1],$count[0])) && p('46')  && e('0,11,12');   // 瀑布项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[2],$count[0])) && p('57')  && e('0,33,34');   // 看板项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[3],$count[0])) && p('21')  && e('0');         // 非分支产品执行查询产品分支
+r($execution->getTreeTest($executionIDList[0],$count[1])) && p()      && e('3');         // 敏捷执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[1],$count[1])) && p()      && e('2');         // 瀑布执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[2],$count[1])) && p()      && e('2');         // 看板执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[3],$count[1])) && p()      && e('2');         // 正常产品分支统计
diff --git a/test/model/execution/getBranchByProduct.php b/test/model/execution/getbranchbyproduct.php
similarity index 100%
rename from test/model/execution/getBranchByProduct.php
rename to test/model/execution/getbranchbyproduct.php
diff --git a/test/model/execution/getBranches.php b/test/model/execution/getbranches.php
similarity index 100%
rename from test/model/execution/getBranches.php
rename to test/model/execution/getbranches.php
diff --git a/test/model/execution/getBurnDataFlot.php b/test/model/execution/getburndataflot.php
similarity index 76%
rename from test/model/execution/getBurnDataFlot.php
rename to test/model/execution/getburndataflot.php
index eb1794d37c..0a6f22deed 100755
--- a/test/model/execution/getBurnDataFlot.php
+++ b/test/model/execution/getburndataflot.php
@@ -10,12 +10,9 @@ title=测试executionModel->getBurnDataFlotTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行查询统计 >> 2
+瀑布执行查询统计 >> 2
+看板执行查询统计 >> 1
 
 */
 
diff --git a/test/model/execution/getByID.php b/test/model/execution/getbyid.php
similarity index 100%
rename from test/model/execution/getByID.php
rename to test/model/execution/getbyid.php
diff --git a/test/model/execution/getByIdList.php b/test/model/execution/getbyidlist.php
similarity index 100%
rename from test/model/execution/getByIdList.php
rename to test/model/execution/getbyidlist.php
diff --git a/test/model/execution/getByProject.php b/test/model/execution/getbyproject.php
similarity index 100%
rename from test/model/execution/getByProject.php
rename to test/model/execution/getbyproject.php
diff --git a/test/model/execution/getCanCopyObjects.php b/test/model/execution/getcancopyobjects.php
similarity index 78%
rename from test/model/execution/getCanCopyObjects.php
rename to test/model/execution/getcancopyobjects.php
index 31dcf6b954..d17e057b09 100755
--- a/test/model/execution/getCanCopyObjects.php
+++ b/test/model/execution/getcancopyobjects.php
@@ -10,12 +10,12 @@ title=测试executionModel->getCanCopyObjectsTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷项目数据查询 >> 迭代1
+瀑布项目数据查询 >> 阶段35
+看板项目数据查询 >> 看板61
+敏捷项目数据统计 >> 8
+瀑布项目数据统计 >> 9
+看板项目数据统计 >> 7
 
 */
 
@@ -28,4 +28,4 @@ r($execution->getCanCopyObjectsTest($projectIDList[1], $count[0])) && p('135') &
 r($execution->getCanCopyObjectsTest($projectIDList[2], $count[0])) && p('161') && e('看板61'); // 看板项目数据查询
 r($execution->getCanCopyObjectsTest($projectIDList[0], $count[1])) && p()      && e('8');      // 敏捷项目数据统计
 r($execution->getCanCopyObjectsTest($projectIDList[1], $count[1])) && p()      && e('9');      // 瀑布项目数据统计
-r($execution->getCanCopyObjectsTest($projectIDList[2], $count[1])) && p()      && e('7');      // 看板项目数据统计
+r($execution->getCanCopyObjectsTest($projectIDList[2], $count[1])) && p()      && e('7');      // 看板项目数据统计
\ No newline at end of file
diff --git a/test/model/execution/getChildExecutions.php b/test/model/execution/getchildexecutions.php
similarity index 100%
rename from test/model/execution/getChildExecutions.php
rename to test/model/execution/getchildexecutions.php
diff --git a/test/model/execution/getDateList.php b/test/model/execution/getdatelist.php
similarity index 83%
rename from test/model/execution/getDateList.php
rename to test/model/execution/getdatelist.php
index e688970eb3..0411041308 100755
--- a/test/model/execution/getDateList.php
+++ b/test/model/execution/getdatelist.php
@@ -10,12 +10,11 @@ title=测试executionModel->getDateListTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+去除工作日日期列表 >> 01/03/2022
+去除工作日日期列表统计 >> 5
+未去除工作日日期列表 >> 01/01/2022
+未去除工作日日期列表统计 >> 7
+日期输入错误查询 >> 无数据
 
 */
 
@@ -29,4 +28,4 @@ r($execution->getDateListTest($start[0], $end[0], $type[0] ,$count[0])) && p('0:
 r($execution->getDateListTest($start[0], $end[0], $type[0] ,$count[1])) && p()      && e('5');          // 去除工作日日期列表统计
 r($execution->getDateListTest($start[0], $end[0], $type[1] ,$count[0])) && p('0:0') && e('01/01/2022'); // 未去除工作日日期列表
 r($execution->getDateListTest($start[0], $end[0], $type[1] ,$count[1])) && p()      && e('7');          // 未去除工作日日期列表统计
-r($execution->getDateListTest($start[1], $end[0], $type[1] ,$count[0])) && p()      && e('无数据');     // 日期输入错误查询
+r($execution->getDateListTest($start[1], $end[0], $type[1] ,$count[0])) && p()      && e('无数据');     // 日期输入错误查询
\ No newline at end of file
diff --git a/test/model/execution/getDefaultManagers.php b/test/model/execution/getdefaultmanagers.php
similarity index 100%
rename from test/model/execution/getDefaultManagers.php
rename to test/model/execution/getdefaultmanagers.php
diff --git a/test/model/execution/getIdList.php b/test/model/execution/getidlist.php
similarity index 100%
rename from test/model/execution/getIdList.php
rename to test/model/execution/getidlist.php
diff --git a/test/model/execution/getInvolvedExecutionList.php b/test/model/execution/getinvolvedexecutionlist.php
similarity index 100%
rename from test/model/execution/getInvolvedExecutionList.php
rename to test/model/execution/getinvolvedexecutionlist.php
diff --git a/test/model/execution/getKanbanColorList.php b/test/model/execution/getkanbancolorlist.php
similarity index 64%
rename from test/model/execution/getKanbanColorList.php
rename to test/model/execution/getkanbancolorlist.php
index 77762eb997..e6b3017e6f 100755
--- a/test/model/execution/getKanbanColorList.php
+++ b/test/model/execution/getkanbancolorlist.php
@@ -10,12 +10,8 @@ title=测试executionModel->getKanbanColorListTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+看板状态颜色查询 >> #7EC5FF
+看板状态颜色数量统计 >> 6
 
 */
 
@@ -23,4 +19,4 @@ $count = array('0', '1');
 
 $execution = new executionTest();
 r($execution->getKanbanColorListTest($count[0])) && p('wait') && e('#7EC5FF'); // 看板状态颜色查询
-r($execution->getKanbanColorListTest($count[1])) && p()       && e('6');       // 看板状态颜色数量统计
+r($execution->getKanbanColorListTest($count[1])) && p()       && e('6');       // 看板状态颜色数量统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanColumns.php b/test/model/execution/getkanbancolumns.php
similarity index 64%
rename from test/model/execution/getKanbanColumns.php
rename to test/model/execution/getkanbancolumns.php
index 1867f63bf1..05e4266147 100755
--- a/test/model/execution/getKanbanColumns.php
+++ b/test/model/execution/getkanbancolumns.php
@@ -10,12 +10,8 @@ title=测试executionModel->getKanbanColumnsTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+看板列查询 >> wait
+看板列查询统计 >> 6
 
 */
 
@@ -23,4 +19,4 @@ $count = array('0', '1');
 
 $execution = new executionTest();
 r($execution->getKanbanColumnsTest($count[0])[0]) && p() && e('wait'); // 看板列查询
-r($execution->getKanbanColumnsTest($count[1]))    && p() && e('6');    // 看板列查询统计
+r($execution->getKanbanColumnsTest($count[1]))    && p() && e('6');    // 看板列查询统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanGroupData.php b/test/model/execution/getkanbangroupdata.php
similarity index 84%
rename from test/model/execution/getKanbanGroupData.php
rename to test/model/execution/getkanbangroupdata.php
index be6944fd1f..4d4a731e06 100755
--- a/test/model/execution/getKanbanGroupData.php
+++ b/test/model/execution/getkanbangroupdata.php
@@ -10,12 +10,12 @@ title=测试executionModel->getKanbanGroupDataTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行查询 >> 子任务6,101
+瀑布执行查询 >> 更多任务93,131
+看板执行查询 >> 开发任务71,161
+敏捷执行查询统计 >> 11
+瀑布执行查询统计 >> 4
+看板执行查询统计 >> 4
 
 */
 
@@ -29,4 +29,4 @@ r($execution->getKanbanGroupDataTest($executionIDList[1], $count[0])) && p('693:
 r($execution->getKanbanGroupDataTest($executionIDList[2], $count[0])) && p('61:name,execution')  && e('开发任务71,161'); // 看板执行查询
 r($execution->getKanbanGroupDataTest($executionIDList[0], $count[1])) && p()                     && e('11');             // 敏捷执行查询统计
 r($execution->getKanbanGroupDataTest($executionIDList[1], $count[1])) && p()                     && e('4');              // 瀑布执行查询统计
-r($execution->getKanbanGroupDataTest($executionIDList[2], $count[1])) && p()                     && e('4');              // 看板执行查询统计
+r($execution->getKanbanGroupDataTest($executionIDList[2], $count[1])) && p()                     && e('4');              // 看板执行查询统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanSetting.php b/test/model/execution/getkanbansetting.php
similarity index 64%
rename from test/model/execution/getKanbanSetting.php
rename to test/model/execution/getkanbansetting.php
index 39b11ee23a..74de86d10a 100755
--- a/test/model/execution/getKanbanSetting.php
+++ b/test/model/execution/getkanbansetting.php
@@ -10,12 +10,8 @@ title=测试executionModel->getKanbanSettingTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+看板设置查询 >> #7EC5FF
+看板设置查询统计 >> 6
 
 */
 
@@ -23,4 +19,4 @@ $count = array('0', '1');
 
 $execution = new executionTest();
 r($execution->getKanbanSettingTest($count[0])) && p('colorList:wait') && e('#7EC5FF'); // 看板设置查询
-r($execution->getKanbanSettingTest($count[1])) && p()                 && e('6');       // 看板设置查询统计
+r($execution->getKanbanSettingTest($count[1])) && p()                 && e('6');       // 看板设置查询统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanStatusList.php b/test/model/execution/getkanbanstatuslist.php
similarity index 64%
rename from test/model/execution/getKanbanStatusList.php
rename to test/model/execution/getkanbanstatuslist.php
index 228ac14a0a..3c954e7a5e 100755
--- a/test/model/execution/getKanbanStatusList.php
+++ b/test/model/execution/getkanbanstatuslist.php
@@ -10,12 +10,8 @@ title=测试executionModel->getKanbanStatusListTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+看板状态列表查询 >> 未开始
+看板状态列表数量统计 >> 7
 
 */
 
@@ -23,4 +19,4 @@ $count = array('0', '1');
 
 $execution = new executionTest();
 r($execution->getKanbanStatusListTest($count[0])) && p('wait') && e('未开始');// 看板状态列表查询
-r($execution->getKanbanStatusListTest($count[1])) && p()       && e('7');     // 看板状态列表数量统计
+r($execution->getKanbanStatusListTest($count[1])) && p()       && e('7');     // 看板状态列表数量统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanStatusMap.php b/test/model/execution/getkanbanstatusmap.php
similarity index 69%
rename from test/model/execution/getKanbanStatusMap.php
rename to test/model/execution/getkanbanstatusmap.php
index 25758d862e..dc5905e84d 100755
--- a/test/model/execution/getKanbanStatusMap.php
+++ b/test/model/execution/getkanbanstatusmap.php
@@ -10,12 +10,9 @@ title=测试executionModel->getKanbanStatusMapTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+看板tesk查询 >> start
+看板bug查询 >> resolve
+看板统计 >> 2
 
 */
 
@@ -24,4 +21,4 @@ $count = array('0', '1');
 $execution = new executionTest();
 r($execution->getKanbanStatusMapTest($count[0])["task"]) && p('wait:doing') && e('start');   // 看板tesk查询
 r($execution->getKanbanStatusMapTest($count[0])["bug"])  && p('wait:done')  && e('resolve'); // 看板bug查询
-r($execution->getKanbanStatusMapTest($count[1]))         && p()             && e('2');       // 看板统计
+r($execution->getKanbanStatusMapTest($count[1]))         && p()             && e('2');       // 看板统计
\ No newline at end of file
diff --git a/test/model/execution/getKanbanTasks.php b/test/model/execution/getkanbantasks.php
similarity index 83%
rename from test/model/execution/getKanbanTasks.php
rename to test/model/execution/getkanbantasks.php
index 6708a867c6..ab952d6ee5 100755
--- a/test/model/execution/getKanbanTasks.php
+++ b/test/model/execution/getkanbantasks.php
@@ -10,12 +10,12 @@ title=测试executionModel->getKanbanTasksTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行查询 >> 子任务6,101
+瀑布执行查询 >> 更多任务93,131
+看板执行查询 >> 开发任务71,161
+敏捷执行查询统计 >> 11
+瀑布执行查询统计 >> 4
+看板执行查询统计 >> 4
 
 */
 
@@ -28,4 +28,4 @@ r($execution->getKanbanTasksTest($executionIDList[1], $count[0])) && p('693:name
 r($execution->getKanbanTasksTest($executionIDList[2], $count[0])) && p('61:name,execution')  && e('开发任务71,161'); // 看板执行查询
 r($execution->getKanbanTasksTest($executionIDList[0], $count[1])) && p()                     && e('11');             // 敏捷执行查询统计
 r($execution->getKanbanTasksTest($executionIDList[1], $count[1])) && p()                     && e('4');              // 瀑布执行查询统计
-r($execution->getKanbanTasksTest($executionIDList[2], $count[1])) && p()                     && e('4');              // 看板执行查询统计
+r($execution->getKanbanTasksTest($executionIDList[2], $count[1])) && p()                     && e('4');              // 看板执行查询统计
\ No newline at end of file
diff --git a/test/model/execution/getList.php b/test/model/execution/getlist.php
similarity index 100%
rename from test/model/execution/getList.php
rename to test/model/execution/getlist.php
diff --git a/test/model/execution/getMembers2Import.php b/test/model/execution/getmembers2import.php
similarity index 77%
rename from test/model/execution/getMembers2Import.php
rename to test/model/execution/getmembers2import.php
index 004296bb7c..96453c058d 100755
--- a/test/model/execution/getMembers2Import.php
+++ b/test/model/execution/getmembers2import.php
@@ -10,12 +10,9 @@ title=测试executionModel->getMembers2ImportTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+正常数据查询 >> po82,研发
+无效数据查询 >> 无数据
+正常数据查询统计 >> 2
 
 */
 
@@ -27,4 +24,4 @@ $count          = array('0','1');
 $execution = new executionTest();
 r($execution->getMembers2ImportTest($executionID, $accountList, $count[0]))    && p('po82:account,role') && e('po82,研发'); // 正常数据查询
 r($execution->getMembers2ImportTest($executionID, $allAccountList, $count[0])) && p()                    && e('无数据');    // 无效数据查询
-r($execution->getMembers2ImportTest($executionID, $accountList, $count[1]))    && p()                    && e('2');         // 正常数据查询统计
+r($execution->getMembers2ImportTest($executionID, $accountList, $count[1]))    && p()                    && e('2');         // 正常数据查询统计
\ No newline at end of file
diff --git a/test/model/execution/getMembersByIdList.php b/test/model/execution/getmembersbyidlist.php
similarity index 79%
rename from test/model/execution/getMembersByIdList.php
rename to test/model/execution/getmembersbyidlist.php
index 3498a00cb4..12dd2fd30e 100755
--- a/test/model/execution/getMembersByIdList.php
+++ b/test/model/execution/getmembersbyidlist.php
@@ -10,12 +10,10 @@ title=测试executionModel->getMembersByIdListTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+批量查询敏捷执行team >> 101,po82,研发主管82
+批量查询瀑布执行team >> 131,test22,开发22
+批量查询看板执行team >> 161,test52,开发52
+批量查询执行team统计 >> 3
 
 */
 
@@ -26,4 +24,4 @@ $execution = new executionTest();
 r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[0]]) && p('0:root,account,realname') && e('101,po82,研发主管82');// 批量查询敏捷执行team
 r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[1]]) && p('0:root,account,realname') && e('131,test22,开发22');  // 批量查询瀑布执行team
 r($execution->getMembersByIdListTest($executionIDList, $count[0])[$executionIDList[2]]) && p('0:root,account,realname') && e('161,test52,开发52');  // 批量查询看板执行team
-r($execution->getMembersByIdListTest($executionIDList, $count[1]))                      && p()                          && e('3');                  // 批量查询执行team统计
+r($execution->getMembersByIdListTest($executionIDList, $count[1]))                      && p()                          && e('3');                  // 批量查询执行team统计
\ No newline at end of file
diff --git a/test/model/execution/getOrderedExecutions.php b/test/model/execution/getorderedexecutions.php
similarity index 100%
rename from test/model/execution/getOrderedExecutions.php
rename to test/model/execution/getorderedexecutions.php
diff --git a/test/model/execution/getPairs.php b/test/model/execution/getpairs.php
similarity index 100%
rename from test/model/execution/getPairs.php
rename to test/model/execution/getpairs.php
diff --git a/test/model/execution/getplans.php b/test/model/execution/getplans.php
new file mode 100755
index 0000000000..342f09fb40
--- /dev/null
+++ b/test/model/execution/getplans.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->getPlansTest();
+cid=1
+pid=1
+
+全部执行计划查询 >> 长名称
+执行计划查询 >> 1.1 [2021-05-23 ~ 2021-09-23]
+全部执行计划查询 >> 2
+
+*/
+
+$productIDList   = array('1', '21', '41');
+$executionIDList = array('0','101');
+$count           = array('0','1');
+
+$execution = new executionTest();
+r($execution->getPlansTest($productIDList, $executionIDList[0], $count[0])) && p('1:3')  && e('长名称');                        // 全部执行计划查询
+r($execution->getPlansTest($productIDList, $executionIDList[1], $count[0])) && p('1:2')  && e('1.1 [2021-05-23 ~ 2021-09-23]'); // 执行计划查询
+r($execution->getPlansTest($productIDList, $executionIDList[0], $count[1])) && p()       && e('2');                             // 全部执行计划查询
\ No newline at end of file
diff --git a/test/model/execution/getProductGroupListTest.php b/test/model/execution/getproductgrouplisttest.php
similarity index 100%
rename from test/model/execution/getProductGroupListTest.php
rename to test/model/execution/getproductgrouplisttest.php
diff --git a/test/model/execution/getRelatedExecutions.php b/test/model/execution/getrelatedexecutions.php
similarity index 100%
rename from test/model/execution/getRelatedExecutions.php
rename to test/model/execution/getrelatedexecutions.php
diff --git a/test/model/execution/getstagelinkproductpairs.php b/test/model/execution/getstagelinkproductpairs.php
new file mode 100755
index 0000000000..2e04fbe066
--- /dev/null
+++ b/test/model/execution/getstagelinkproductpairs.php
@@ -0,0 +1,33 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->getStageLinkProductPairsTest();
+cid=1
+pid=1
+
+敏捷执行产品查询 >> 多平台产品91
+瀑布执行产品查询 >> 已关闭的正常产品31
+看板执行产品查询 >> 已关闭的多分支产品61
+敏捷执行产品统计 >> 3
+瀑布执行产品统计 >> 3
+看板执行产品统计 >> 3
+
+*/
+
+$sprintIDList = array('101', '102', '103');
+$stageIDList  = array('131', '132', '133');
+$kanbanIDList = array('161', '162', '163');
+$count        = array('0','1');
+
+$execution = new executionTest();
+r($execution->getStageLinkProductPairsTest($sprintIDList, $count[0])) && p('101')  && e('多平台产品91');         // 敏捷执行产品查询
+r($execution->getStageLinkProductPairsTest($stageIDList, $count[0]))  && p('131')  && e('已关闭的正常产品31');   // 瀑布执行产品查询
+r($execution->getStageLinkProductPairsTest($kanbanIDList, $count[0])) && p('161')  && e('已关闭的多分支产品61'); // 看板执行产品查询
+r($execution->getStageLinkProductPairsTest($sprintIDList, $count[1])) && p()       && e('3');                    // 敏捷执行产品统计
+r($execution->getStageLinkProductPairsTest($stageIDList, $count[1]))  && p()       && e('3');                    // 瀑布执行产品统计
+r($execution->getStageLinkProductPairsTest($kanbanIDList, $count[1])) && p()       && e('3');                    // 看板执行产品统计
\ No newline at end of file
diff --git a/test/model/execution/getTasks.php b/test/model/execution/gettasks.php
similarity index 100%
rename from test/model/execution/getTasks.php
rename to test/model/execution/gettasks.php
diff --git a/test/model/execution/getTasks2Imported.php b/test/model/execution/gettasks2imported.php
similarity index 100%
rename from test/model/execution/getTasks2Imported.php
rename to test/model/execution/gettasks2imported.php
diff --git a/test/model/execution/getTeamMembers.php b/test/model/execution/getteammembers.php
similarity index 83%
rename from test/model/execution/getTeamMembers.php
rename to test/model/execution/getteammembers.php
index e5ccdb78f5..9655b0882d 100755
--- a/test/model/execution/getTeamMembers.php
+++ b/test/model/execution/getteammembers.php
@@ -10,12 +10,12 @@ title=测试executionModel->getTeamMembersTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行查看team >> 101,execution,482
+瀑布执行查看team >> 131,execution,开发22
+看板执行查看team >> 161,execution,开发52
+敏捷执行team统计 >> 2
+瀑布执行team统计 >> 1
+看板执行team统计 >> 1
 
 */
 
@@ -28,4 +28,4 @@ r($execution->getTeamMembersTest($executionIDList[1], $count[0])) && p('test22:r
 r($execution->getTeamMembersTest($executionIDList[2], $count[0])) && p('test52:root,type,realname') && e('161,execution,开发52'); // 看板执行查看team
 r($execution->getTeamMembersTest($executionIDList[0], $count[1])) && p()                            && e('2');                    // 敏捷执行team统计
 r($execution->getTeamMembersTest($executionIDList[1], $count[1])) && p()                            && e('1');                    // 瀑布执行team统计
-r($execution->getTeamMembersTest($executionIDList[2], $count[1])) && p()                            && e('1');                    // 看板执行team统计
+r($execution->getTeamMembersTest($executionIDList[2], $count[1])) && p()                            && e('1');                    // 看板执行team统计
\ No newline at end of file
diff --git a/test/model/execution/getTeams2Import.php b/test/model/execution/getteams2import.php
similarity index 77%
rename from test/model/execution/getTeams2Import.php
rename to test/model/execution/getteams2import.php
index f5c43c61ab..c96e42aa91 100755
--- a/test/model/execution/getTeams2Import.php
+++ b/test/model/execution/getteams2import.php
@@ -10,12 +10,9 @@ title=测试executionModel->getTeams2ImportTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+无效数据查询 >> 无数据
+正常数据查询 >> 迭代91
+正常数据查询统计 >> 1
 
 */
 
@@ -26,4 +23,4 @@ $count       = array('0','1');
 $execution = new executionTest();
 r($execution->getTeams2ImportTest($accountList[0], $executionID, $count[0])) && p()      && e('无数据'); // 无效数据查询
 r($execution->getTeams2ImportTest($accountList[1], $executionID, $count[0])) && p('191') && e('迭代91'); // 正常数据查询
-r($execution->getTeams2ImportTest($accountList[1], $executionID, $count[1])) && p()      && e('1');      // 正常数据查询统计
+r($execution->getTeams2ImportTest($accountList[1], $executionID, $count[1])) && p()      && e('1');      // 正常数据查询统计
\ No newline at end of file
diff --git a/test/model/execution/getTeamSkip.php b/test/model/execution/getteamskip.php
similarity index 76%
rename from test/model/execution/getTeamSkip.php
rename to test/model/execution/getteamskip.php
index 1dab128545..94ffb3ce8e 100755
--- a/test/model/execution/getTeamSkip.php
+++ b/test/model/execution/getteamskip.php
@@ -10,12 +10,9 @@ title=测试executionModel->getTeamSkipTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+正常跳过 >> 901,admin,研发
+begin与end一致 >> 无跳转数据
+end与begin一致 >> 无跳转数据
 
 */
 
@@ -26,4 +23,4 @@ $end    = 'user92';
 $execution = new executionTest();
 r($execution->getTeamSkipTest($taskID, $begin, $end))   && p('admin:root,account,role') && e('901,admin,研发'); // 正常跳过
 r($execution->getTeamSkipTest($taskID, $begin, $begin)) && p()                        && e('无跳转数据');     // begin与end一致
-r($execution->getTeamSkipTest($taskID, $end, $end))     && p()                        && e('无跳转数据');     // end与begin一致
+r($execution->getTeamSkipTest($taskID, $end, $end))     && p()                        && e('无跳转数据');     // end与begin一致
\ No newline at end of file
diff --git a/test/model/execution/getToImport.php b/test/model/execution/gettoimport.php
similarity index 100%
rename from test/model/execution/getToImport.php
rename to test/model/execution/gettoimport.php
diff --git a/test/model/execution/getTotalEstimate.php b/test/model/execution/gettotalestimate.php
similarity index 73%
rename from test/model/execution/getTotalEstimate.php
rename to test/model/execution/gettotalestimate.php
index c2c239188b..cf2204d8ba 100755
--- a/test/model/execution/getTotalEstimate.php
+++ b/test/model/execution/gettotalestimate.php
@@ -10,12 +10,10 @@ title=测试executionModel->getTotalEstimateTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行预计工时统计 >> 48
+瀑布执行预计工时统计 >> 17
+看板执行预计工时统计 >> 20
+无执行预计工时统计 >> 0
 
 */
 
@@ -25,4 +23,4 @@ $execution = new executionTest();
 r($execution->getTotalEstimateTest($executionIDList[0])) && p() && e('48'); // 敏捷执行预计工时统计
 r($execution->getTotalEstimateTest($executionIDList[1])) && p() && e('17'); // 瀑布执行预计工时统计
 r($execution->getTotalEstimateTest($executionIDList[2])) && p() && e('20'); // 看板执行预计工时统计
-r($execution->getTotalEstimateTest(''))                  && p() && e('0');  // 无执行预计工时统计
+r($execution->getTotalEstimateTest(''))                  && p() && e('0');  // 无执行预计工时统计
\ No newline at end of file
diff --git a/test/model/execution/gettree.php.bak b/test/model/execution/gettree.php.bak
new file mode 100755
index 0000000000..d247c127cc
--- /dev/null
+++ b/test/model/execution/gettree.php.bak
@@ -0,0 +1,32 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->getTreeTest();
+cid=1
+pid=1
+
+敏捷执行关闭 >> status,wait,getTreed
+瀑布执行关闭 >> status,doing,getTreed
+看板执行关闭 >> status,doing,getTreed
+不输入实际完成时间校验 >> 『realEnd』不能为空。
+
+*/
+
+$executionIDList = array('101','131', '161');
+$count         = array('0','1');
+
+$execution = new executionTest();
+var_dump($execution->getTreeTest($executionIDList[0],$count[0]));die;
+r($execution->getTreeTest($executionIDList[0],$count[0])) && p('91')  && e('0,101,102'); // 敏捷项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[1],$count[0])) && p('46')  && e('0,11,12');   // 瀑布项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[2],$count[0])) && p('57')  && e('0,33,34');   // 看板项目下根据执行查询产品分支
+r($execution->getTreeTest($executionIDList[3],$count[0])) && p('21')  && e('0');         // 非分支产品执行查询产品分支
+r($execution->getTreeTest($executionIDList[0],$count[1])) && p()      && e('3');         // 敏捷执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[1],$count[1])) && p()      && e('2');         // 瀑布执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[2],$count[1])) && p()      && e('2');         // 看板执行关联产品分支统计
+r($execution->getTreeTest($executionIDList[3],$count[1])) && p()      && e('2');         // 正常产品分支统计
diff --git a/test/model/execution/importBug.php b/test/model/execution/importbug.php
similarity index 100%
rename from test/model/execution/importBug.php
rename to test/model/execution/importbug.php
diff --git a/test/model/execution/importTask.php b/test/model/execution/importtask.php
similarity index 100%
rename from test/model/execution/importTask.php
rename to test/model/execution/importtask.php
diff --git a/test/model/execution/isClickable.php b/test/model/execution/isclickable.php
similarity index 75%
rename from test/model/execution/isClickable.php
rename to test/model/execution/isclickable.php
index 769246fd7b..e5362c804d 100755
--- a/test/model/execution/isClickable.php
+++ b/test/model/execution/isclickable.php
@@ -10,12 +10,30 @@ title=测试executionModel->isClickableTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+wait状态执行start按钮检查 >> 检查通过
+wait状态执行close按钮检查 >> 检查通过
+wait状态执行suspend按钮检查 >> 检查通过
+wait状态执行putoff按钮检查 >> 检查通过
+wait状态执行activate按钮检查 >> 检查不通过
+wait状态执行delete按钮检查 >> 检查通过
+doing状态执行start按钮检查 >> 检查不通过
+doing状态执行close按钮检查 >> 检查通过
+doing状态执行suspend按钮检查 >> 检查通过
+doing状态执行putoff按钮检查 >> 检查通过
+doing状态执行activate按钮检查 >> 检查不通过
+doing状态执行delete按钮检查 >> 检查通过
+suspended状态执行start按钮检查 >> 检查不通过
+suspended状态执行close按钮检查 >> 检查通过
+suspended状态执行suspend按钮检查 >> 检查不通过
+suspended状态执行putoff按钮检查 >> 检查不通过
+suspended状态执行activate按钮检查 >> 检查通过
+suspended状态执行delete按钮检查 >> 检查不通过
+closed状态执行start按钮检查 >> 检查不通过
+closed状态执行close按钮检查 >> 检查不通过
+closed状态执行suspend按钮检查 >> 检查不通过
+closed状态执行putoff按钮检查 >> 检查不通过
+closed状态执行activate按钮检查 >> 检查通过
+closed状态执行delete按钮检查 >> 检查不通过
 
 */
 
@@ -55,4 +73,4 @@ r($execution->isClickableTest($closedExecution, $actionList[1]))    && p() && e(
 r($execution->isClickableTest($closedExecution, $actionList[2]))    && p() && e('检查不通过'); // closed状态执行suspend按钮检查
 r($execution->isClickableTest($closedExecution, $actionList[3]))    && p() && e('检查不通过'); // closed状态执行putoff按钮检查
 r($execution->isClickableTest($closedExecution, $actionList[4]))    && p() && e('检查通过');   // closed状态执行activate按钮检查
-r($execution->isClickableTest($closedExecution, $actionList[5]))    && p() && e('检查不通过'); // closed状态执行delete按钮检查
+r($execution->isClickableTest($closedExecution, $actionList[5]))    && p() && e('检查不通过'); // closed状态执行delete按钮检查
\ No newline at end of file
diff --git a/test/model/execution/linkCases.php b/test/model/execution/linkcases.php
similarity index 100%
rename from test/model/execution/linkCases.php
rename to test/model/execution/linkcases.php
diff --git a/test/model/execution/linkStory.php b/test/model/execution/linkstory.php
similarity index 98%
rename from test/model/execution/linkStory.php
rename to test/model/execution/linkstory.php
index e20e6d2b2b..23d4f5f5ca 100755
--- a/test/model/execution/linkStory.php
+++ b/test/model/execution/linkstory.php
@@ -34,4 +34,4 @@ r($execution->linkStoryTest($executionIDList[0], $count[1], $story)) && p()
 r($execution->linkStoryTest($executionIDList[1], $count[1], $story)) && p()                          && e('3');       // 瀑布执行关联需求统计
 r($execution->linkStoryTest($executionIDList[2], $count[1], $story)) && p()                          && e('3');       // 看板执行关联需求统计
 
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/manageMembers.php b/test/model/execution/managemembers.php
similarity index 81%
rename from test/model/execution/manageMembers.php
rename to test/model/execution/managemembers.php
index 397c327fba..d9abc6315e 100755
--- a/test/model/execution/manageMembers.php
+++ b/test/model/execution/managemembers.php
@@ -10,12 +10,8 @@ title=测试executionModel->manageMembersTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+团队管理 >> 101,execution,dev10
+团队人员管理统计 >> 3
 
 */
 
@@ -32,4 +28,4 @@ $count         = array('0','1');
 
 $execution = new executionTest();
 r($execution->manageMembersTest($executionID, $count[0], $manageMembers)) && p('0:root,type,account') && e('101,execution,dev10'); // 团队管理
-r($execution->manageMembersTest($executionID, $count[1], $manageMembers)) && p()                      && e('3'); // 团队人员管理统计
+r($execution->manageMembersTest($executionID, $count[1], $manageMembers)) && p()                      && e('3'); // 团队人员管理统计
\ No newline at end of file
diff --git a/test/model/execution/processBurnData.php b/test/model/execution/processburndata.php
similarity index 81%
rename from test/model/execution/processBurnData.php
rename to test/model/execution/processburndata.php
index ff57e7f538..a19398ef6d 100755
--- a/test/model/execution/processBurnData.php
+++ b/test/model/execution/processburndata.php
@@ -10,12 +10,10 @@ title=测试executionModel->processBurnDataTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行查询统计 >> 29
+瀑布执行查询统计 >> 60
+看板执行查询统计 >> 60
+错误时间查询统计 >> 0
 
 */
 
@@ -29,4 +27,4 @@ $execution = new executionTest();
 r($execution->processBurnDataTest($executionIDList[0], $itemCounts[0], $begin[0], $end[0], $count[1])) && p() && e('29'); // 敏捷执行查询统计
 r($execution->processBurnDataTest($executionIDList[1], $itemCounts[1], $begin[0], $end[0], $count[1])) && p() && e('60'); // 瀑布执行查询统计
 r($execution->processBurnDataTest($executionIDList[2], $itemCounts[2], $begin[0], $end[0], $count[1])) && p() && e('60'); // 看板执行查询统计
-r($execution->processBurnDataTest($executionIDList[2], $itemCounts[2], $begin[1], $end[1], $count[1])) && p() && e('0');  // 错误时间查询统计
+r($execution->processBurnDataTest($executionIDList[2], $itemCounts[2], $begin[1], $end[1], $count[1])) && p() && e('0');  // 错误时间查询统计
\ No newline at end of file
diff --git a/test/model/execution/settreepath.php b/test/model/execution/settreepath.php
new file mode 100755
index 0000000000..a8a66226b4
--- /dev/null
+++ b/test/model/execution/settreepath.php
@@ -0,0 +1,24 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/execution.class.php';
+su('admin');
+
+/**
+
+title=测试executionModel->setTreePathTest();
+cid=1
+pid=1
+
+子阶段设置path >> 41,131,,41,131,701,
+子阶段设置path >> 11,11,,11,101,
+子阶段设置path >> 41,41,,41,131,
+
+*/
+
+$executionIDList  = array('701', '101', '131');
+
+$execution = new executionTest();
+r($execution->setTreePathTest($executionIDList[0])) && p('701:project,parent,path') && e('41,131,,41,131,701,'); // 子阶段设置path
+r($execution->setTreePathTest($executionIDList[1])) && p('101:project,parent,path') && e('11,11,,11,101,'); // 子阶段设置path
+r($execution->setTreePathTest($executionIDList[2])) && p('131:project,parent,path') && e('41,41,,41,131,'); // 子阶段设置path
\ No newline at end of file
diff --git a/test/model/execution/statRelatedData.php b/test/model/execution/statrelateddata.php
similarity index 100%
rename from test/model/execution/statRelatedData.php
rename to test/model/execution/statrelateddata.php
diff --git a/test/model/execution/summary.php b/test/model/execution/summary.php
index d07aa18617..340b5de107 100755
--- a/test/model/execution/summary.php
+++ b/test/model/execution/summary.php
@@ -10,12 +10,9 @@ title=测试executionModel->summaryTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行任务统计 >> 本页共 <strong>14</strong> 个任务，未开始 <strong>4</strong>，进行中 <strong>3</strong>，总预计 <strong>3</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>3</strong> 工时。
+瀑布执行任务统计 >> 本页共 <strong>4</strong> 个任务，未开始 <strong>2</strong>，进行中 <strong>1</strong>，总预计 <strong>17</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>17</strong> 工时。
+看板执行任务统计 >> 本页共 <strong>4</strong> 个任务，未开始 <strong>2</strong>，进行中 <strong>1</strong>，总预计 <strong>20</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>20</strong> 工时。
 
 */
 
@@ -24,4 +21,4 @@ $executionIDList = array('101', '131', '161');
 $execution = new executionTest();
 r($execution->summaryTest($executionIDList[0])) && p() && e('本页共 <strong>14</strong> 个任务，未开始 <strong>4</strong>，进行中 <strong>3</strong>，总预计 <strong>3</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>3</strong> 工时。');  // 敏捷执行任务统计
 r($execution->summaryTest($executionIDList[1])) && p() && e('本页共 <strong>4</strong> 个任务，未开始 <strong>2</strong>，进行中 <strong>1</strong>，总预计 <strong>17</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>17</strong> 工时。'); // 瀑布执行任务统计
-r($execution->summaryTest($executionIDList[2])) && p() && e('本页共 <strong>4</strong> 个任务，未开始 <strong>2</strong>，进行中 <strong>1</strong>，总预计 <strong>20</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>20</strong> 工时。'); // 看板执行任务统计
+r($execution->summaryTest($executionIDList[2])) && p() && e('本页共 <strong>4</strong> 个任务，未开始 <strong>2</strong>，进行中 <strong>1</strong>，总预计 <strong>20</strong> 工时，已消耗 <strong>15</strong> 工时，剩余 <strong>20</strong> 工时。'); // 看板执行任务统计
\ No newline at end of file
diff --git a/test/model/execution/unlinkCases.php b/test/model/execution/unlinkcases.php
similarity index 77%
rename from test/model/execution/unlinkCases.php
rename to test/model/execution/unlinkcases.php
index 2388b35d9a..8d8e31d03e 100755
--- a/test/model/execution/unlinkCases.php
+++ b/test/model/execution/unlinkcases.php
@@ -10,12 +10,9 @@ title=测试executionModel->unlinkCasesTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行解除关联用例 >> 0
+瀑布执行解除关联用例 >> 0
+看板执行解除关联用例 >> 0
 
 */
 
@@ -29,4 +26,4 @@ r($execution->unlinkCasesTest($executionIDList[0], $products[0], $stories[0])) &
 r($execution->unlinkCasesTest($executionIDList[1], $products[1], $stories[1])) && p() && e('0'); // 瀑布执行解除关联用例
 r($execution->unlinkCasesTest($executionIDList[2], $products[2], $stories[2])) && p() && e('0'); // 看板执行解除关联用例
 
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/unlinkMember.php b/test/model/execution/unlinkmember.php
similarity index 83%
rename from test/model/execution/unlinkMember.php
rename to test/model/execution/unlinkmember.php
index 4f3513c639..38e77290ac 100755
--- a/test/model/execution/unlinkMember.php
+++ b/test/model/execution/unlinkmember.php
@@ -10,12 +10,11 @@ title=测试executionModel->unlinkMemberTest();
 cid=1
 pid=1
 
-敏捷执行关联用例 >> 101,1,1
-瀑布执行关联用例 >> 131,43,169
-看板执行关联用例 >> 161,68,269
-敏捷执行关联用例统计 >> 4
-瀑布执行关联用例统计 >> 4
-看板执行关联用例统计 >> 4
+敏捷执行解除团队成员 >> po82,研发
+敏捷执行解除团队成员后统计 >> 1
+瀑布执行解除团队成员 >> 0
+看板执行解除团队成员 >> test52,测试
+看板执行解除团队成员后统计 >> 1
 
 */
 
@@ -29,4 +28,4 @@ r($execution->unlinkMemberTest($executionIDList[0], $accountList[0], $count[1]))
 r($execution->unlinkMemberTest($executionIDList[1], $accountList[1], $count[0])) && p()                 && e('0');           // 瀑布执行解除团队成员
 r($execution->unlinkMemberTest($executionIDList[2], $accountList[2], $count[0])) && p('0:account,role') && e('test52,测试'); // 看板执行解除团队成员
 r($execution->unlinkMemberTest($executionIDList[2], $accountList[2], $count[1])) && p()                 && e('1');           // 看板执行解除团队成员后统计
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/unlinkStory.php b/test/model/execution/unlinkstory.php
similarity index 85%
rename from test/model/execution/unlinkStory.php
rename to test/model/execution/unlinkstory.php
index 28b27ed2c3..15f69447eb 100755
--- a/test/model/execution/unlinkStory.php
+++ b/test/model/execution/unlinkstory.php
@@ -10,12 +10,12 @@ title=测试executionModel->unlinkStoryTest();
 cid=1
 pid=1
 
-敏捷执行关联需求 >> 101,1,4
-瀑布执行关联需求 >> 131,1,4
-看板执行关联需求 >> 161,1,4
-敏捷执行关联需求统计 >> 3
-瀑布执行关联需求统计 >> 3
-看板执行关联需求统计 >> 3
+敏捷执行解除关联需求 >> 101,81,324
+瀑布执行解除关联需求 >> 131,1,4
+看板执行解除关联需求 >> 161,1,4
+敏捷执行关联需求统计 >> 2
+瀑布执行关联需求统计 >> 2
+看板执行关联需求统计 >> 2
 
 */
 
@@ -34,4 +34,4 @@ r($execution->unlinkStoryTest($executionIDList[0], $count[1], $stories[0], $stor
 r($execution->unlinkStoryTest($executionIDList[1], $count[1], $stories[1], $story)) && p()                          && e('2');          // 瀑布执行关联需求统计
 r($execution->unlinkStoryTest($executionIDList[2], $count[1], $stories[2], $story)) && p()                          && e('2');          // 看板执行关联需求统计
 
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/update.php b/test/model/execution/update.php
index c362d5da82..e37e101a40 100755
--- a/test/model/execution/update.php
+++ b/test/model/execution/update.php
@@ -16,7 +16,7 @@ pid=1
 测试修改迭代项目为看板项目 >> project,41,71
 测试修改迭代code >> code,project31,code修改
 测试修改迭代工作日 >> days,0,5
-测试修改迭代类型 >> Lifetime,,long
+测试修改迭代类型 >> lifetime,,long
 测试修改迭代状态为wait >> status,wait,doing
 测试修改迭代状态为closed >> status,doing,closed
 测试修改名称为空 >> 『阶段名称』不能为空。
@@ -56,4 +56,4 @@ r($execution->updateObject($executionIDList[1], $noName))         && p('name:0')
 r($execution->updateObject($executionIDList[1], $noCode))         && p('code:0')          && e('『迭代代号』不能为空。');     // 测试修改code为空
 r($execution->updateObject($executionIDList[1], $noChange))       && p()                  && e('没有数据更新');               // 测试无修改
 
-system("./ztest init");
+system("./ztest init");
\ No newline at end of file
diff --git a/test/model/execution/updateChilds.php b/test/model/execution/updatechilds.php
similarity index 100%
rename from test/model/execution/updateChilds.php
rename to test/model/execution/updatechilds.php
diff --git a/test/model/execution/updateProducts.php b/test/model/execution/updateproducts.php
similarity index 100%
rename from test/model/execution/updateProducts.php
rename to test/model/execution/updateproducts.php
diff --git a/test/model/user/authorize.php b/test/model/user/authorize.php
new file mode 100644
index 0000000000..943b4f1a56
--- /dev/null
+++ b/test/model/user/authorize.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=userModel->authorizeTest();
+cid=1
+pid=1
+
+*/
+
+$user   = new userTest();
+$rights = $user->authorizeTest('test2');
+
+r($rights['rights'])                 && p('action:comment')    && e('1'); //获取用户的权限，返回权限列表
+r($rights['rights'])                 && p('testtask:activate') && e('1'); //获取用户的权限，返回权限列表
+r($user->authorizeTest('sadf!!@#a')) && p('projects')          && e('');  //获取不存在的用户的权限，返回空
+r($user->authorizeTest(''))          && p('')                  && e('0'); //获取空用户名的权限，返回空
diff --git a/test/model/user/getcontactlistbyid.php b/test/model/user/getcontactlistbyid.php
new file mode 100644
index 0000000000..90e8527170
--- /dev/null
+++ b/test/model/user/getcontactlistbyid.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getContactListByIDTest();
+cid=1
+pid=1
+
+*/
+
+$user = new userTest();
+
+r($user->getContactListByIDTest(1))     && p() && e('0'); //
+r($user->getContactListByIDTest(2))     && p() && e('0'); //
+r($user->getContactListByIDTest(1000))  && p() && e('0'); //
+r($user->getContactListByIDTest(false)) && p() && e('0'); //
+r($user->getContactListByIDTest(null))  && p() && e('0'); //
diff --git a/test/model/user/getcontactlists.php b/test/model/user/getcontactlists.php
new file mode 100644
index 0000000000..cca7a64b5f
--- /dev/null
+++ b/test/model/user/getcontactlists.php
@@ -0,0 +1,20 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getContactListsTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+$adminContactList1 = $user->getContactListsTest('admin', 'withempty|withnote');
+$adminContactList2 = $user->getContactListsTest('admin', '');
+$test2ContactList  = $user->getContactListsTest('test2');
+$emptyContactList  = $user->getContactListsTest('', '');
+
+r($adminContactList) && p() && e('0'); // 获取admin的联系人列表
diff --git a/test/model/user/getcontactuserpairs.php b/test/model/user/getcontactuserpairs.php
new file mode 100644
index 0000000000..eb3db10ad3
--- /dev/null
+++ b/test/model/user/getcontactuserpairs.php
@@ -0,0 +1,17 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=userModel->getContactUserPairsTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+$accountList = array('admin', 'test2');
+
+r($user->getContactUserPairsTest($accountList)) && p('') && e(''); //
diff --git a/test/model/user/getgroups.php b/test/model/user/getgroups.php
new file mode 100644
index 0000000000..e8d8ad402d
--- /dev/null
+++ b/test/model/user/getgroups.php
@@ -0,0 +1,18 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getGroupsTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+
+r($user->getGroupsTest('admin'))        && p() && e('0'); // 获取admin所在的分组,为空
+r(count($user->getGroupsTest('test2'))) && p() && e('1'); // 通过test2所在的分组数量，1个
+r($user->getGroupsTest(''))             && p() && e('0'); // 传空用户名，返回空
diff --git a/test/model/user/getgroupsbyvisions.php b/test/model/user/getgroupsbyvisions.php
new file mode 100644
index 0000000000..c16e6e3d27
--- /dev/null
+++ b/test/model/user/getgroupsbyvisions.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getGroupsByVisionsTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+
+r(count($user->getGroupsByVisionsTest(array('rnd'))))         && p() && e('14'); // 获取系统中所有研发界面分组的数量
+r(count($user->getGroupsByVisionsTest(array('lite'))))        && p() && e('3');  // 获取系统中所有迅捷界面分组的数量
+r($user->getGroupsByVisionsTest(array()))                     && p() && e('0');  // 传空Visions，返回空数组
+r(count($user->getGroupsByVisionsTest(array('rnd','lite'))))  && p() && e('17'); // 获取系统中所有用户分组的数量 
diff --git a/test/model/user/getlistbyaccount.php b/test/model/user/getlistbyaccount.php
new file mode 100644
index 0000000000..df5cec6540
--- /dev/null
+++ b/test/model/user/getlistbyaccount.php
@@ -0,0 +1,21 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getListByAccount();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+$adminContactList = $user->getListByAccountTest('admin');
+$test2ContactList = $user->getListByAccountTest('test2');
+$emptyContactList = $user->getListByAccountTest('');
+
+r($adminContactList) && p() && e('0'); // 获取admin的联系人列表
+r($test2ContactList) && p() && e('0'); // 获取admin的联系人列表
+r($emptyContactList) && p() && e('0'); // 获取admin的联系人列表
diff --git a/test/model/user/getobjects.php b/test/model/user/getobjects.php
new file mode 100644
index 0000000000..d01c0f9344
--- /dev/null
+++ b/test/model/user/getobjects.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getObjectsTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+$adminProjects     = $user->getObjectsTest('admin', 'project',   'all',  'id_desc');
+$adminDoneProjects = $user->getObjectsTest('admin', 'project',   'done', 'id_desc');
+$adminExecutions   = $user->getObjectsTest('admin', 'execution', 'all',  'id_desc');
+$test2Projects     = $user->getObjectsTest('test2', 'project',   'all',  'id_desc');
+$emptyUser         = $user->getObjectsTest('',      'execution', 'all',  'id_desc');
+
+r($adminProjects)     && p('11:name')  && e('项目1');   //获取admin的所属项目列表,取ID为11的项目名字
+r($adminProjects)     && p('11:type')  && e('project'); //获取admin的所属项目列表,取ID为11的项目类型
+r($adminExecutions)   && p('120:name') && e('迭代20');  //获取admin的所属执行列表,取ID为120的项目名字
+r($adminDoneProjects) && p('')         && e('0');       //获取admin的已完成的所属项目列表,返回空
+r($test2Projects)     && p('')         && e('0');       //获取test2用户的所属项目列表，返回空
+r($emptyUser)         && p('')         && e('0');       //传入一个空用户名字段，返回空
diff --git a/test/model/user/getparentstageauthedusers.php b/test/model/user/getparentstageauthedusers.php
new file mode 100644
index 0000000000..8cf13abcc5
--- /dev/null
+++ b/test/model/user/getparentstageauthedusers.php
@@ -0,0 +1,19 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=测试 userModel::getParentStageAuthedUsersTest();
+cid=1
+pid=1
+
+*/
+$user = new userTest();
+
+r($user->getParentStageAuthedUsersTest(0))   && p()         && e('0');      //传入ID为0的情况获取有权限的用户
+r($user->getParentStageAuthedUsersTest(131)) && p('wwccss') && e('wwccss'); //传入一个阶段ID获取有权限的用户
+r($user->getParentStageAuthedUsersTest(1))   && p()         && e('0');      //传入一个项目集ID获取有权限的用户
+r($user->getParentStageAuthedUsersTest(161)) && p('wwccss') && e('wwccss'); //传入一个看板类型的项目ID获取有权限的用户
diff --git a/test/model/user/identify.php b/test/model/user/identify.php
index 22a47519e2..151821e18b 100644
--- a/test/model/user/identify.php
+++ b/test/model/user/identify.php
@@ -13,6 +13,7 @@ pid=1
 */
 
 $user = new userTest();
-$user->identifyTest('admin', '78302615c8b79cac8df6d2607f8a83ee');
 
-system("./ztest init");
+r($user->identifyTest('admin', '78302615c8b79cac8df6d2607f8a83ee'))    && p('realname') && e('admin'); //用户名密码皆正确，返回验证登录的用户
+r($user->identifyTest('asdjaf12', '78302615c8b79cac8df6d2607f8a83ee')) && p()           && e('0');     //验证一个不存在的用户，返回空
+r($user->identifyTest('', ''))                                         && p()           && e('0');     //验证一个不传用户名和密码的用户，返回空
diff --git a/test/model/user/login.php b/test/model/user/login.php
new file mode 100644
index 0000000000..94e54668d0
--- /dev/null
+++ b/test/model/user/login.php
@@ -0,0 +1,29 @@
+#!/usr/bin/env php
+<?php
+include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
+include dirname(dirname(dirname(__FILE__))) . '/class/user.class.php';
+su('admin');
+
+/**
+
+title=userModel->loginTest();
+cid=1
+pid=1
+
+*/
+
+$userClass = new userTest();
+
+$admin = new stdclass();
+$admin->id      = 1;
+$admin->account = 'admin';
+$admin          = $userClass->loginTest($admin);
+
+$emptyAccount = new stdclass();
+$emptyAccount->id      = 0;
+$emptyAccount->account = '';
+$emptyAccount          = $userClass->loginTest($emptyAccount);
+
+r($admin)                       && p('admin') && e('1'); //使用admin登录，返回此用户为超级管理员
+r(count($admin->rights))        && p()        && e('3'); //使用Admin登录，返回权限列表的数量
+r(count($emptyAccount->group))  && p()        && e('0'); //使用空账号登录，返回权限列表数量为0
diff --git a/test/ztest b/test/ztest
index e3474d2821..17d1fc3c57 100755
--- a/test/ztest
+++ b/test/ztest
@@ -37,6 +37,9 @@ switch($argv[1])
     case 'user':
         ztfRun('model/user');
         break;
+    case 'bug':
+        ztfRun('model/bug');
+        break;
     case 'model':
         ztfRun('model');
         break;