From 71cb819e341b2b07d0e291d75515a45ed66d522e Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Thu, 11 Sep 2025 00:49:12 +0000 Subject: [PATCH 1/3] * fix setDefaultParams. --- module/bug/model.php | 2 +- module/caselib/model.php | 2 +- module/testcase/model.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/module/bug/model.php b/module/bug/model.php index 0e14128fd5..20bedd541e 100644 --- a/module/bug/model.php +++ b/module/bug/model.php @@ -814,7 +814,7 @@ class bugModel extends model $_SESSION['searchParams']['module'] = 'bug'; $searchConfig = $this->config->bug->search; - $searchConfig['params'] = $this->loadModel('search')->setDefaultParams($searchConfig['fields'], $searchConfig['params']); + $searchConfig['params'] = $this->loadModel('search')->setDefaultParams('bug', $searchConfig['fields'], $searchConfig['params']); return $searchConfig; } diff --git a/module/caselib/model.php b/module/caselib/model.php index ce33fd07c6..12629d9ace 100644 --- a/module/caselib/model.php +++ b/module/caselib/model.php @@ -449,7 +449,7 @@ class caselibModel extends model $_SESSION['searchParams']['module'] = 'caselib'; $searchConfig = $this->loadModel('search')->processBuildinFields('testcase', $this->config->testcase->search); - $searchConfig['params'] = $this->search->setDefaultParams($searchConfig['fields'], $searchConfig['params']); + $searchConfig['params'] = $this->search->setDefaultParams('caselib', $searchConfig['fields'], $searchConfig['params']); return $searchConfig; } diff --git a/module/testcase/model.php b/module/testcase/model.php index b4997d1bf5..548d886fa7 100755 --- a/module/testcase/model.php +++ b/module/testcase/model.php @@ -2981,7 +2981,7 @@ class testcaseModel extends model $_SESSION['searchParams']['module'] = 'testcase'; $searchConfig = $this->loadModel('search')->processBuildinFields('testcase', $this->config->testcase->search); - $searchConfig['params'] = $this->search->setDefaultParams($searchConfig['fields'], $searchConfig['params']); + $searchConfig['params'] = $this->search->setDefaultParams('testcase', $searchConfig['fields'], $searchConfig['params']); return $searchConfig; } From c61d75bc6183288ee7a4fc8253272e083fc498b6 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Thu, 11 Sep 2025 00:55:48 +0000 Subject: [PATCH 2/3] * fix unittest. --- module/screen/test/model/getburndata.php | 2 +- module/screen/test/model/getsysoptions.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/module/screen/test/model/getburndata.php b/module/screen/test/model/getburndata.php index 14a12e21c2..dffe6699a2 100755 --- a/module/screen/test/model/getburndata.php +++ b/module/screen/test/model/getburndata.php @@ -24,4 +24,4 @@ $screen = new screenTest(); $data = $screen->getBurnDataTest(); r(count($data)) && p('') && e(16); //测试生成的数据条数 -r($data) && p('104:name') && e('项目集1--项目集4'); //测试生成的数据是否正确 \ No newline at end of file +r($data) && p('104:name') && e('项目11--项目集4'); //测试生成的数据是否正确 \ No newline at end of file diff --git a/module/screen/test/model/getsysoptions.php b/module/screen/test/model/getsysoptions.php index 8f023e8861..674fea5c2c 100755 --- a/module/screen/test/model/getsysoptions.php +++ b/module/screen/test/model/getsysoptions.php @@ -63,7 +63,7 @@ $sqlList = array('', '', '', '', '', '', r($screen->getSysOptionsTest($typeList[0], $objectList[0], $fieldList[0], $sqlList[0])) && p('admin,closed') && e('A:admin,Closed'); //测试type为user，对象类型为空，字段为空，sql为空的情况下，用户列表获取是否正确。 r($screen->getSysOptionsTest($typeList[1], $objectList[1], $fieldList[1], $sqlList[1])) && p('1,10') && e('正常产品1,正常产品10'); //测试type为product，对象类型为空，字段为空，sql为空的情况下，产品列表获取是否正确。 -r($screen->getSysOptionsTest($typeList[2], $objectList[2], $fieldList[2], $sqlList[2])) && p('11,20') && e('项目集1,项目集10'); //测试type为project，对象类型为空，字段为空，sql为空的情况下，项目列表获取是否正确。 +r($screen->getSysOptionsTest($typeList[2], $objectList[2], $fieldList[2], $sqlList[2])) && p('11,20') && e('项目11,项目20'); //测试type为project，对象类型为空，字段为空，sql为空的情况下，项目列表获取是否正确。 r($screen->getSysOptionsTest($typeList[3], $objectList[3], $fieldList[3], $sqlList[3])) && p('101,110') && e('/项目集1,/项目集10'); //测试type为execution，对象类型为空，字段为空，sql为空的情况下，执行列表获取是否正确。 r($screen->getSysOptionsTest($typeList[4], $objectList[4], $fieldList[4], $sqlList[4])) && p('1,10') && e('/产品部1,/一级部门10'); //测试type为dept，对象类型为空，字段为空，sql为空的情况下，部门列表获取是否正确。 r($screen->getSysOptionsTest($typeList[5], $objectList[5], $fieldList[5], $sqlList[5])) && p('wait,doing,suspended,closed,delay') && e('未开始,进行中,已挂起,已关闭,已延期'); //测试type为dept，对象类型为空，字段为空，sql为空的情况下，项目状态获取是否正确。 From 14ba424ec5cf835a522be344cda19f489678ddf3 Mon Sep 17 00:00:00 2001 From: qixinzhi Date: Thu, 11 Sep 2025 01:27:52 +0000 Subject: [PATCH 3/3] * add unittest. --- module/bug/test/model/buildsearchconfig.php | 30 +++++++++++++++++++ .../caselib/test/model/buildsearchconfig.php | 30 +++++++++++++++++++ 2 files changed, 60 insertions(+) create mode 100644 module/bug/test/model/buildsearchconfig.php create mode 100644 module/caselib/test/model/buildsearchconfig.php diff --git a/module/bug/test/model/buildsearchconfig.php b/module/bug/test/model/buildsearchconfig.php new file mode 100644 index 0000000000..c97896b35c --- /dev/null +++ b/module/bug/test/model/buildsearchconfig.php @@ -0,0 +1,30 @@ +#!/usr/bin/env php +buildSearchConfig(); +cid=1 +- 测试字段名称 + - 属性title @Bug标题 + - 属性module @所属模块 + - 属性steps @重现步骤 +- 测试指派给字段 + - 属性operator @= + - 属性control @select +- 测试严重程度字段 @6 + +*/ + + + +$bug=new bugTest(); +$searchConfig = $bug->objectModel->buildSearchConfig(1, 'story'); + +r($searchConfig['fields']) && p('title,module,steps') && e('Bug标题,所属模块,重现步骤'); // 测试字段名称 +r($searchConfig['params']['assignedTo']) && p('operator,control') && e('=,select'); // 测试指派给字段 +r(count($searchConfig['params']['severity']['values'])) && p('') && e('6'); // 测试严重程度字段 \ No newline at end of file diff --git a/module/caselib/test/model/buildsearchconfig.php b/module/caselib/test/model/buildsearchconfig.php new file mode 100644 index 0000000000..f2c72a01bd --- /dev/null +++ b/module/caselib/test/model/buildsearchconfig.php @@ -0,0 +1,30 @@ +#!/usr/bin/env php +buildSearchConfig(); +cid=1 +- 测试字段名称 + - 属性title @用例名称 + - 属性story @关联需求 + - 属性type @用例类型 +- 测试模块字段 + - 属性operator @belong + - 属性control @select +- 测试用例类型字段 @10 + +*/ + + + +$caselib = new caselibTest(); +$searchConfig = $caselib->objectModel->buildSearchConfig(1); + +r($searchConfig['fields']) && p('title,story,type') && e('用例名称,关联需求,用例类型'); // 测试字段名称 +r($searchConfig['params']['module']) && p('operator,control') && e('belong,select'); // 测试模块字段 +r(count($searchConfig['params']['type']['values'])) && p('') && e('10'); // 测试用例类型字段 \ No newline at end of file