Merge branch 'sprint/scx_testcase' of https://gitlab.zcorp.cc/easycorp/zentaopms into scx_testcase

test/model/api/createdemodata.php

@@ -1,17 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/api.class.php';
-su('admin');
-
-/**
-
-title=测试 apiModel->createDemoData();
-cid=1
-pid=1
-
-*/
-
-$api = new apiTest();
-
-r($api->createDemoDataTest()) && p() && e();

test/model/api/getreleaselistbyapi.php

@@ -12,6 +12,17 @@ pid=1
 
 */
 
+global $tester;
 $api = new apiTest();
 
-r($api->getReleaseListByApiTest()) && p() && e();
+$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");

test/model/api/getstructlistbyrelease.php

@@ -12,6 +12,38 @@ pid=1
 
 */
 
+global $tester;
 $api = new apiTest();
 
-r($api->getStructListByReleaseTest()) && p() && e();
+$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");

test/model/api/request.php

@@ -1,17 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(dirname(dirname(__FILE__))) . '/lib/init.php';
-include dirname(dirname(dirname(__FILE__))) . '/class/api.class.php';
-su('admin');
-
-/**
-
-title=测试 apiModel->request();
-cid=1
-pid=1
-
-*/
-
-$api = new apiTest();
-
-r($api->requestTest()) && p() && e();

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");