From 2c223f4d291a661ee430c2db6066baa67e1589dc Mon Sep 17 00:00:00 2001 From: wangyuting Date: Thu, 28 Dec 2023 16:57:53 +0800 Subject: [PATCH] * Fix setting module unit test bug. --- module/setting/test/model/deleteitems.php | 24 +++++++++--------- module/setting/test/model/getitem.php | 28 ++++++++++----------- module/setting/test/model/getitems.php | 20 +++++++-------- module/setting/test/model/updateitem.php | 4 ++- module/setting/test/model/updateversion.php | 6 ++++- 5 files changed, 44 insertions(+), 38 deletions(-) diff --git a/module/setting/test/model/deleteitems.php b/module/setting/test/model/deleteitems.php index df750fba3b..be3f572926 100755 --- a/module/setting/test/model/deleteitems.php +++ b/module/setting/test/model/deleteitems.php @@ -6,7 +6,7 @@ su('admin'); $config = zdTable('config'); $config->vision->range('``,rnd,lite'); -$config->gen(20); +$config->gen(10); /** @@ -20,16 +20,16 @@ pid=1 $setting = new settingTest(); $params = array(); -$params[0] = "key=key2"; -$params[1] = "section=section3&key=key3"; -$params[2] = "module=story§ion=section4&key=key4"; -$params[3] = "owner=system&module=task§ion=section5&key=key5"; -$params[4] = "vision=lite&owner=user&module=bug§ion=section6&key=key6"; +$params[0] = "key=sn"; +$params[1] = "section=global&key=version"; +$params[2] = "module=common§ion=global&key=mode"; +$params[3] = "owner=system&module=common§ion=global&key=URSR"; +$params[4] = "vision=lite&owner=system&module=common§ion=global&key=CRExecution"; $params[5] = "owner=system"; -r($setting->deleteItemsTest($params[0])) && p() && e('19'); -r($setting->deleteItemsTest($params[1])) && p() && e('18'); -r($setting->deleteItemsTest($params[2])) && p() && e('17'); -r($setting->deleteItemsTest($params[3])) && p() && e('16'); -r($setting->deleteItemsTest($params[4])) && p() && e('15'); -r($setting->deleteItemsTest($params[5])) && p() && e('7'); +r($setting->deleteItemsTest($params[0])) && p() && e('9'); +r($setting->deleteItemsTest($params[1])) && p() && e('8'); +r($setting->deleteItemsTest($params[2])) && p() && e('7'); +r($setting->deleteItemsTest($params[3])) && p() && e('6'); +r($setting->deleteItemsTest($params[4])) && p() && e('5'); +r($setting->deleteItemsTest($params[5])) && p() && e('0'); diff --git a/module/setting/test/model/getitem.php b/module/setting/test/model/getitem.php index e5c8e0bc7c..4efbe8b9ea 100755 --- a/module/setting/test/model/getitem.php +++ b/module/setting/test/model/getitem.php @@ -6,7 +6,7 @@ su('admin'); $config = zdTable('config'); $config->vision->range('``,rnd,lite'); -$config->gen(20); +$config->gen(10); /** @@ -19,17 +19,17 @@ cid=1 global $tester; $settingModel = $tester->loadModel('setting'); -$items = array(); -$items[0] = ""; -$items[1] = "key=key2"; -$items[2] = "section=section3&key=key3"; -$items[3] = "module=story§ion=section4&key=key4"; -$items[4] = "owner=system&module=task§ion=section5&key=key5"; -$items[5] = "vision=lite&owner=user&module=bug§ion=section6&key=key6"; +$items = array(); +$items[0] = ""; +$items[1] = "key=sn"; +$items[2] = "section=global&key=version"; +$items[3] = "module=common§ion=global&key=mode"; +$items[4] = "owner=system&module=common§ion=global&key=URSR"; +$items[5] = "vision=lite&owner=system&module=common§ion=global&key=CRExecution"; -r($settingModel->getItem($items[0])) && p() && e('value1'); // 查询所有数据的第一条 -r($settingModel->getItem($items[1])) && p() && e('value2'); // 查询只有key条件 -r($settingModel->getItem($items[2])) && p() && e('value3'); // 查询有key和section条件 -r($settingModel->getItem($items[3])) && p() && e('value4'); // 查询有key、section和module条件 -r($settingModel->getItem($items[4])) && p() && e('value5'); // 查询有key、section、module和owner条件 -r($settingModel->getItem($items[5])) && p() && e('value6'); // 查询有key、section、module、owner和vision条件 +r($settingModel->getItem($items[0])) && p() && e('0'); // 查询所有数据的第一条 +r($settingModel->getItem($items[1])) && p() && e('f205720305272543052e3d689afdb5b8'); // 查询只有key条件 +r($settingModel->getItem($items[2])) && p() && e('10.0'); // 查询有key和section条件 +r($settingModel->getItem($items[3])) && p() && e('ALM'); // 查询有key、section和module条件 +r($settingModel->getItem($items[4])) && p() && e('2'); // 查询有key、section、module和owner条件 +r($settingModel->getItem($items[5])) && p() && e('1'); // 查询有key、section、module、owner和vision条件 diff --git a/module/setting/test/model/getitems.php b/module/setting/test/model/getitems.php index fabb410467..cc6562fa8d 100755 --- a/module/setting/test/model/getitems.php +++ b/module/setting/test/model/getitems.php @@ -6,7 +6,7 @@ su('admin'); $config = zdTable('config'); $config->vision->range('``,rnd,lite'); -$config->gen(20); +$config->gen(10); /** @@ -21,15 +21,15 @@ $settingModel = $tester->loadModel('setting'); $items = array(); $items[0] = ""; -$items[1] = "key=key2"; -$items[2] = "section=section3"; -$items[3] = "module=story"; +$items[1] = "key=sn"; +$items[2] = "section=global"; +$items[3] = "module=common"; $items[4] = "owner=system"; $items[5] = "vision=lite"; -r(count($settingModel->getItems($items[0]))) && p() && e('20'); // 查询所有数据的记录数 -r($settingModel->getItems($items[1])) && p('2:value') && e('value2'); // 查询key条件的所有数据 -r($settingModel->getItems($items[2])) && p('3:value') && e('value3'); // 查询section条件的所有数据 -r(count($settingModel->getItems($items[3]))) && p() && e('7'); // 查询module条件的记录数 -r(count($settingModel->getItems($items[4]))) && p() && e('10'); // 查询owner条件的记录数 -r(count($settingModel->getItems($items[5]))) && p() && e('6'); // 查询vision条件的记录数 +r(count($settingModel->getItems($items[0]))) && p() && e('10'); // 查询所有数据的记录数 +r($settingModel->getItems($items[1])) && p('7:value') && e('f205720305272543052e3d689afdb5b8'); // 查询key条件的所有数据 +r($settingModel->getItems($items[2])) && p('3:value') && e('1'); // 查询section条件的所有数据 +r(count($settingModel->getItems($items[3]))) && p() && e('10'); // 查询module条件的记录数 +r(count($settingModel->getItems($items[4]))) && p() && e('10'); // 查询owner条件的记录数 +r(count($settingModel->getItems($items[5]))) && p() && e('3'); // 查询vision条件的记录数 diff --git a/module/setting/test/model/updateitem.php b/module/setting/test/model/updateitem.php index e0aba9c753..9a5e322b8d 100644 --- a/module/setting/test/model/updateitem.php +++ b/module/setting/test/model/updateitem.php @@ -4,7 +4,9 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/setting.class.php'; su('admin'); -zdTable('config')->gen(20); +$config = zdTable('config'); +$config->vision->range('``,rnd,lite'); +$config->gen(10); /** diff --git a/module/setting/test/model/updateversion.php b/module/setting/test/model/updateversion.php index 5f0217a21f..e1a93bf659 100755 --- a/module/setting/test/model/updateversion.php +++ b/module/setting/test/model/updateversion.php @@ -4,6 +4,10 @@ include dirname(__FILE__, 5) . '/test/lib/init.php'; include dirname(__FILE__, 2) . '/setting.class.php'; su('admin'); +$config = zdTable('config'); +$config->vision->range('``,rnd,lite'); +$config->gen(10); + /** title=测试 settingModel->updateVersion(); @@ -26,4 +30,4 @@ r($setting->updateVersionTest($versionList[0])) && p('1:value') && e('16.5'); r($setting->updateVersionTest($versionList[1])) && p('1:value') && e('max3.0'); //测试version值为max3.0，更新数据 r($setting->updateVersionTest($versionList[2])) && p('1:value') && e('max2.0'); //测试version值为max2.0，更新数据 r($setting->updateVersionTest($versionList[3])) && p('1:value') && e('biz6.5'); //测试version值为biz6.5，更新数据 -r($setting->updateVersionTest($versionList[4])) && p('1:value') && e('0'); //测试version值为0，更新数据 \ No newline at end of file +r($setting->updateVersionTest($versionList[4])) && p('1:value') && e('0'); //测试version值为0，更新数据