From 6a6103e350da2cae2a83ea9f2881f9e4543a2d8f Mon Sep 17 00:00:00 2001 From: tianshujie Date: Fri, 12 Aug 2022 16:48:13 +0800 Subject: [PATCH] * * Modified testcase of api. --- test/class/api.class.php | 3 +- test/model/api/create.php | 22 +++++++------- test/model/api/createstruct.php | 6 ++-- test/model/api/deleterelease.php | 17 +++-------- test/model/api/getlistbymoduleid.php | 14 ++++----- test/model/api/getreleaselistbyapi.php | 2 +- test/model/api/getstructlistbyrelease.php | 36 +++-------------------- test/model/api/publishlib.php | 6 ++-- test/model/api/update.php | 6 ++-- test/model/api/updatestruct.php | 6 ++-- 10 files changed, 44 insertions(+), 74 deletions(-) diff --git a/test/class/api.class.php b/test/class/api.class.php index 4d16170329..29e8a21340 100644 --- a/test/class/api.class.php +++ b/test/class/api.class.php @@ -213,13 +213,12 @@ class apiTest public function getReleaseListByApiTest($libID, $id = 0, $confirm = true) { $objects = $this->objectModel->getReleaseListByApi($libID); - a($objects); if(dao::isError()) return dao::getError(); if($confirm) $this->objectModel->deleteRelease($objects[$id]->id); - return $objects; + return $objects[$id]; } /** diff --git a/test/model/api/create.php b/test/model/api/create.php index ab436b1ada..60de475ea4 100755 --- a/test/model/api/create.php +++ b/test/model/api/create.php @@ -2,6 +2,7 @@ switchDB(); su('admin'); /** @@ -10,22 +11,22 @@ title=测试 apiModel->create(); cid=1 pid=1 -测试创建api >> 910 -测试没有lib创建api >> 『API Library』should not be blank. -测试没有title创建api >> 『Name』should not be blank. -测试没有path创建api >> 『Request Path』should not be blank. +测试创建api >> 920 +测试没有lib创建api >> 『所属接口库』不能为空。 +测试没有title创建api >> 『接口名称』不能为空。 +测试没有path创建api >> 『请求路径』不能为空。 */ $api = new apiTest(); $data = array( - 'lib' => 910, + 'lib' => 920, 'module' => 0, 'title' => 'testapi', 'protocol' => 'HTTP', 'method' => 'GET', - 'path' => '/api/test/id', + 'path' => '/api/test/id/test', 'requestType' => 'application/json', 'status' => 'done', 'owner' => 'admin', @@ -48,7 +49,8 @@ $emptyTitleApi['title'] = ''; $emptyPathApi = $data; $emptyPathApi['path'] = ''; -r($api->createTest($normalApi)) && p('lib') && e('910'); //测试创建api -r($api->createTest($emptyLibApi)) && p('lib:0') && e('『API Library』should not be blank.'); //测试没有lib创建api -r($api->createTest($emptyTitleApi)) && p('title:0') && e('『Name』should not be blank.'); //测试没有title创建api -r($api->createTest($emptyPathApi)) && p('path:0') && e('『Request Path』should not be blank.'); //测试没有path创建api \ No newline at end of file +r($api->createTest($normalApi)) && p('lib') && e('920'); //测试创建api +r($api->createTest($emptyLibApi)) && p('lib:0') && e('『所属接口库』不能为空。'); //测试没有lib创建api +r($api->createTest($emptyTitleApi)) && p('title:0') && e('『接口名称』不能为空。'); //测试没有title创建api +r($api->createTest($emptyPathApi)) && p('path:0') && e('『请求路径』不能为空。'); //测试没有path创建api +$db->restoreDB(); diff --git a/test/model/api/createstruct.php b/test/model/api/createstruct.php index 09ab461963..6cd767dcd6 100755 --- a/test/model/api/createstruct.php +++ b/test/model/api/createstruct.php @@ -2,6 +2,7 @@ switchDB(); su('admin'); /** @@ -11,7 +12,7 @@ cid=1 pid=1 创建数据结构 >> struct -创建没有结构名的数据结构 >> 『Name』should not be blank. +创建没有结构名的数据结构 >> 『结构名』不能为空。 */ @@ -35,4 +36,5 @@ $normalStruct->addedBy = $tester->app->user->account; $normalStruct->addedDate = helper::now(); r($api->createStructTest($normalStruct)) && p('name') && e('struct'); //创建数据结构 -r($api->createStructTest($emptyNameStruct)) && p('name:0') && e('『Name』should not be blank.'); //创建没有结构名的数据结构 \ No newline at end of file +r($api->createStructTest($emptyNameStruct)) && p('name:0') && e('『结构名』不能为空。'); //创建没有结构名的数据结构 +$db->restoreDB(); diff --git a/test/model/api/deleterelease.php b/test/model/api/deleterelease.php index 90b7b98fd1..c1bf5a3286 100755 --- a/test/model/api/deleterelease.php +++ b/test/model/api/deleterelease.php @@ -2,6 +2,7 @@ switchDB(); su('admin'); /** @@ -10,20 +11,10 @@ title=测试 apiModel->deleteRelease(); cid=1 pid=1 -删除一个创建的发布 >> 0 +删除一个发布 >> 1 */ global $tester; -$api = new apiTest(); - -$normalRelease = new stdclass(); -$normalRelease->version = 'Version1'; -$normalRelease->desc = ''; -$normalRelease->lib = 910; -$normalRelease->addedBy = $tester->app->user->account; -$normalRelease->addedDate = helper::now(); - -$release = $api->publishLibTest($normalRelease, false); - -r($api->deleteReleaseTest($release->id, $release->lib)) && p('') && e('0'); //删除一个创建的发布 \ No newline at end of file +r($api->deleteReleaseTest(1, 1)) && p('id') && e('1'); //删除一个发布 +$db->restoreDB(); diff --git a/test/model/api/getlistbymoduleid.php b/test/model/api/getlistbymoduleid.php index 2ab0ac94e1..11f215079f 100755 --- a/test/model/api/getlistbymoduleid.php +++ b/test/model/api/getlistbymoduleid.php @@ -10,16 +10,16 @@ title=测试 apiModel->getListByModuleId(); cid=1 pid=1 -通过正常的libID、moduleID、releaseID查询api信息 >> 获取token -通过正常的libID、moduleID,不传releaseID,查询api信息 >> 获取我的个人信息 -通过正常的libID,不传moduleID、releaseID查询api信息 >> 获取token +通过正常的libID、moduleID、releaseID查询api信息 >> 获取反馈列表 +通过正常的libID、moduleID,不传releaseID,查询api信息 >> 0 +通过正常的libID,不传moduleID、releaseID查询api信息 >> 0 通过不存在的libID,moduleID,releaseID查询api信息 >> 0 */ $api = new apiTest(); -r($api->getListByModuleIdTest(1, 1, 1)) && p('title') && e('获取token'); //通过正常的libID、moduleID、releaseID查询api信息 -r($api->getListByModuleIdTest(1, 1, 0)) && p('title') && e('获取我的个人信息'); //通过正常的libID、moduleID,不传releaseID,查询api信息 -r($api->getListByModuleIdTest(1, 0, 0)) && p('title') && e('获取token'); //通过正常的libID,不传moduleID、releaseID查询api信息 -r($api->getListByModuleIdTest(0, 0, 0)) && p('title') && e('0'); //通过不存在的libID,moduleID,releaseID查询api信息 \ No newline at end of file +r($api->getListByModuleIdTest(1950, 6392, 1)) && p('title') && e('获取反馈列表'); //通过正常的libID、moduleID、releaseID查询api信息 +r($api->getListByModuleIdTest(1950, 6396, 0)) && p('title') && e('0'); //通过正常的libID、moduleID,不传releaseID,查询api信息 +r($api->getListByModuleIdTest(1, 0, 0)) && p('title') && e('0'); //通过正常的libID,不传moduleID、releaseID查询api信息 +r($api->getListByModuleIdTest(0, 0, 0)) && p('title') && e('0'); //通过不存在的libID,moduleID,releaseID查询api信息 diff --git a/test/model/api/getreleaselistbyapi.php b/test/model/api/getreleaselistbyapi.php index 503d3397a5..d070aa0d2e 100755 --- a/test/model/api/getreleaselistbyapi.php +++ b/test/model/api/getreleaselistbyapi.php @@ -25,4 +25,4 @@ $normalRelease->addedBy = $tester->app->user->account; $normalRelease->addedDate = helper::now(); $release = $api->publishLibTest($normalRelease, false); -r($api->getReleaseListByApiTest($release->lib, $release->id)) && p("{$release->id}:lib") && e('910'); //获取刚插入的发布信息 \ No newline at end of file +r($api->getReleaseListByApiTest($release->lib, $release->id)) && p("lib") && e('910'); //获取刚插入的发布信息 diff --git a/test/model/api/getstructlistbyrelease.php b/test/model/api/getstructlistbyrelease.php index 1c3b5e0ce5..36d49a6969 100755 --- a/test/model/api/getstructlistbyrelease.php +++ b/test/model/api/getstructlistbyrelease.php @@ -10,41 +10,13 @@ title=测试 apiModel->getStructListByRelease(); cid=1 pid=1 -创建api后创建发布，使用发布查找api >> 910 +获取没有接口库的接口文档的名称 >> editStruct +获取所属接口库ID为1的接口文档的名称 >> user */ global $tester; $api = new apiTest(); -$data = array( - 'lib' => 910, - 'module' => 0, - 'title' => 'testapi', - 'protocol' => 'HTTP', - 'method' => 'GET', - 'path' => '/api/test/id', - 'requestType' => 'application/json', - 'status' => 'done', - 'owner' => 'admin', - 'type' => 'formData', - 'params' => '{"header":[],"params":[],"paramsType":"","query":[]}', - 'desc' => '', - 'paramsExample' => '', - 'response' => '[]', - 'responseExample' => '' -); -$normalApi = $data; - -$normalRelease = new stdclass(); -$normalRelease->version = 'Version1'; -$normalRelease->desc = ''; -$normalRelease->lib = 910; -$normalRelease->addedBy = $tester->app->user->account; -$normalRelease->addedDate = helper::now(); - -$apiInfo = $api->createTest($normalApi, false); -$release = $api->publishLibTest($normalRelease, false); - -r($api->getStructListByReleaseTest($release->lib)) && p('') && e(''); -//r($api->getApiListByReleaseTest($release)) && p('0:lib') && e('910'); //创建api后创建发布，使用发布查找api \ No newline at end of file +r($api->getStructListByReleaseTest('', 'where lib = 0')) && p('2:name') && e('editStruct'); // 获取没有接口库的接口文档的名称 +r($api->getStructListByReleaseTest('', 'where lib = 1')) && p('0:name') && e('user'); // 获取所属接口库ID为1的接口文档的名称 diff --git a/test/model/api/publishlib.php b/test/model/api/publishlib.php index 77438e0888..a9827eecd2 100755 --- a/test/model/api/publishlib.php +++ b/test/model/api/publishlib.php @@ -10,7 +10,7 @@ title=测试 apiModel->publishLib(); cid=1 pid=1 -没有版本名的发布 >> 『Version』should not be blank. +没有版本名的发布 >> 『版本』不能为空。 正常的发布 >> Version1 */ @@ -32,5 +32,5 @@ $normalRelease->lib = 910; $normalRelease->addedBy = $tester->app->user->account; $normalRelease->addedDate = helper::now(); -r($api->publishLibTest($emptyBuildRelease)) && p('version:0') && e('『Version』should not be blank.'); //没有版本名的发布 -r($api->publishLibTest($normalRelease)) && p('version') && e('Version1'); //正常的发布 \ No newline at end of file +r($api->publishLibTest($emptyBuildRelease)) && p('version:0') && e('『版本』不能为空。'); //没有版本名的发布 +r($api->publishLibTest($normalRelease)) && p('version') && e('Version1'); //正常的发布 diff --git a/test/model/api/update.php b/test/model/api/update.php index 4ebba341ba..f4872761e2 100755 --- a/test/model/api/update.php +++ b/test/model/api/update.php @@ -2,6 +2,7 @@ switchDB(); su('admin'); /** @@ -22,7 +23,7 @@ $data = array( 'title' => 'testapi', 'protocol' => 'HTTP', 'method' => 'GET', - 'path' => '/api/test/id', + 'path' => '/api/test/test', 'requestType' => 'application/json', 'status' => 'done', 'owner' => 'admin', @@ -57,4 +58,5 @@ $editApi = $editData; $apiInfo = $api->createTest($normalApi, false); -r($api->updateTest($apiInfo->id, $editApi)) && p('0:new') && e('edittestapi'); //修改一个刚创建的api \ No newline at end of file +r($api->updateTest($apiInfo->id, $editApi)) && p('0:new') && e('edittestapi'); //修改一个刚创建的api +$db->restoreDB(); diff --git a/test/model/api/updatestruct.php b/test/model/api/updatestruct.php index 28cf08cae9..601d6b69e5 100755 --- a/test/model/api/updatestruct.php +++ b/test/model/api/updatestruct.php @@ -2,6 +2,7 @@ switchDB(); su('admin'); /** @@ -11,7 +12,7 @@ cid=1 pid=1 正常的修改 >> editStruct -没有名称的修改 >> 『Name』should not be blank. +没有名称的修改 >> 『结构名』不能为空。 */ @@ -40,4 +41,5 @@ $emptyNameEditStruct['name'] = ''; $struct = $api->createStructTest($normalStruct, false); r($api->updateStructTest($struct->id, $normalEditStruct, false)) && p('0:new') && e('editStruct'); //正常的修改 -r($api->updateStructTest($struct->id, $emptyNameEditStruct)) && p('name:0') && e('『Name』should not be blank.'); //没有名称的修改 \ No newline at end of file +r($api->updateStructTest($struct->id, $emptyNameEditStruct)) && p('name:0') && e('『结构名』不能为空。'); //没有名称的修改 +$db->restoreDB();