From 5b49a262142fba3c77892fccded591e95aa72a63 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Fri, 12 Aug 2022 17:16:45 +0800 Subject: [PATCH] * Modify unit test of caselib. --- test/class/caselib.class.php | 110 ++++++------------------ test/model/caselib/batchcreatecase.php | 6 +- test/model/caselib/buildsearchform.php | 28 ------ test/model/caselib/createfromimport.php | 10 ++- test/model/caselib/getliblink.php | 29 ------- test/model/caselib/setlibmenu.php | 25 ------ 6 files changed, 37 insertions(+), 171 deletions(-) delete mode 100755 test/model/caselib/buildsearchform.php delete mode 100755 test/model/caselib/getliblink.php delete mode 100755 test/model/caselib/setlibmenu.php diff --git a/test/class/caselib.class.php b/test/class/caselib.class.php index 19523316be..805c9250fb 100644 --- a/test/class/caselib.class.php +++ b/test/class/caselib.class.php @@ -7,28 +7,11 @@ class caselibTest $this->objectModel = $tester->loadModel('caselib'); } - /** - * Set lib menu test. - * - * @param mixed $libraries - * @param mixed $libID - * @access public - * @return void - */ - public function setLibMenuTest($libraries, $libID) - { - $objects = $this->objectModel->setLibMenu($libraries, $libID); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - /** * Save lib state test. - * - * @param int $libID - * @param array $libraries + * + * @param int $libID + * @param array $libraries * @access public * @return void */ @@ -43,9 +26,9 @@ class caselibTest /** * Get by ID test. - * - * @param mixed $libID - * @param mixed $setImgSize + * + * @param mixed $libID + * @param mixed $setImgSize * @access public * @return void */ @@ -60,8 +43,8 @@ class caselibTest /** * Update test. - * - * @param mixed $libID + * + * @param mixed $libID * @access public * @return void */ @@ -78,9 +61,9 @@ class caselibTest /** * Delete test. - * - * @param mixed $libID - * @param string $table + * + * @param mixed $libID + * @param string $table * @access public * @return void */ @@ -97,7 +80,7 @@ class caselibTest /** * Get libraries test. - * + * * @access public * @return void */ @@ -112,9 +95,9 @@ class caselibTest /** * Get list test. - * - * @param string $orderBy - * @param mixed $pager + * + * @param string $orderBy + * @param mixed $pager * @access public * @return void */ @@ -129,8 +112,8 @@ class caselibTest /** * Create test. - * - * @param mixed $param + * + * @param mixed $param * @access public * @return void */ @@ -149,13 +132,13 @@ class caselibTest /** * Get libcases test. - * - * @param mixed $libID - * @param mixed $browseType - * @param int $queryID - * @param int $moduleID - * @param string $sort - * @param mixed $pager + * + * @param mixed $libID + * @param mixed $browseType + * @param int $queryID + * @param int $moduleID + * @param string $sort + * @param mixed $pager * @access public * @return void */ @@ -168,47 +151,10 @@ class caselibTest return $objects; } - /** - * Build searchform test. - * - * @param mixed $libID - * @param mixed $libraries - * @param mixed $queryID - * @param mixed $actionURL - * @access public - * @return void - */ - public function buildSearchFormTest($libID, $libraries, $queryID, $actionURL) - { - $objects = $this->objectModel->buildSearchForm($libID, $libraries, $queryID, $actionURL); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - - /** - * Get liblink test. - * - * @param mixed $module - * @param mixed $method - * @param mixed $extra - * @access public - * @return void - */ - public function getLibLinkTest($module, $method, $extra) - { - $objects = $this->objectModel->getLibLink($module, $method, $extra); - - if(dao::isError()) return dao::getError(); - - return $objects; - } - /** * Create from import test. - * - * @param mixed $libID + * + * @param mixed $libID * @access public * @return void */ @@ -223,8 +169,8 @@ class caselibTest /** * Batch create case test. - * - * @param mixed $libID + * + * @param mixed $libID * @access public * @return void */ diff --git a/test/model/caselib/batchcreatecase.php b/test/model/caselib/batchcreatecase.php index 074c29d3da..043129c789 100755 --- a/test/model/caselib/batchcreatecase.php +++ b/test/model/caselib/batchcreatecase.php @@ -34,7 +34,7 @@ $total = $tester->dao->select('count(*) total')->from(TABLE_CASE)->where( 'lib') $cases = $tester->dao->select('*')->from(TABLE_CASE)->where( 'lib')->eq(201)->fetchAll('id'); r($total) && p() && e('12'); // 添加两条数据之后查询数据条数是否正确 -r($cases) && p('411:title,type') && e('测试导入添加1,performance'); // 添加数据之后查询新加用例的名称,用例类型 -r($cases) && p('412:title,type') && e('测试导入添加2,unit'); // 添加数据之后查询新加用例的名称,用例类型 +r($cases) && p('561:title,type') && e('测试导入添加1,performance'); // 添加数据之后查询新加用例的名称,用例类型 +r($cases) && p('562:title,type') && e('测试导入添加2,unit'); // 添加数据之后查询新加用例的名称,用例类型 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB(); diff --git a/test/model/caselib/buildsearchform.php b/test/model/caselib/buildsearchform.php deleted file mode 100755 index 24c06fb5a9..0000000000 --- a/test/model/caselib/buildsearchform.php +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env php -buildSearchForm(); -cid=1 -pid=1 - -测试设置的url参数 >> model/caselib/buildsearchform.php?m=caselib&f=browse&t=&libID=201&browseType=bySearch&queryID=myQueryID -测试设置的queryID值是否正确 >> 10 - -*/ - -$caselib = new caselibTest(); -$libID = 201; -$queryID = 10; -$actionURL = helper::createLink('caselib', 'browse', "libID=$libID&browseType=bySearch&queryID=myQueryID"); -$libs = $tester->loadModel('caselib')->getLibraries(); - -$caselib->buildSearchFormTest($libID, $libs, $queryID, $actionURL); -$search = $tester->config->testcase->search; - -r($search) && p('actionURL') && e('model/caselib/buildsearchform.php?m=caselib&f=browse&t=&libID=201&browseType=bySearch&queryID=myQueryID'); //测试设置的url参数 -r($search) && p('queryID') && e('10'); //测试设置的queryID值是否正确 \ No newline at end of file diff --git a/test/model/caselib/createfromimport.php b/test/model/caselib/createfromimport.php index 7c877d3471..97a5797df3 100755 --- a/test/model/caselib/createfromimport.php +++ b/test/model/caselib/createfromimport.php @@ -26,8 +26,10 @@ $_POST = array( 'type' => array(2 => 'performance', 3 => 'unit'), 'stage' => array(2 => array(), 3 => array()), 'keywords' => array(2 => 'keywords1', 3 => 'keywords2'), + 'status' => array(2 => '', 3 => ''), + 'desc' => array(2 => array(), 3 => array()), 'precondition' => array(2 => '', 3 => ''), - 'isEndPage' => 1, + 'isEndPage' => 0, 'pagerID' => 1 ); @@ -37,7 +39,7 @@ $total = $tester->dao->select('count(*) total')->from(TABLE_CASE)->where( 'lib') $cases = $tester->dao->select('*')->from(TABLE_CASE)->where( 'lib')->eq(201)->fetchAll('id'); r($total) && p() && e('12'); //添加两条数据之后查询数据条数是否正确 -r($cases) && p('411:title,keywords') && e('测试导入添加1,keywords1'); //添加数据之后查询新加用例的名称，关键字 -r($cases) && p('412:title,keywords') && e('测试导入添加2,keywords2'); //添加数据之后查询新加用例的名称，关键字 +r($cases) && p('561:title,keywords') && e('测试导入添加1,keywords1'); //添加数据之后查询新加用例的名称，关键字 +r($cases) && p('562:title,keywords') && e('测试导入添加2,keywords2'); //添加数据之后查询新加用例的名称，关键字 -$db->restoreDB(); \ No newline at end of file +$db->restoreDB(); diff --git a/test/model/caselib/getliblink.php b/test/model/caselib/getliblink.php deleted file mode 100755 index d807e33254..0000000000 --- a/test/model/caselib/getliblink.php +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env php -getLibLink(); -cid=1 -pid=1 - -测试参数情况1返回值 >> model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s -测试参数情况2返回值 >> model/caselib/getliblink.php?m=caselib&f=test&t=&libID=%s -测试参数情况3返回值 >> model/caselib/getliblink.php?m=tree&f=&t=&libID=%s&type=caselib¤tModuleID=0 -测试参数情况4返回值 >> model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s - -*/ - -$caselib = new caselibTest(); -$link1 = $caselib->getLibLinkTest('caselib', 'create', ''); -$link2 = $caselib->getLibLinkTest('caselib', 'test', ''); -$link3 = $caselib->getLibLinkTest('tree', '', ''); -$link4 = $caselib->getLibLinkTest('', '', ''); - -r($link1) && p() && e('model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s'); // 测试参数情况1返回值 -r($link2) && p() && e('model/caselib/getliblink.php?m=caselib&f=test&t=&libID=%s'); // 测试参数情况2返回值 -r($link3) && p() && e('model/caselib/getliblink.php?m=tree&f=&t=&libID=%s&type=caselib¤tModuleID=0'); // 测试参数情况3返回值 -r($link4) && p() && e('model/caselib/getliblink.php?m=caselib&f=browse&t=&libID=%s'); // 测试参数情况4返回值 \ No newline at end of file diff --git a/test/model/caselib/setlibmenu.php b/test/model/caselib/setlibmenu.php deleted file mode 100755 index 5956ccde75..0000000000 --- a/test/model/caselib/setlibmenu.php +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env php -setLibMenu(); -cid=1 -pid=1 - -修改下拉菜单之后返回值 >> 1 - -*/ - -$caselib = new caselibTest(); -$libs = $tester->loadModel('caselib')->getLibraries(); -$config->webRoot = 'model/caselib/';//ztest运行时候获取的不一致 -$info = $caselib->setLibMenuTest($libs, 201); - -$menuStr = << -EOT; -r($tester->lang->switcherMenu == trim($menuStr)) && p() && e('1'); //修改下拉菜单之后返回值 \ No newline at end of file