From 9d5cedc97be32b4fd13b273f35db3ba4b36133fe Mon Sep 17 00:00:00 2001 From: liyang <“liyang@easycorp.ltd”> Date: Fri, 8 Apr 2022 08:28:52 +0800 Subject: [PATCH] add design test --- test/class/design.class.php | 43 ++++++++++--------- test/data/zt_config.sql | 2 +- test/model/design/getbyid.php | 7 ++- test/model/design/getpairs.php | 12 +++++- test/model/design/linkcommit.php | 17 -------- test/model/design/linkcommit.php.bak | 22 ++++++++++ ...{unlinkcommit.php => unlinkcommit.php.bak} | 0 7 files changed, 61 insertions(+), 42 deletions(-) delete mode 100644 test/model/design/linkcommit.php create mode 100644 test/model/design/linkcommit.php.bak rename test/model/design/{unlinkcommit.php => unlinkcommit.php.bak} (100%) diff --git a/test/class/design.class.php b/test/class/design.class.php index 707cd48d02..7e09e62658 100644 --- a/test/class/design.class.php +++ b/test/class/design.class.php @@ -98,6 +98,14 @@ class designTest return $objects; } + /** + * Function assign test by desgin + * + * @param int $designID + * @param array $param + * @access public + * @return array + */ public function assignTest($designID, $param = array()) { global $tester; @@ -118,12 +126,25 @@ class designTest return $objects; } - public function linkCommitTest($designID = 0, $repoID = 0) + public function linkCommitTest($designID, $repoID, $param = array()) { - $objects = $this->objectModel->linkCommit($designID = 0, $repoID = 0); + global $tester; + + $revision = array(); + + $createFields = array('revision' => $revision); + + foreach($createFields as $field => $defaultValue) $_POST[$field] = $defaultValue; + foreach($param as $key => $value) $_POST[$key] = $value; + + $this->objectModel->linkCommit($designID, $repoID); + + unset($_POST); if(dao::isError()) return dao::getError(); + $objects = $tester->dao->select('*')->from(TABLE_DESIGN)->where('id')->eq($designID)->fetchAll(); + return $objects; } @@ -136,24 +157,6 @@ class designTest return $objects; } - public function getByIDTest($designID = 0) - { - $objects = $this->objectModel->getByID($designID = 0); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getPairsTest($productID = 0, $type = 'all') - { - $objects = $this->objectModel->getPairs($productID = 0, $type = 'all'); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - public function getAffectedScopeTest($design = 0) { $objects = $this->objectModel->getAffectedScope($design = 0); diff --git a/test/data/zt_config.sql b/test/data/zt_config.sql index 4f57594c7c..6fdca440f9 100644 --- a/test/data/zt_config.sql +++ b/test/data/zt_config.sql @@ -8,7 +8,7 @@ INSERT INTO `zt_config` (`id`, `vision`, `owner`, `module`, `section`, `key`, `v (6, 'rnd', 'system', 'project', '', 'unitList', 'CNY,USD'), (7, 'rnd', 'system', 'project', '', 'defaultCurrency', 'CNY'), (8, 'rnd', 'system', 'story', '', 'reviewRules', 'allpass'), -(10, 'rnd', 'system', 'common', 'global', 'version', '16.5.beta1'), +(10, 'rnd', 'system', 'common', 'global', 'version', '16.5'), (11, 'rnd', 'system', 'common', 'global', 'sn', 'c8aa3269e181f2b9258ce96625de1497'), (12, 'rnd', 'system', 'common', 'global', 'flow', 'full'), (13, 'rnd', 'system', 'common', 'safe', 'mode', '1'), diff --git a/test/model/design/getbyid.php b/test/model/design/getbyid.php index 203545d5ef..805bc16f8b 100644 --- a/test/model/design/getbyid.php +++ b/test/model/design/getbyid.php @@ -11,7 +11,10 @@ cid=1 pid=1 */ +global $tester; +$design = $tester->loadModel('design'); -$design = new designTest(); +$designIDList = array('0', '1'); -r($design->getByIDTest()) && p() && e(); \ No newline at end of file +r($design->getByID($designIDList[1])) && p('name') && e('这是一个设计1');//正常根据id查询 +r($design->getByID($designIDList[0])) && p() && e('0'); //查询不存在的设计id diff --git a/test/model/design/getpairs.php b/test/model/design/getpairs.php index b4e44c88af..486225b07d 100644 --- a/test/model/design/getpairs.php +++ b/test/model/design/getpairs.php @@ -11,7 +11,15 @@ cid=1 pid=1 */ +global $tester; +$design = $tester->loadModel('design'); -$design = new designTest(); +$productIDList = array('0', '31'); +$types = array('all', 'HLDS', 'DDS', 'DBDS', 'ADS', '0'); -r($design->getPairsTest()) && p() && e(); \ No newline at end of file +r($design->getPairs($productIDList[0], $types[1])) && p() && e('0'); //查询不存在的产品 +r($design->getPairs($productIDList[1], $types[0])) && p() && e('0'); //查询不存在的类型 +r($design->getPairs($productIDList[1], $types[1])) && p('1') && e('1:这是一个设计1');//查询HLDS设计 +r($design->getPairs($productIDList[1], $types[2])) && p('2') && e('2:这是一个设计2');//查询DDS设计 +r($design->getPairs($productIDList[1], $types[3])) && p('3') && e('3:这是一个设计3');//查询DBDS设计 +r($design->getPairs($productIDList[1], $types[4])) && p('4') && e('4:这是一个设计4');//查询ADS设计 diff --git a/test/model/design/linkcommit.php b/test/model/design/linkcommit.php deleted file mode 100644 index c4a550922f..0000000000 --- a/test/model/design/linkcommit.php +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env php -linkCommit(); -cid=1 -pid=1 - -*/ - -$design = new designTest(); - -r($design->linkCommitTest()) && p() && e(); \ No newline at end of file diff --git a/test/model/design/linkcommit.php.bak b/test/model/design/linkcommit.php.bak new file mode 100644 index 0000000000..7442b9b8b5 --- /dev/null +++ b/test/model/design/linkcommit.php.bak @@ -0,0 +1,22 @@ +#!/usr/bin/env php +linkCommit(); +cid=1 +pid=1 + +*/ +$designIDList = array('0', '1'); +$repoIDList = array('0', '1'); +$revision = array('24', '25', '26', '27'); + +$normalLink = array('revision' => $revision); + +$design = new designTest(); +var_dump($design->linkCommitTest($designIDList[1], $repoIDList[1], $normalLink));die; +r($design->linkCommitTest()) && p() && e(); diff --git a/test/model/design/unlinkcommit.php b/test/model/design/unlinkcommit.php.bak similarity index 100% rename from test/model/design/unlinkcommit.php rename to test/model/design/unlinkcommit.php.bak