From 05a8756da50844e9477b263a9032493c369581f6 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 7 May 2022 06:51:54 +0000 Subject: [PATCH 1/2] * Datatable unit --- test/class/datatable.class.php | 44 +++++++++++++++++++++ test/model/datatable/getFieldList.php | 25 ++++++++++++ test/model/datatable/getSetting.php | 25 ++++++++++++ test/model/datatable/printHead.php | 31 +++++++++++++++ test/model/datatable/setFixedFieldWidth.php | 29 ++++++++++++++ test/ztest | 3 ++ 6 files changed, 157 insertions(+) create mode 100644 test/class/datatable.class.php create mode 100644 test/model/datatable/getFieldList.php create mode 100644 test/model/datatable/getSetting.php create mode 100644 test/model/datatable/printHead.php create mode 100644 test/model/datatable/setFixedFieldWidth.php diff --git a/test/class/datatable.class.php b/test/class/datatable.class.php new file mode 100644 index 0000000000..7e354de529 --- /dev/null +++ b/test/class/datatable.class.php @@ -0,0 +1,44 @@ +objectModel = $tester->loadModel('datatable'); + } + + public function getFieldListTest($module, $method) + { + $module = zget($this->objectModel->config->datatable->moduleAlias, "$module-$method", $module); + $result = $this->objectModel->getFieldList($module); + return $result; + } + + public function getSettingTest($module, $method) + { + $this->objectModel->app->methodName = $method; + $result = $this->objectModel->getSetting($module); + return $result; + } + + public function printHeadTest($data) + { + ob_start(); + $this->objectModel->printHead($data['cols'], $data['orderBy'], $data['vars'], $data['checkBox']); + $head = ob_get_clean(); + + $isTh = strpos($head, 'objectModel->setFixedFieldWidth($setting); + return $result; + } +} diff --git a/test/model/datatable/getFieldList.php b/test/model/datatable/getFieldList.php new file mode 100644 index 0000000000..4cd4b79116 --- /dev/null +++ b/test/model/datatable/getFieldList.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +> ID +获取项目模块browse方法自定义列 >> 项目名称 +获取执行模块task方法自定义列 >> 70 +获取测试用例模块browse方法自定义列 >> auto + +*/ + + +$datatable = new datatableTest(); +r($datatable->getFieldListTest('product', 'browse')) && p('id:title') && e('ID'); //获取产品模块browse方法自定义列 +r($datatable->getFieldListTest('project', 'browse')) && p('name:title') && e('项目名称'); //获取项目模块browse方法自定义列 +r($datatable->getFieldListTest('execution', 'task')) && p('id:width') && e('70'); //获取执行模块task方法自定义列 +r($datatable->getFieldListTest('testcase', 'browse')) && p('title:width') && e('auto'); //获取测试用例模块browse方法自定义列 diff --git a/test/model/datatable/getSetting.php b/test/model/datatable/getSetting.php new file mode 100644 index 0000000000..b650e9686c --- /dev/null +++ b/test/model/datatable/getSetting.php @@ -0,0 +1,25 @@ +#!/usr/bin/env php +> ID +获取项目模块browse方法设置 >> 项目名称 +获取执行模块task方法设置 >> 70 +获取测试用例模块browse方法设置 >> auto + +*/ + + +$datatable = new datatableTest(); +r($datatable->getSettingTest('product', 'browse')) && p('0:title') && e('ID'); //获取产品模块browse方法设置 +r($datatable->getSettingTest('project', 'browse')) && p('1:title') && e('项目名称'); //获取项目模块browse方法设置 +r($datatable->getSettingTest('execution', 'task')) && p('0:width') && e('70'); //获取执行模块task方法设置 +r($datatable->getSettingTest('testcase', 'browse')) && p('2:width') && e('auto'); //获取测试用例模块browse方法设置 diff --git a/test/model/datatable/printHead.php b/test/model/datatable/printHead.php new file mode 100644 index 0000000000..e48162d59f --- /dev/null +++ b/test/model/datatable/printHead.php @@ -0,0 +1,31 @@ +#!/usr/bin/env php +> 1 +获取产品模块browse方法头部html带排序 >> 1 +获取产品模块browse方法头部html带参数 >> 1 +获取产品模块browse方法头部html带checkbox >> 1 + +*/ + +$datatable = new datatableTest(); +$productSetting = $datatable->getSettingTest('product', 'browse'); + +$data = array('cols' => $productSetting[0], 'orderBy' => '', 'vars' => '', 'checkBox' => false); +$data_order = array('cols' => $productSetting[0], 'orderBy' => 'id_asc', 'vars' => '', 'checkBox' => false); +$data_vars = array('cols' => $productSetting[0], 'orderBy' => 'id_asc', 'vars' => 'productID=1', 'checkBox' => false); +$data_check = array('cols' => $productSetting[0], 'orderBy' => 'id_asc', 'vars' => 'productID=1', 'checkBox' => true); + +r($datatable->printHeadTest($data)) && p() && e(1); //获取产品模块browse方法头部html +r($datatable->printHeadTest($data_order)) && p() && e(1); //获取产品模块browse方法头部html带排序 +r($datatable->printHeadTest($data_vars)) && p() && e(1); //获取产品模块browse方法头部html带参数 +r($datatable->printHeadTest($data_check)) && p() && e(1); //获取产品模块browse方法头部html带checkbox diff --git a/test/model/datatable/setFixedFieldWidth.php b/test/model/datatable/setFixedFieldWidth.php new file mode 100644 index 0000000000..f615831913 --- /dev/null +++ b/test/model/datatable/setFixedFieldWidth.php @@ -0,0 +1,29 @@ +#!/usr/bin/env php +> 550 +获取项目模块browse方法设置宽度 >> 180 +获取执行模块task方法设置宽度 >> 550 +获取测试用例模块browse方法设置宽度 >> 150 + +*/ + +$datatable = new datatableTest(); +$productSetting = $datatable->getSettingTest('product', 'browse'); +$projectSetting = $datatable->getSettingTest('project', 'browse'); +$executionSetting = $datatable->getSettingTest('execution', 'task'); +$testcaseSetting = $datatable->getSettingTest('testcase', 'browse'); + +r($datatable->setFixedFieldWidthTest($productSetting)) && p('leftWidth') && e('550'); //获取产品模块browse方法设置宽度 +r($datatable->setFixedFieldWidthTest($projectSetting)) && p('rightWidth') && e('180'); //获取项目模块browse方法设置宽度 +r($datatable->setFixedFieldWidthTest($executionSetting)) && p('leftWidth') && e('550'); //获取执行模块browse方法设置宽度 +r($datatable->setFixedFieldWidthTest($testcaseSetting)) && p('rightWidth') && e('150'); //获取测试用例模块browse方法设置宽度 diff --git a/test/ztest b/test/ztest index 188e7995af..5c853ac07d 100755 --- a/test/ztest +++ b/test/ztest @@ -43,6 +43,9 @@ switch($argv[1]) case 'cron': ztfRun('model/cron'); break; + case 'datatable': + ztfRun('model/datatable'); + break; case 'dept': ztfRun('model/dept'); break; From 9303994da99a86455c45350c2bac83e36cdd8e44 Mon Sep 17 00:00:00 2001 From: zenggang Date: Sat, 7 May 2022 06:54:18 +0000 Subject: [PATCH 2/2] * Adjust code --- test/model/datatable/getFieldList.php | 1 - test/model/datatable/getSetting.php | 1 - 2 files changed, 2 deletions(-) diff --git a/test/model/datatable/getFieldList.php b/test/model/datatable/getFieldList.php index 4cd4b79116..ef6183a769 100644 --- a/test/model/datatable/getFieldList.php +++ b/test/model/datatable/getFieldList.php @@ -17,7 +17,6 @@ pid=1 */ - $datatable = new datatableTest(); r($datatable->getFieldListTest('product', 'browse')) && p('id:title') && e('ID'); //获取产品模块browse方法自定义列 r($datatable->getFieldListTest('project', 'browse')) && p('name:title') && e('项目名称'); //获取项目模块browse方法自定义列 diff --git a/test/model/datatable/getSetting.php b/test/model/datatable/getSetting.php index b650e9686c..dcb3c87da8 100644 --- a/test/model/datatable/getSetting.php +++ b/test/model/datatable/getSetting.php @@ -17,7 +17,6 @@ pid=1 */ - $datatable = new datatableTest(); r($datatable->getSettingTest('product', 'browse')) && p('0:title') && e('ID'); //获取产品模块browse方法设置 r($datatable->getSettingTest('project', 'browse')) && p('1:title') && e('项目名称'); //获取项目模块browse方法设置