diff --git a/module/search/test/search.class.php b/module/search/test/search.class.php index 3d5fb79936..b6216bec8d 100755 --- a/module/search/test/search.class.php +++ b/module/search/test/search.class.php @@ -92,28 +92,6 @@ class searchTest return $queryFormData; } - /** - * 设置默认参数的测试用例。 - * Set default params test. - * - * @param array $fields - * @param array $params - * @access public - * @return array - */ - public function setDefaultParamsTest(array $fields, array $params): array - { - global $tester; - $tester->session->set('project', 0); - - $params = $this->objectModel->setDefaultParams($fields, $params); - - $paramValues = array(); - foreach($params as $field => $param) $paramValues[$field] = $param['values']; - - return $paramValues; - } - /** * 测试初始化 session。 * Test init session function. diff --git a/module/search/test/tao/setdefaultparams.php b/module/search/test/tao/setdefaultparams.php deleted file mode 100755 index 82f9f7256f..0000000000 --- a/module/search/test/tao/setdefaultparams.php +++ /dev/null @@ -1,54 +0,0 @@ -#!/usr/bin/env php -gen(5); -zdTable('product')->gen(10); -zdTable('project')->config('execution')->gen(10); - -/** - -title=测试 searchModel->setDefaultParams(); -timeout=0 -cid=1 - -- 测试用户admin的值第user条的admin属性 @A:admin -- 测试产品1的值第product条的1属性 @正常产品1 -- 测试迭代101的值第execution条的101属性 @/迭代5 - -*/ - -$search = new searchTest(); - -$fields = array('user' => 'user', 'product' => 'product', 'execution' => 'execution'); -$userParam = array(); -$userParam['operator'] = '='; -$userParam['control'] = 'select'; -$userParam['values'] = 'users'; - -$userParam = array(); -$userParam['operator'] = '='; -$userParam['control'] = 'select'; -$userParam['values'] = 'users'; - -$productParam = array(); -$productParam['operator'] = '='; -$productParam['control'] = 'select'; -$productParam['values'] = 'products'; - -$executionParam = array(); -$executionParam['operator'] = '='; -$executionParam['control'] = 'select'; -$executionParam['values'] = 'executions'; - -$params = array(); -$params['user'] = $userParam; -$params['product'] = $productParam; -$params['execution'] = $executionParam; - -r($search->setDefaultParamsTest($fields, $params)) && p('user:admin') && e('A:admin'); //测试用户admin的值 -r($search->setDefaultParamsTest($fields, $params)) && p('product:1') && e('正常产品1'); //测试产品1的值 -r($search->setDefaultParamsTest($fields, $params)) && p('execution:101') && e('/迭代5'); //测试迭代101的值 \ No newline at end of file