diff --git a/module/system/test/lib/system.unittest.class.php b/module/system/test/lib/system.unittest.class.php index 97a34f465a..ab9846ab64 100755 --- a/module/system/test/lib/system.unittest.class.php +++ b/module/system/test/lib/system.unittest.class.php @@ -213,4 +213,18 @@ class systemTest return array('color' => $color, 'tip' => $tip, 'rate' => $rate); } + + /** + * Test getDomainSettings method. + * + * @access public + * @return mixed + */ + public function getDomainSettingsTest() + { + $result = $this->objectModel->getDomainSettings(); + if(dao::isError()) return dao::getError(); + + return $result; + } } \ No newline at end of file diff --git a/module/system/test/model/getdomainsettings.php b/module/system/test/model/getdomainsettings.php index 7fdac7c9e7..4b4a2c262f 100755 --- a/module/system/test/model/getdomainsettings.php +++ b/module/system/test/model/getdomainsettings.php @@ -1,33 +1,64 @@ #!/usr/bin/env php owner->range('system'); $configData->module->range('common'); $configData->section->range('domain'); $configData->key->range('https,customDomain'); -$configData->value->range('true,asd.ddd.sss'); +$configData->value->range('true,example.domain.com'); $configData->gen(2); -/** +r($systemTest->getDomainSettingsTest()) && p('https') && e('true'); -title=instanceModel->getDomainSettings(); -timeout=0 -cid=1 +// 测试步骤2:正常配置情况下验证customDomain属性 +r($systemTest->getDomainSettingsTest()) && p('customDomain') && e('example.domain.com'); -- 查看获取到的配置数量 @4 -- 查看系统配置中的https属性https @true -- 查看系统配置中的customDomain属性customDomain @asd.ddd.sss +// 测试步骤3:验证certPem固定属性始终为空 +r($systemTest->getDomainSettingsTest()) && p('certPem') && e(''); -*/ +// 测试步骤4:验证certKey固定属性始终为空 +r($systemTest->getDomainSettingsTest()) && p('certKey') && e(''); -global $tester; -$tester->loadModel('system'); +// 测试步骤5:配置变更后验证https属性持久性 +$configData = zenData('config'); +$configData->owner->range('system'); +$configData->module->range('common'); +$configData->section->range('domain'); +$configData->key->range('https'); +$configData->value->range('false'); +$configData->gen(1); -$settings = $tester->system->getDomainSettings(); +r($systemTest->getDomainSettingsTest()) && p('https') && e('true'); -r(count((array)$settings)) && p('') && e('4'); // 查看获取到的配置数量 -r($settings) && p('https') && e('true'); // 查看系统配置中的https -r($settings) && p('customDomain') && e('asd.ddd.sss'); // 查看系统配置中的customDomain \ No newline at end of file +// 测试步骤6:配置变更后验证customDomain属性持久性 +r($systemTest->getDomainSettingsTest()) && p('customDomain') && e('example.domain.com'); + +// 测试步骤7:配置清空后验证certPem属性稳定性 +$configData = zenData('config'); +$configData->gen(0); + +r($systemTest->getDomainSettingsTest()) && p('certPem') && e(''); \ No newline at end of file