diff --git a/test/class/api.class.php b/test/class/api.class.php index 77100bc680..36452dee5c 100644 --- a/test/class/api.class.php +++ b/test/class/api.class.php @@ -74,12 +74,17 @@ class apiTest return $objects; } - public function updateTest($apiID) + public function updateTest($apiID, $params, $confirm = true) { + global $tester; + $_POST = $params; + $objects = $this->objectModel->update($apiID); if(dao::isError()) return dao::getError(); + if($confirm) $tester->dao->delete()->from(TABLE_API)->where('id')->eq($apiID)->exec(); + return $objects; } @@ -120,12 +125,14 @@ class apiTest return $objects; } - public function getReleaseListByApiTest($libID) + public function getReleaseListByApiTest($libID, $id = 0, $confirm = true) { $objects = $this->objectModel->getReleaseListByApi($libID); if(dao::isError()) return dao::getError(); + if($confirm) $this->objectModel->deleteRelease($objects[$id]->id); + return $objects; } diff --git a/test/model/api/createdemodata.php b/test/model/api/createdemodata.php deleted file mode 100644 index a4d293d1ab..0000000000 --- a/test/model/api/createdemodata.php +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env php -createDemoData(); -cid=1 -pid=1 - -*/ - -$api = new apiTest(); - -r($api->createDemoDataTest()) && p() && e(); diff --git a/test/model/api/getreleaselistbyapi.php b/test/model/api/getreleaselistbyapi.php index cc4fc2c567..f9d0fa231b 100644 --- a/test/model/api/getreleaselistbyapi.php +++ b/test/model/api/getreleaselistbyapi.php @@ -12,6 +12,17 @@ pid=1 */ +global $tester; $api = new apiTest(); -r($api->getReleaseListByApiTest()) && p() && e(); \ No newline at end of file +$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->getReleaseListByApiTest($release->lib, $release->id)) && p("{$release->id}:lib") && e('910'); //获取刚插入的发布信息 + +//system("./ztest init"); diff --git a/test/model/api/getstructlistbyrelease.php b/test/model/api/getstructlistbyrelease.php index 387e9040ca..a8aeb8e44e 100644 --- a/test/model/api/getstructlistbyrelease.php +++ b/test/model/api/getstructlistbyrelease.php @@ -12,6 +12,38 @@ pid=1 */ +global $tester; $api = new apiTest(); -r($api->getStructListByReleaseTest()) && p() && e(); \ No newline at end of file +$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()) && p() && e(); +r($api->getApiListByReleaseTest($release)) && p('0:lib') && e('910'); //创建api后创建发布,使用发布查找api +//system("./ztest init"); diff --git a/test/model/api/request.php b/test/model/api/request.php deleted file mode 100644 index 7fedf37daa..0000000000 --- a/test/model/api/request.php +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env php -request(); -cid=1 -pid=1 - -*/ - -$api = new apiTest(); - -r($api->requestTest()) && p() && e(); \ No newline at end of file diff --git a/test/model/api/update.php b/test/model/api/update.php index ac31bbfffe..b243754af7 100644 --- a/test/model/api/update.php +++ b/test/model/api/update.php @@ -32,8 +32,30 @@ $data = array( 'responseExample' => '' ); +$editData = array( + 'lib' => 910, + 'module' => 0, + 'title' => 'edittestapi', + '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; +$editApi = $editData; -$apiInfo = $api->createTest($normalApi); +$apiInfo = $api->createTest($normalApi, false); -r($api->updateTest()) && p() && e(); +r($api->updateTest($apiInfo->id, $editApi)) && p('0:new') && e('edittestapi'); //修改一个刚创建的api + +//system("./ztest init");