diff --git a/test/class/setting.class.php b/test/class/setting.class.php index 7c6639ea28..38a66bb22b 100644 --- a/test/class/setting.class.php +++ b/test/class/setting.class.php @@ -61,24 +61,55 @@ class settingTest return $objects; } - public function createDAOTest($params, $method = 'select') + /** + * Test create a DAO object to select or delete one or more records. + * + * @param string $paramString + * @param string $method select|delete. + * @access public + * @return array|int + */ + public function createDAOTest($paramString, $method = 'select') { - $objects = $this->objectModel->createDAO($params, $method = 'select'); + $params = $this->objectModel->parseItemParam($paramString); + if($method == 'delete') + { + $objects = $this->objectModel->createDAO($params, $method)->exec(); + } + else + { + $objects = $this->objectModel->createDAO($params, $method)->orderBy('key')->fetch(); + } if(dao::isError()) return dao::getError(); return $objects; } + /** + * Get config of system and one user. + * + * @param string $account + * @access public + * @return bool + */ public function getSysAndPersonalConfigTest($account = '') { - $objects = $this->objectModel->getSysAndPersonalConfig($account = ''); + $objects = $this->objectModel->getSysAndPersonalConfig($account); if(dao::isError()) return dao::getError(); - return $objects; + return !empty($objects) ? true : false; } + /** + * Test get the version of current zentaopms. + * + * Since the version field not saved in db. So if empty, return 0.3 beta. + * + * @access public + * @return void + */ public function getVersionTest() { $objects = $this->objectModel->getVersion(); @@ -88,6 +119,12 @@ class settingTest return $objects; } + /** + * Test get URSR. + * + * @access public + * @return int + */ public function getURSRTest() { $objects = $this->objectModel->getURSR(); @@ -97,24 +134,58 @@ class settingTest return $objects; } + /** + * Test update version + * + * @param string $version + * @access public + * @return array + */ public function updateVersionTest($version) { - $objects = $this->objectModel->updateVersion($version); + $this->objectModel->updateVersion($version); if(dao::isError()) return dao::getError(); + $params['owner'] = 'system'; + $params['module'] = 'common'; + $params['section'] = 'global'; + $params['key'] = 'version'; + + $objects = $this->objectModel->createDAO($params)->fetchAll(); + return $objects; } + /** + * Test set the sn of current zentaopms. + * + * @access public + * @return bool + */ public function setSNTest() { - $objects = $this->objectModel->setSN(); + $this->objectModel->setSN(); if(dao::isError()) return dao::getError(); - return $objects; + $params['owner'] = 'system'; + $params['module'] = 'common'; + $params['section'] = 'global'; + $params['key'] = 'sn'; + + $objects = $this->objectModel->createDAO($params)->fetchAll(); + + return !empty($objects) ? true : false; } + /** + * Test judge a sn needed update or not. + * + * @param string $sn + * @access public + * @return bool + */ public function snNeededUpdateTest($sn) { $objects = $this->objectModel->snNeededUpdate($sn); diff --git a/test/model/setting/createdao.php b/test/model/setting/createdao.php old mode 100644 new mode 100755 index 1e5b299bb8..b608c612f1 --- a/test/model/setting/createdao.php +++ b/test/model/setting/createdao.php @@ -10,8 +10,80 @@ title=测试 settingModel->createDAO(); cid=1 pid=1 +测试查询参数包含vision、owner、module、section、key的config数据 >> rnd,system,common,global,version +测试查询参数包含vision、owner、module、key的config数据 >> 0 +测试查询参数包含owner、module、section、key的config数据 >> rnd,system,common,global,mode +测试查询参数包含owner、module、key的config数据 >> rnd,system,common,,CRProduct +测试查询参数包含module、section、key的config数据 >> rnd,system,common,global,sn +测试查询参数包含module、key的config数据 >> 0 +测试查询参数包含section、key的config数据 >> rnd,system,common,safe,mode +测试查询参数包含key的config数据 >> rnd,system,custom,,URSR +测试查询参数包含module的config数据 >> rnd,system,story,,reviewRules +测试查询参数包含section的config数据 >> rnd,system,common,xuanxuan,chatPort +测试查询参数包含owner的config数据 >> rnd,admin,my,common,blockInited +测试查询参数包含vision的config数据 >> rnd,admin,my,common,blockInited +测试查询参数为空的config数据 >> rnd,admin,my,common,blockInited +测试查询参数包含vision、owner、module、section、key的config数据 >> rnd,system,common,global,version +测试删除参数包含vision、owner、module、key的config数据 >> 0 +测试删除参数包含owner、module、section、key的config数据 >> 1 +测试删除参数包含owner、module、key的config数据 >> 1 +测试删除参数包含module、section、key的config数据 >> 1 +测试删除参数包含module、key的config数据 >> 0 +测试删除参数包含section、key的config数据 >> 1 +测试删除参数包含key的config数据 >> 2 +测试删除参数包含module的config数据 >> 1 +测试删除参数包含section的config数据 >> 7 +测试删除参数包含owner的config数据 >> 7 +测试删除参数包含vision的config数据 >> 13 +测试删除参数为空的config数据 >> 0 + */ +$paramString = array(); +$paramString[0] = "vision=rnd&owner=system&module=common§ion=global&key=version"; +$paramString[1] = "vision=rnd&owner=system&module=common&key=hourPoint"; +$paramString[2] = "owner=system&module=common§ion=global&key=mode"; +$paramString[3] = "owner=system&module=common&key=CRProduct"; +$paramString[4] = "module=common§ion=global&key=sn"; +$paramString[5] = "module=common&key=CRExection"; +$paramString[6] = "section=safe&key=mode"; +$paramString[7] = "key=URSR"; +$paramString[8] = "module=story"; +$paramString[9] = "section=xuanxuan"; +$paramString[10] = "owner=admin"; +$paramString[11] = "vision=rnd"; +$paramString[12] = ""; + +$method = array('select', 'delete'); +$print = 'vision,owner,module,section,key'; + $setting = new settingTest(); -r($setting->createDAOTest()) && p() && e(); \ No newline at end of file +r($setting->createDAOTest($paramString[0], $method[0])) && p($print) && e('rnd,system,common,global,version'); //测试查询参数包含vision、owner、module、section、key的config数据 +r($setting->createDAOTest($paramString[1], $method[0])) && p() && e('0'); //测试查询参数包含vision、owner、module、key的config数据 +r($setting->createDAOTest($paramString[2], $method[0])) && p($print) && e('rnd,system,common,global,mode'); //测试查询参数包含owner、module、section、key的config数据 +r($setting->createDAOTest($paramString[3], $method[0])) && p($print) && e('rnd,system,common,,CRProduct'); //测试查询参数包含owner、module、key的config数据 +r($setting->createDAOTest($paramString[4], $method[0])) && p($print) && e('rnd,system,common,global,sn'); //测试查询参数包含module、section、key的config数据 +r($setting->createDAOTest($paramString[5], $method[0])) && p() && e('0'); //测试查询参数包含module、key的config数据 +r($setting->createDAOTest($paramString[6], $method[0])) && p($print) && e('rnd,system,common,safe,mode'); //测试查询参数包含section、key的config数据 +r($setting->createDAOTest($paramString[7], $method[0])) && p($print) && e('rnd,system,custom,,URSR'); //测试查询参数包含key的config数据 +r($setting->createDAOTest($paramString[8], $method[0])) && p($print) && e('rnd,system,story,,reviewRules'); //测试查询参数包含module的config数据 +r($setting->createDAOTest($paramString[9], $method[0])) && p($print) && e('rnd,system,common,xuanxuan,chatPort'); //测试查询参数包含section的config数据 +r($setting->createDAOTest($paramString[10], $method[0])) && p($print) && e('rnd,admin,my,common,blockInited'); //测试查询参数包含owner的config数据 +r($setting->createDAOTest($paramString[11], $method[0])) && p($print) && e('rnd,admin,my,common,blockInited'); //测试查询参数包含vision的config数据 +r($setting->createDAOTest($paramString[12], $method[0])) && p($print) && e('rnd,admin,my,common,blockInited'); //测试查询参数为空的config数据 +r($setting->createDAOTest($paramString[0], $method[0])) && p($print) && e('rnd,system,common,global,version'); //测试查询参数包含vision、owner、module、section、key的config数据 +r($setting->createDAOTest($paramString[1], $method[1])) && p() && e('0'); //测试删除参数包含vision、owner、module、key的config数据 +r($setting->createDAOTest($paramString[2], $method[1])) && p() && e('1'); //测试删除参数包含owner、module、section、key的config数据 +r($setting->createDAOTest($paramString[3], $method[1])) && p() && e('1'); //测试删除参数包含owner、module、key的config数据 +r($setting->createDAOTest($paramString[4], $method[1])) && p() && e('1'); //测试删除参数包含module、section、key的config数据 +r($setting->createDAOTest($paramString[5], $method[1])) && p() && e('0'); //测试删除参数包含module、key的config数据 +r($setting->createDAOTest($paramString[6], $method[1])) && p() && e('1'); //测试删除参数包含section、key的config数据 +r($setting->createDAOTest($paramString[7], $method[1])) && p() && e('2'); //测试删除参数包含key的config数据 +r($setting->createDAOTest($paramString[8], $method[1])) && p() && e('1'); //测试删除参数包含module的config数据 +r($setting->createDAOTest($paramString[9], $method[1])) && p() && e('7'); //测试删除参数包含section的config数据 +r($setting->createDAOTest($paramString[10], $method[1])) && p() && e('7'); //测试删除参数包含owner的config数据 +r($setting->createDAOTest($paramString[11], $method[1])) && p() && e('13'); //测试删除参数包含vision的config数据 +r($setting->createDAOTest($paramString[12], $method[1])) && p() && e('0'); //测试删除参数为空的config数据 + +system("./ztest init"); \ No newline at end of file diff --git a/test/model/setting/getsysandpersonalconfig.php b/test/model/setting/getsysandpersonalconfig.php old mode 100644 new mode 100755 index 8342b1ed77..37bf0dc94a --- a/test/model/setting/getsysandpersonalconfig.php +++ b/test/model/setting/getsysandpersonalconfig.php @@ -10,8 +10,18 @@ title=测试 settingModel->getSysAndPersonalConfig(); cid=1 pid=1 +测试account值为system，可正常查询system的数据 >> 1 +测试account值为admin，可正常查询system和admin的数据 >> 1 +测试account值为dev，可正常查询system和dev的数据 >> 1 +测试account值为空，可正常查询system的数据 >> 1 + */ +$accountList = array('system', 'admin', 'dev', ''); + $setting = new settingTest(); -r($setting->getSysAndPersonalConfigTest()) && p() && e(); \ No newline at end of file +r($setting->getSysAndPersonalConfigTest($accountList[0])) && p() && e('1'); //测试account值为system，可正常查询system的数据 +r($setting->getSysAndPersonalConfigTest($accountList[1])) && p() && e('1'); //测试account值为admin，可正常查询system和admin的数据 +r($setting->getSysAndPersonalConfigTest($accountList[2])) && p() && e('1'); //测试account值为dev，可正常查询system和dev的数据 +r($setting->getSysAndPersonalConfigTest($accountList[3])) && p() && e('1'); //测试account值为空，可正常查询system的数据 \ No newline at end of file diff --git a/test/model/setting/getursr.php b/test/model/setting/getursr.php old mode 100644 new mode 100755 index 6a0239cf07..6a53d9618c --- a/test/model/setting/getursr.php +++ b/test/model/setting/getursr.php @@ -10,8 +10,10 @@ title=测试 settingModel->getURSR(); cid=1 pid=1 +测试正常查询URSR >> 2 + */ $setting = new settingTest(); -r($setting->getURSRTest()) && p() && e(); \ No newline at end of file +r($setting->getURSRTest()) && p() && e('2'); //测试正常查询URSR \ No newline at end of file diff --git a/test/model/setting/getversion.php b/test/model/setting/getversion.php old mode 100644 new mode 100755 index 8c9a982342..d4e1ef6007 --- a/test/model/setting/getversion.php +++ b/test/model/setting/getversion.php @@ -10,8 +10,10 @@ title=测试 settingModel->getVersion(); cid=1 pid=1 +测试正常查询version >> 16.5 + */ $setting = new settingTest(); -r($setting->getVersionTest()) && p() && e(); \ No newline at end of file +r($setting->getVersionTest()) && p() && e('16.5'); //测试正常查询version \ No newline at end of file diff --git a/test/model/setting/setsn.php b/test/model/setting/setsn.php old mode 100644 new mode 100755 index 2d8092362f..aec97680b2 --- a/test/model/setting/setsn.php +++ b/test/model/setting/setsn.php @@ -10,8 +10,12 @@ title=测试 settingModel->setSN(); cid=1 pid=1 +测试正常设置SN >> 1 + */ $setting = new settingTest(); -r($setting->setSNTest()) && p() && e(); \ No newline at end of file +r($setting->setSNTest()) && p() && e('1'); //测试正常设置SN + +system("./ztest init"); \ No newline at end of file diff --git a/test/model/setting/snneededupdate.php b/test/model/setting/snneededupdate.php old mode 100644 new mode 100755 index c1c0b73aa0..f04a3505d0 --- a/test/model/setting/snneededupdate.php +++ b/test/model/setting/snneededupdate.php @@ -10,8 +10,22 @@ title=测试 settingModel->snNeededUpdate(); cid=1 pid=1 +测试sn值为空，返回true >> 1 +测试sn值为281602d8ff5ee7533eeafd26eda4e776，返回true >> 1 +测试sn值为9bed3108092c94a0db2b934a46268b4a，返回true >> 1 +测试sn值为8522dd4d76762a49d02261ddbe4ad432，返回true >> 1 +测试sn值为13593e340ee2bdffed640d0c4eed8bec，返回true >> 1 +测试sn值为error，返回false >> 0 + */ +$snList = array('', '281602d8ff5ee7533eeafd26eda4e776', '9bed3108092c94a0db2b934a46268b4a', '8522dd4d76762a49d02261ddbe4ad432', '13593e340ee2bdffed640d0c4eed8bec', 'error'); + $setting = new settingTest(); -r($setting->snNeededUpdateTest()) && p() && e(); \ No newline at end of file +r($setting->snNeededUpdateTest($snList[0])) && p() && e('1'); //测试sn值为空，返回true +r($setting->snNeededUpdateTest($snList[1])) && p() && e('1'); //测试sn值为281602d8ff5ee7533eeafd26eda4e776，返回true +r($setting->snNeededUpdateTest($snList[2])) && p() && e('1'); //测试sn值为9bed3108092c94a0db2b934a46268b4a，返回true +r($setting->snNeededUpdateTest($snList[3])) && p() && e('1'); //测试sn值为8522dd4d76762a49d02261ddbe4ad432，返回true +r($setting->snNeededUpdateTest($snList[4])) && p() && e('1'); //测试sn值为13593e340ee2bdffed640d0c4eed8bec，返回true +r($setting->snNeededUpdateTest($snList[5])) && p() && e('0'); //测试sn值为error，返回false \ No newline at end of file diff --git a/test/model/setting/updateversion.php b/test/model/setting/updateversion.php old mode 100644 new mode 100755 index 150d77e580..171c1d2068 --- a/test/model/setting/updateversion.php +++ b/test/model/setting/updateversion.php @@ -10,8 +10,22 @@ title=测试 settingModel->updateVersion(); cid=1 pid=1 +测试version值为16.5，添加数据 >> 16.5 +测试version值为max3.0，更新数据 >> max3.0 +测试version值为max2.0，更新数据 >> max2.0 +测试version值为biz6.5，更新数据 >> biz6.5 +测试version值为0，更新数据 >> 0 + */ +$versionList = array('16.5', 'max3.0', 'max2.0', 'biz6.5', '0'); + $setting = new settingTest(); -r($setting->updateVersionTest()) && p() && e(); \ No newline at end of file +r($setting->updateVersionTest($versionList[0])) && p('1:value') && e('16.5'); //测试version值为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，更新数据 + +system("./ztest init"); \ No newline at end of file