Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into zentaopms_289

test/class/programplan.class.php

@@ -336,4 +336,53 @@ class programplanTest
 
         return implode(',', $objects);
     }
+
+    /**
+     * Test get parent stage's children types.
+     *
+     * @param  int    $parentID
+     * @access public
+     * @return string
+     */
+    public function getParentChildrenTypesTest($parentID)
+    {
+        $objects = $this->objectModel->getParentChildrenTypes($parentID);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    /**
+     * Test check code unique.
+     *
+     * @param array $codes
+     * @param array $planIDList
+     * @access public
+     * @return string
+     */
+    public function checkCodeUniqueTest($codes, $planIDList = array())
+    {
+        $objects = $this->objectModel->checkCodeUnique($codes, $planIDList);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
+
+    /**
+     * Test check name unique.
+     *
+     * @param array $names
+     * @access public
+     * @return string
+     */
+    public function checkNameUniqueTest($names)
+    {
+        $objects = $this->objectModel->checkNameUnique($names);
+
+        if(dao::isError()) return dao::getError();
+
+        return $objects;
+    }
 }

test/class/stage.class.php

@@ -11,20 +11,21 @@ class stageTest
      * Test create a stage.
      *
      * @param  object $stage
+     * @param  string $type
      * @access public
      * @return object
      */
-    public function createTest($stage)
+    public function createTest($stage, $type = 'waterfall')
     {
         foreach($stage as $key => $value) $_POST[$key] = $value;
 
-        $objectID = $this->objectModel->create();
+        $objectID = $this->objectModel->create($type);
 
         unset($_POST);
 
         if(dao::isError()) return dao::getError();
 
-        $object = $this->objectModel->getByID($objectID);
+        $object = $this->objectModel->getByID($objectID, $type);
         return $object;
     }
 
@@ -32,20 +33,21 @@ class stageTest
      * Test batch create stages.
      *
      * @param  array  $param
+     * @param  string $type
      * @access public
      * @return int
      */
-    public function batchCreateTest($param)
+    public function batchCreateTest($param ,$type = 'waterfall')
     {
         foreach($param as $key => $value) $_POST[$key] = $value;
 
-        $this->objectModel->batchCreate();
+        $this->objectModel->batchCreate($type);
 
         unset($_POST);
 
         if(dao::isError()) return dao::getError();
 
-        $objects = $this->objectModel->getStages();
+        $objects = $this->objectModel->getStages('id_desc', 0, $type);
         return count($objects);
     }
 
@@ -116,4 +118,20 @@ class stageTest
 
         return $object;
     }
+
+    /**
+     * Test get a stage by id.
+     *
+     * @param  string $projectType
+     * @access public
+     * @return object
+     */
+    public function getTotalPercentTest($projectType)
+    {
+        $object = $this->objectModel->getTotalPercent($projectType);
+
+        if(dao::isError()) return dao::getError();
+
+        return $object;
+    }
 }