diff --git a/test/class/doc.class.php b/test/class/doc.class.php index f52bf13ae4..eabec46cd8 100644 --- a/test/class/doc.class.php +++ b/test/class/doc.class.php @@ -217,81 +217,18 @@ class docTest return $objects; } - public function extractKETableCSSTest($content) + /** + * Function getAllLibsByType test by doc + * + * @param mixed $type + * @param mixed $product + * @param mixed $pager + * @access public + * @return void + */ + public function getAllLibsByTypeTest($type, $product, $pager = null) { - $objects = $this->objectModel->extractKETableCSS($content); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function checkPrivLibTest($object, $extra = '') - { - $objects = $this->objectModel->checkPrivLib($object, $extra = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function checkPrivDocTest($object) - { - $objects = $this->objectModel->checkPrivDoc($object); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getAllLibsByTypeTest($type, $pager = null, $product = '') - { - $objects = $this->objectModel->getAllLibsByType($type, $pager = null, $product = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getAllLibGroupsTest($appendLibs = '') - { - $objects = $this->objectModel->getAllLibGroups($appendLibs = ''); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getLimitLibsTest($type, $limit = 0) - { - $objects = $this->objectModel->getLimitLibs($type, $limit = 0); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getSubLibGroupsTest($type, $idList) - { - $objects = $this->objectModel->getSubLibGroups($type, $idList); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getLibsByObjectTest($type, $objectID, $mode = '', $appendLib = 0) - { - $objects = $this->objectModel->getLibsByObject($type, $objectID, $mode = '', $appendLib = 0); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - public function getOrderedObjectsTest($objectType = 'product') - { - $objects = $this->objectModel->getOrderedObjects($objectType = 'product'); + $objects = $this->objectModel->getAllLibsByType($type, $pager, $product); if(dao::isError()) return dao::getError(); diff --git a/test/model/doc/checkprivdoc.php b/test/model/doc/checkprivdoc.php deleted file mode 100644 index c8b39faad5..0000000000 --- a/test/model/doc/checkprivdoc.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -checkPrivDoc(); -cid=1 -pid=1 - - - -*/ - -$doc = new docTest(); - -r($doc->checkPrivDocTest()) && p() && e(); \ No newline at end of file diff --git a/test/model/doc/checkprivlib.php b/test/model/doc/checkprivlib.php deleted file mode 100644 index 455b604d6f..0000000000 --- a/test/model/doc/checkprivlib.php +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env php -checkPrivLib(); -cid=1 -pid=1 - - - -*/ - -$doc = new docTest(); - -r($doc->checkPrivLibTest()) && p() && e(); \ No newline at end of file diff --git a/test/model/doc/getalllibgroups.php b/test/model/doc/getalllibgroups.php index 90c886c9e6..80b885d873 100644 --- a/test/model/doc/getalllibgroups.php +++ b/test/model/doc/getalllibgroups.php @@ -13,7 +13,14 @@ pid=1 */ +global $tester; +$doc = $tester->loadModel('doc'); -$doc = new docTest(); +$appendLibs = array('17', '1'); -r($doc->getAllLibGroupsTest()) && p() && e(); \ No newline at end of file +r($doc->getAllLibGroups($appendLibs)['product']) && p('1:name') && e('正常产品1');//查询产品库 +r($doc->getAllLibGroups($appendLibs)['project']) && p('117') && e('项目主库'); //查询项目库 +r($doc->getAllLibGroups($appendLibs)['execution']) && p('701:name') && e('子阶段1'); //查询执行库 +r(count($doc->getAllLibGroups($appendLibs)['product'])) && p() && e('100'); //查询产品库统计 +r(count($doc->getAllLibGroups($appendLibs)['project'])) && p() && e('90'); //查询项目库统计 +r(count($doc->getAllLibGroups($appendLibs)['execution'])) && p() && e('603'); //查询执行库统计 diff --git a/test/model/doc/getalllibsbytype.php b/test/model/doc/getalllibsbytype.php index 8f213598eb..8d239cab0e 100644 --- a/test/model/doc/getalllibsbytype.php +++ b/test/model/doc/getalllibsbytype.php @@ -13,7 +13,18 @@ pid=1 */ +$types = array('collector', 'all', 'product', 'execution'); +$product = array('1', ''); $doc = new docTest(); -r($doc->getAllLibsByTypeTest()) && p() && e(); \ No newline at end of file +r($doc->getAllLibsByTypeTest($types[0], $product[0])) && p() && e('0'); //collector类型查询 +r($doc->getAllLibsByTypeTest($types[1], $product[0])) && p() && e('0'); //all类型查询 +r($doc->getAllLibsByTypeTest($types[2], $product[0])) && p('2:name,createdBy') && e('正常产品2,po2');//product类型查询 +r($doc->getAllLibsByTypeTest($types[2], $product[1])) && p('3:name,createdBy') && e('正常产品3,po3');//product类型传入产品id查询 +r(count($doc->getAllLibsByTypeTest($types[2], $product[0]))) && p() && e('100'); //product类型查询统计 +r(count($doc->getAllLibsByTypeTest($types[2], $product[1]))) && p() && e('100'); //product类型传入产品id查询统计 +r($doc->getAllLibsByTypeTest($types[3], $product[0])) && p('101:name,createdBy') && e('迭代1,'); //execution类型查询 +r($doc->getAllLibsByTypeTest($types[3], $product[1])) && p('162:name,createdBy') && e('看板62,'); //execution类型传入产品id查询 +r(count($doc->getAllLibsByTypeTest($types[3], $product[0]))) && p() && e('14'); //execution类型查询统计 +r(count($doc->getAllLibsByTypeTest($types[3], $product[1]))) && p() && e('630'); //execution类型传入产品id查询统计 diff --git a/test/model/doc/getlibs.php b/test/model/doc/getlibs.php index dc0e76e9a4..62b2ebec9c 100644 --- a/test/model/doc/getlibs.php +++ b/test/model/doc/getlibs.php @@ -40,7 +40,7 @@ $types = array('all', 'api', 'product', 'project', 'execution'); $extra = array('', 'withObject', 'notdoc'); $appendLibs = array('17', '1'); $objectIDs = array('1', '11', '101', '0'); -//var_dump($doc->getLibs($types[4], $extra[0], '', $objectIDs[2]));die; + r($doc->getLibs($types[0], $extra[0], '', $objectIDs[3])) && p('1') && e('产品主库'); //全部文档库查询 r($doc->getLibs($types[1], $extra[0], '', $objectIDs[3])) && p() && e('0'); //api文档库查询 r($doc->getLibs($types[2], $extra[0], '', $objectIDs[3])) && p('10') && e('产品主库'); //产品文档库查询 @@ -62,4 +62,4 @@ r(count($doc->getLibs($types[0], $extra[2], '', $objectIDs[3]))) && p() r(count($doc->getLibs($types[1], $extra[0], $appendLibs, $objectIDs[3]))) && p() && e('2'); //额外文档库查询统计 r(count($doc->getLibs($types[2], $extra[0], '', $objectIDs[0]))) && p() && e('1'); //产品单独查询统计 r(count($doc->getLibs($types[3], $extra[0], '', $objectIDs[1]))) && p() && e('1'); //项目单独查询统计 -r(count($doc->getLibs($types[4], $extra[0], '', $objectIDs[2]))) && p() && e('1'); //执行单独查询统计 \ No newline at end of file +r(count($doc->getLibs($types[4], $extra[0], '', $objectIDs[2]))) && p() && e('1'); //执行单独查询统计 diff --git a/test/model/doc/getlibsbyobject.php b/test/model/doc/getlibsbyobject.php index 04f9d2bfd4..b9ec93c86f 100644 --- a/test/model/doc/getlibsbyobject.php +++ b/test/model/doc/getlibsbyobject.php @@ -13,7 +13,17 @@ pid=1 */ +global $tester; +$doc = $tester->loadModel('doc'); -$doc = new docTest(); +$types = array('all', 'api', 'product', 'project', 'execution', 'custom', 'book'); +$objectIDList = array('1', '117', '217', '901'); +$appendLib = '701'; -r($doc->getLibsByObjectTest()) && p() && e(); \ No newline at end of file +r($doc->getLibsByObject($types[0], $objectIDList[0], '', $appendLib)) && p() && e('0'); //all类型查询 +r($doc->getLibsByObject($types[1], $objectIDList[0], '', $appendLib)) && p() && e('0'); //api类型查询 +r($doc->getLibsByObject($types[2], $objectIDList[0], '', $appendLib)) && p('1:name;701:type') && e('产品主库;execution');//product类型查询 +r($doc->getLibsByObject($types[3], $objectIDList[1], '', $appendLib)) && p() && e('0'); //project类型查询 +r($doc->getLibsByObject($types[4], $objectIDList[2], '', $appendLib)) && p('307:name;701:type') && e('迭代主库;execution');//execution类型查询 +r($doc->getLibsByObject($types[5], $objectIDList[3], '', $appendLib)) && p('900:name;701:type') && e('自定义库;execution');//custom类型查询 +r($doc->getLibsByObject($types[6], $objectIDList[3], '', $appendLib)) && p('701:type') && e('execution'); //book类型查询 diff --git a/test/model/doc/getlimitlibs.php b/test/model/doc/getlimitlibs.php index 2d1f7cdda2..905454a69b 100644 --- a/test/model/doc/getlimitlibs.php +++ b/test/model/doc/getlimitlibs.php @@ -13,7 +13,19 @@ pid=1 */ +global $tester; +$doc = $tester->loadModel('doc'); -$doc = new docTest(); +$types = array('all', 'api', 'product', 'project', 'execution'); +$limit = '1'; -r($doc->getLimitLibsTest()) && p() && e(); \ No newline at end of file +r($doc->getLimitLibs($types[0])) && p() && e('0'); //其他类型库查询 +r($doc->getLimitLibs($types[1])) && p('901') && e('接口库'); //接口库查询 +r($doc->getLimitLibs($types[2])) && p('100') && e('多平台产品100'); //产品库查询 +r($doc->getLimitLibs($types[3])) && p('110') && e('项目主库'); //项目库查询 +r($doc->getLimitLibs($types[4])) && p('110') && e(''); //执行库查询 +r(count($doc->getLimitLibs($types[1]))) && p() && e('10'); //接口库查询统计 +r(count($doc->getLimitLibs($types[2]))) && p() && e('100'); //产品库查询统计 +r(count($doc->getLimitLibs($types[3]))) && p() && e('90'); //项目库查询统计 +r(count($doc->getLimitLibs($types[4]))) && p() && e('630'); //执行库查询统计 +r(count($doc->getLimitLibs($types[4], $limit))) && p() && e('1'); //执行库单条查询统计 diff --git a/test/model/doc/getorderedobjects.php b/test/model/doc/getorderedobjects.php index bd315aaafc..c203673190 100644 --- a/test/model/doc/getorderedobjects.php +++ b/test/model/doc/getorderedobjects.php @@ -13,7 +13,16 @@ pid=1 */ +global $tester; +$doc = $tester->loadModel('doc'); -$doc = new docTest(); +$types = array('all', 'api', 'product', 'project', 'execution'); -r($doc->getOrderedObjectsTest()) && p() && e(); \ No newline at end of file +r($doc->getOrderedObjects($types[0])) && p() && e('0'); //all类型查询 +r($doc->getOrderedObjects($types[1])) && p() && e('0'); //api类型查询 +r($doc->getOrderedObjects($types[2])) && p('70') && e('已关闭的多分支产品70'); //product类型查询 +r($doc->getOrderedObjects($types[3])) && p('97') && e('项目87'); //project类型查询 +r($doc->getOrderedObjects($types[4])) && p('700') && e('项目60 / 阶段600'); //execution类型查询 +r(count($doc->getOrderedObjects($types[2]))) && p('70') && e('120'); //product类型查询统计 +r(count($doc->getOrderedObjects($types[3]))) && p('97') && e('110'); //project类型查询统计 +r(count($doc->getOrderedObjects($types[4]))) && p('700') && e('630'); //execution类型查询统计 diff --git a/test/model/doc/getsublibgroups.php b/test/model/doc/getsublibgroups.php index 5e01e31131..aebb585ad1 100644 --- a/test/model/doc/getsublibgroups.php +++ b/test/model/doc/getsublibgroups.php @@ -13,7 +13,13 @@ pid=1 */ +global $tester; +$doc = $tester->loadModel('doc'); -$doc = new docTest(); +$types = array('all', 'product', 'execution'); +$idList = array('17', '1'); -r($doc->getSubLibGroupsTest()) && p() && e(); \ No newline at end of file +r($doc->getSubLibGroups($types[0], $idList)) && p() && e('0'); //all查询 +r($doc->getSubLibGroups($types[1], $idList)[1]) && p('1;files') && e('产品主库;附件库');//产品库查询 +r($doc->getSubLibGroups($types[2], $idList)) && p() && e('0'); //执行库查询 +r(count($doc->getSubLibGroups($types[1], $idList))) && p() && e('2'); //产品库查询统计