diff --git a/PyDemo/data/addAudltCard.chlsj b/PyDemo/data/addAudltCard.chlsj new file mode 100644 index 0000000..c6ef8cd --- /dev/null +++ b/PyDemo/data/addAudltCard.chlsj @@ -0,0 +1 @@ +[{"status":"COMPLETE","method":"POST","protocolVersion":"HTTP/1.1","scheme":"http","host":"10.88.88.141","port":30131,"actualPort":30131,"path":"/api/perRelated/addAudltCard","query":null,"tunnel":false,"keptAlive":true,"webSocket":false,"remoteAddress":"10.88.88.141/10.88.88.141","clientAddress":"/127.0.0.1","clientPort":58438,"times":{"start":"2021-03-12T10:07:03.305+08:00","requestBegin":"2021-03-12T10:07:03.305+08:00","requestComplete":"2021-03-12T10:07:03.305+08:00","responseBegin":"2021-03-12T10:07:03.497+08:00","end":"2021-03-12T10:07:03.497+08:00"},"durations":{"total":192,"dns":null,"connect":null,"ssl":null,"request":0,"response":0,"latency":192},"speeds":{"overall":"12427","request":"0","response":"0"},"totalSize":"2386","request":{"sizes":{"headers":486,"body":634},"mimeType":"application/x-www-form-urlencoded","charset":"UTF-8","contentEncoding":null,"header":{"firstLine":"POST /api/perRelated/addAudltCard HTTP/1.1","headers":[{"name":"Host","value":"10.88.88.141:30131"},{"name":"Content-Length","value":"634"},{"name":"Accept","value":"application/json, text/plain, */*"},{"name":"User-Agent","value":"Mozilla/5.0 (Windows NT 6.1; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/88.0.4324.182 Safari/537.36"},{"name":"Content-Type","value":"application/x-www-form-urlencoded;charset=UTF-8"},{"name":"Origin","value":"http://10.88.88.141:6006"},{"name":"Referer","value":"http://10.88.88.141:6006/"},{"name":"Accept-Encoding","value":"gzip, deflate"},{"name":"Accept-Language","value":"zh-CN,zh;q=0.9"},{"name":"Connection","value":"keep-alive"}]},"body":{"text":"{\"params\":{\"adultAddressregion\":\"3202000000\",\"adultAddressdistrict\":\"测试\",\"adultCountryCode\":\"156\",\"adultNationCode\":\"1001\",\"adultNoType\":\"2\",\"adultHabiCode\":\"32021100\",\"unitCode\":\"3202112002\",\"adultAccountCode\":1002,\"adultResiCode\":1,\"adultNo\":\"9999999999999\",\"adultName\":\"测试\",\"adultSex\":\"1\",\"adultBirthday\":\"2015-03-03\",\"adultMobile\":\"19999999999\",\"adultHabiaddress\":\"测试\",\"adultArtimove\":0,\"adultIfdead\":0,\"adultHereCode\":1001,\"adultCreatesite\":\"3202112002\",\"adultCreatemanName\":\"马山山\",\"adultCreateman\":\"3202112002008\",\"adultCreatesiteName\":\"马山社区\"},\"headtoken\":\"ci3fxE80WQ7XyurO4/IKRcHql4tf3Xw/fu+VnRGKtCw=\"}","charset":"UTF-8"}},"response":{"status":200,"sizes":{"headers":427,"body":839},"mimeType":"text/plain","charset":"UTF-8","contentEncoding":"gzip","header":{"firstLine":"HTTP/1.1 200 OK","headers":[{"name":"Server","value":"nginx"},{"name":"Date","value":"Fri, 12 Mar 2021 01:59:45 GMT"},{"name":"Content-Type","value":"text/plain; charset=UTF-8"},{"name":"Transfer-Encoding","value":"chunked"},{"name":"access-control-allow-origin","value":"*"},{"name":"access-control-allow-headers","value":"Origin, X-Requested-With, Content-Type, Accept,Access-Control-Allow-Origin"},{"name":"access-control-allow-methods","value":"GET, POST,OPTIONS"},{"name":"Content-Encoding","value":"gzip"},{"name":"Proxy-Connection","value":"keep-alive"}]},"body":{"text":"{\"callTime\":\"2021-03-12 10:05:01\",\"code\":null,\"data\":{\"adultInforms\":[],\"adultInquireBean\":null,\"inocStationList\":[],\"refuseinocList\":[],\"tdAdult\":{\"accountName\":\"本县\",\"adultAccountCode\":1002,\"adultAccountStr\":null,\"adultAddressdistrict\":\"测试\",\"adultAddressregion\":\"3202000000\",\"adultAparetel\":null,\"adultApptime\":null,\"adultArtimove\":0,\"adultBirthday\":\"2015-03-03 00:00:00\",\"adultBirthdaystr\":null,\"adultCode\":\"3202112002815000002\",\"adultCodeStr\":null,\"adultCountryCode\":\"156\",\"adultCreatedate\":\"2021-03-12 10:05:01\",\"adultCreateman\":\"3202112002008\",\"adultCreatemanName\":\"马山山\",\"adultCreatemanNo\":null,\"adultCreatesite\":\"3202112002\",\"adultCreatesiteName\":\"马山社区\",\"adultCurdepartment\":\"3202112002\",\"adultCurdepartmentName\":\"马山社区\",\"adultDeaddate\":null,\"adultDelmark\":0,\"adultDeltime\":null,\"adultEduCode\":null,\"adultEwmCard\":null,\"adultFatherno\":null,\"adultFathernoType\":null,\"adultGuard\":null,\"adultHabiCode\":\"32021100\",\"adultHabiStr\":null,\"adultHabiaddress\":\"测试\",\"adultHereCode\":1001,\"adultHereStr\":null,\"adultIfapp\":0,\"adultIfdead\":0,\"adultIfwxin\":0,\"adultJkdaCode\":null,\"adultJobCode\":null,\"adultLeavedate\":\"2021-03-12 10:05:01\",\"adultLock\":0,\"adultMarry\":null,\"adultMobile\":\"19999999999\",\"adultMotherno\":null,\"adultMothernoType\":null,\"adultName\":\"测试\",\"adultNationCode\":\"1001\",\"adultNo\":\"9999999999999\",\"adultNoType\":\"2\",\"adultRelCode\":null,\"adultRemark\":null,\"adultResiCode\":1,\"adultResiStr\":null,\"adultSchCode\":null,\"adultSchName\":null,\"adultSex\":\"1\",\"adultTypeCode\":null,\"adultWxintime\":null,\"age\":6,\"createDate\":\"2021-03-12 10:05:01\",\"createManCode\":\"3202112002008\",\"empCode\":null,\"habiName\":\"滨湖区\",\"hasRefInoc\":0,\"hereName\":\"在册\",\"ifInform\":null,\"ifInquire\":null,\"isqr\":0,\"modifyDate\":\"2021-03-12 10:05:01\",\"modifyManCode\":\"3202112002008\",\"modifyUnitCode\":\"3202112002\",\"moveDate\":null,\"photoUrl\":null,\"resiName\":\"常住\",\"showPhotoUrl\":null,\"sysEditDate\":null,\"type\":null,\"unitCode\":null,\"unitSimpname\":null},\"tdAdultInoculation\":[],\"varIndex\":[]},\"msg\":\"返回成功\",\"success\":true}","charset":"UTF-8","decoded":true}}}] \ No newline at end of file diff --git a/PyDemo/page/perRelated/addAudltCard_request.json b/PyDemo/page/perRelated/addAudltCard_request.json new file mode 100644 index 0000000..cd612f2 --- /dev/null +++ b/PyDemo/page/perRelated/addAudltCard_request.json @@ -0,0 +1,32 @@ +[ + { + "summary": "addAudltCard", + "body": { + "params": { + "adultAddressregion": "3202000000", + "adultAddressdistrict": "AUTO99", + "adultCountryCode": "156", + "adultNationCode": "1001", + "adultNoType": "2", + "adultHabiCode": "32021100", + "unitCode": "3202112002", + "adultAccountCode": 1002, + "adultResiCode": 1, + "adultNo": "$RandInt(10000000,99999999)", + "adultName": "AUTO99", + "adultSex": "1", + "adultBirthday": "2015-03-03", + "adultMobile": "19999999999", + "adultHabiaddress": "AUTO99", + "adultArtimove": 0, + "adultIfdead": 0, + "adultHereCode": 1001, + "adultCreatesite": "3202112002", + "adultCreatemanName": "马山山", + "adultCreateman": "3202112002008", + "adultCreatesiteName": "马山社区" + }, + "headtoken": "${headtoken}" + } + } +] \ No newline at end of file diff --git a/PyDemo/page/perRelated/addAudltCard_response.json b/PyDemo/page/perRelated/addAudltCard_response.json new file mode 100644 index 0000000..31fc702 --- /dev/null +++ b/PyDemo/page/perRelated/addAudltCard_response.json @@ -0,0 +1,100 @@ +[ + { + "summary": "addAudltCard", + "body": { + "callTime": "2021-03-12 10:05:01", + "code": null, + "data": { + "adultInforms": [], + "adultInquireBean": null, + "inocStationList": [], + "refuseinocList": [], + "tdAdult": { + "accountName": "本县", + "adultAccountCode": 1002, + "adultAccountStr": null, + "adultAddressdistrict": "AUTO99", + "adultAddressregion": "3202000000", + "adultAparetel": null, + "adultApptime": null, + "adultArtimove": 0, + "adultBirthday": "2015-03-03 00:00:00", + "adultBirthdaystr": null, + "adultCode": "3202112002815000002", + "adultCodeStr": null, + "adultCountryCode": "156", + "adultCreatedate": "2021-03-12 10:05:01", + "adultCreateman": "3202112002008", + "adultCreatemanName": "马山山", + "adultCreatemanNo": null, + "adultCreatesite": "3202112002", + "adultCreatesiteName": "马山社区", + "adultCurdepartment": "3202112002", + "adultCurdepartmentName": "马山社区", + "adultDeaddate": null, + "adultDelmark": 0, + "adultDeltime": null, + "adultEduCode": null, + "adultEwmCard": null, + "adultFatherno": null, + "adultFathernoType": null, + "adultGuard": null, + "adultHabiCode": "32021100", + "adultHabiStr": null, + "adultHabiaddress": "AUTO99", + "adultHereCode": 1001, + "adultHereStr": null, + "adultIfapp": 0, + "adultIfdead": 0, + "adultIfwxin": 0, + "adultJkdaCode": null, + "adultJobCode": null, + "adultLeavedate": "2021-03-12 10:05:01", + "adultLock": 0, + "adultMarry": null, + "adultMobile": "19999999999", + "adultMotherno": null, + "adultMothernoType": null, + "adultName": "AUTO99", + "adultNationCode": "1001", + "adultNo": "9999999999999", + "adultNoType": "2", + "adultRelCode": null, + "adultRemark": null, + "adultResiCode": 1, + "adultResiStr": null, + "adultSchCode": null, + "adultSchName": null, + "adultSex": "1", + "adultTypeCode": null, + "adultWxintime": null, + "age": 6, + "createDate": "2021-03-12 10:05:01", + "createManCode": "3202112002008", + "empCode": null, + "habiName": "滨湖区", + "hasRefInoc": 0, + "hereName": "在册", + "ifInform": null, + "ifInquire": null, + "isqr": 0, + "modifyDate": "2021-03-12 10:05:01", + "modifyManCode": "3202112002008", + "modifyUnitCode": "3202112002", + "moveDate": null, + "photoUrl": null, + "resiName": "常住", + "showPhotoUrl": null, + "sysEditDate": null, + "type": null, + "unitCode": null, + "unitSimpname": null + }, + "tdAdultInoculation": [], + "varIndex": [] + }, + "msg": "返回成功", + "success": true + } + } +] \ No newline at end of file diff --git a/PyDemo/page/perRelated/test_addAudltCard.yaml b/PyDemo/page/perRelated/test_addAudltCard.yaml new file mode 100644 index 0000000..709833d --- /dev/null +++ b/PyDemo/page/perRelated/test_addAudltCard.yaml @@ -0,0 +1,48 @@ +test_info: + title: perRelated + host: ${host} + scheme: http + method: POST + address: /api/perRelated/addAudltCard + mime_type: application/x-www-form-urlencoded + headers: ${headers} + timeout: 10 + file: false + cookies: false + premise: false +test_case: +- summary: addAudltCard + describe: test_addAudltCard + parameter: addAudltCard_request.json + check_body: + check_type: check_json + expected_code: 200 + expected_result: addAudltCard_response.json + check_db: + - check_type: mysql + execute_sql: select * from TD_ADULT where ADULT_CODE='${adultCode}' + expected_result: + - ADULT_CODE: ${adultCode} + ADULT_NAME: AUTO99 + ADULT_SEX: 1 + ADULT_BIRTHDAY: 2015-03-03 + ADULT_MOBILE: 19999999999 + - check_type: es + execute_sql: select * from adult where CHIL_NAME='AUTO99' + expected_result: + - CHIL_NAME: AUTO99 + CHIL_SEX: 1 + CHIL_MOBILE: 19999999999 + - CHIL_NAME: AUTO99 + CHIL_SEX: 1 + CHIL_MOBILE: 19999999999 + - check_type: solr + execute_sql: select * from adultsolr320000 where adultName='AUTO99' + expected_result: + - adultName: AUTO99 + adultSex: 1 + adultMobile: 19999999999 + - check_type: hbase + execute_sql: select * from TD_ADULT_YZ where ADULT_CODE=3202112002803000001 + expected_result: + - ADULT_CODE: 3202112002803000001 \ No newline at end of file diff --git a/PyDemo/page/register/test_addOrUpCurBact.yaml b/PyDemo/page/register/test_addOrUpCurBact.yaml index 7cd3653..4d87bb2 100644 --- a/PyDemo/page/register/test_addOrUpCurBact.yaml +++ b/PyDemo/page/register/test_addOrUpCurBact.yaml @@ -14,7 +14,7 @@ test_case: - summary: addOrUpCurBact describe: test_addOrUpCurBact parameter: addOrUpCurBact_request.json - check: + check_body: check_type: check_json expected_code: 200 expected_result: diff --git a/PyDemo/page/register/test_findParam.yaml b/PyDemo/page/register/test_findParam.yaml index 97e2010..70b1a9d 100644 --- a/PyDemo/page/register/test_findParam.yaml +++ b/PyDemo/page/register/test_findParam.yaml @@ -21,7 +21,7 @@ test_case: pageSize: 10 page: 0 headtoken: ${headtoken} - check: + check_body: check_type: check_json expected_code: 200 expected_result: diff --git a/PyDemo/page/register/test_getAdultCurbactList.yaml b/PyDemo/page/register/test_getAdultCurbactList.yaml index dbd7ad6..451ebd1 100644 --- a/PyDemo/page/register/test_getAdultCurbactList.yaml +++ b/PyDemo/page/register/test_getAdultCurbactList.yaml @@ -21,7 +21,7 @@ test_case: pageSize: 10 page: 0 headtoken: ${headtoken} - check: + check_body: check_type: check_json expected_code: 200 expected_result: getAdultCurbactList_response.json diff --git a/PyDemo/page/register/test_initCanSelInfo.yaml b/PyDemo/page/register/test_initCanSelInfo.yaml index 7db81a3..7ff2e00 100644 --- a/PyDemo/page/register/test_initCanSelInfo.yaml +++ b/PyDemo/page/register/test_initCanSelInfo.yaml @@ -14,7 +14,7 @@ test_case: - summary: initCanSelInfo describe: test_initCanSelInfo parameter: initCanSelInfo_request.json - check: + check_body: check_type: check_json expected_code: 200 expected_result: initCanSelInfo_response.json diff --git a/PyDemo/testcase/perRelated/test_addAudltCard.py b/PyDemo/testcase/perRelated/test_addAudltCard.py new file mode 100644 index 0000000..6058791 --- /dev/null +++ b/PyDemo/testcase/perRelated/test_addAudltCard.py @@ -0,0 +1,29 @@ +# -*- coding:utf-8 -*- +# @Time : 2021/2/2 +# @Author : Leo Zhang +# @File : test_addAudltCard.py +# **************************** +import os +import allure +import pytest +from comm.utils.readYaml import read_yaml_data +from comm.unit.initializePremise import init_premise +from comm.unit.apiSend import send_request +from comm.unit.checkResult import check_result +case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('.py', '.yaml') +case_path = os.path.dirname(case_yaml) +case_dict = read_yaml_data(case_yaml) + + +@allure.feature(case_dict["test_info"]["title"]) +class TestPerrelated: + + @pytest.mark.parametrize("case_data", case_dict["test_case"]) + @allure.story("test_addAudltCard") + def test_addAudltCard(self, case_data): + # 初始化请求：执行前置接口+替换关联变量 + test_info, case_data = init_premise(case_dict["test_info"], case_data, case_path) + # 发送当前接口 + code, data = send_request(test_info, case_data) + # 校验接口返回 + check_result(case_data, code, data) diff --git a/PyDemo/testcase/register/test_addOrUpCurBact.py b/PyDemo/testcase/register/test_addOrUpCurBact.py index 24bd202..94ff0b8 100644 --- a/PyDemo/testcase/register/test_addOrUpCurBact.py +++ b/PyDemo/testcase/register/test_addOrUpCurBact.py @@ -10,7 +10,7 @@ from comm.utils.readYaml import read_yaml_data from comm.unit.initializePremise import init_premise from comm.unit.apiSend import send_request from comm.unit.checkResult import check_result -case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('py', 'yaml') +case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('.py', '.yaml') case_path = os.path.dirname(case_yaml) case_dict = read_yaml_data(case_yaml) diff --git a/PyDemo/testcase/register/test_findParam.py b/PyDemo/testcase/register/test_findParam.py index 775f651..d6d82c1 100644 --- a/PyDemo/testcase/register/test_findParam.py +++ b/PyDemo/testcase/register/test_findParam.py @@ -10,7 +10,7 @@ from comm.utils.readYaml import read_yaml_data from comm.unit.initializePremise import init_premise from comm.unit.apiSend import send_request from comm.unit.checkResult import check_result -case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('py', 'yaml') +case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('.py', '.yaml') case_path = os.path.dirname(case_yaml) case_dict = read_yaml_data(case_yaml) diff --git a/PyDemo/testcase/register/test_getAdultCurbactList.py b/PyDemo/testcase/register/test_getAdultCurbactList.py index e543080..c92ea7d 100644 --- a/PyDemo/testcase/register/test_getAdultCurbactList.py +++ b/PyDemo/testcase/register/test_getAdultCurbactList.py @@ -10,7 +10,7 @@ from comm.utils.readYaml import read_yaml_data from comm.unit.initializePremise import init_premise from comm.unit.apiSend import send_request from comm.unit.checkResult import check_result -case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('py', 'yaml') +case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('.py', '.yaml') case_path = os.path.dirname(case_yaml) case_dict = read_yaml_data(case_yaml) diff --git a/PyDemo/testcase/register/test_initCanSelInfo.py b/PyDemo/testcase/register/test_initCanSelInfo.py index 73ee6dd..3e8a94e 100644 --- a/PyDemo/testcase/register/test_initCanSelInfo.py +++ b/PyDemo/testcase/register/test_initCanSelInfo.py @@ -10,7 +10,7 @@ from comm.utils.readYaml import read_yaml_data from comm.unit.initializePremise import init_premise from comm.unit.apiSend import send_request from comm.unit.checkResult import check_result -case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('py', 'yaml') +case_yaml = os.path.realpath(__file__).replace('testcase', 'page').replace('.py', '.yaml') case_path = os.path.dirname(case_yaml) case_dict = read_yaml_data(case_yaml) diff --git a/startup.py b/startup.py index dee643e..8257a57 100644 --- a/startup.py +++ b/startup.py @@ -28,7 +28,7 @@ if __name__ == '__main__': elif RC['auto_switch'] == 1: # 如果扫描路径为空在则取项目page目录 - if not os.path.exists(RC['scan_dir']): + if not RC['scan_dir']: RC['scan_dir'] = PAGE_DIR logging.info("根据手工编写用例，自动生成测试脚本，然后运行测试！") writeCase.write_case(RC['scan_dir'], auto_yaml=False)