Commit ef706103 authored by 陈梦月's avatar 陈梦月

v1.1.1

parent 00b125fb
jfaappapi @ cce34923
Subproject commit cce34923702afc788d249c785ed14a8ff42bfc15
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" />
</component>
</project>
\ No newline at end of file
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/getBankCardInfo 获取银行卡信息 #/api/v1/jfa/getBankCardInfo 获取银行卡信息
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/getBankCardInfo' % (self.ip) self.url = '%s/api/v1/jfa/getBankCardInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/authentication 实名认证 #/api/v1/jfa/authentication 实名认证
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -28,7 +28,7 @@ class Testauthentication(unittest.TestCase): ...@@ -28,7 +28,7 @@ class Testauthentication(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/managerRegister' % (self.ip) self.url = '%s/api/v1/jfa/authentication' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -54,8 +54,8 @@ class Testauthentication(unittest.TestCase): ...@@ -54,8 +54,8 @@ class Testauthentication(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#managerRegister 注册 #/api/v1/jfa/managerRegister 注册
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -28,7 +28,7 @@ class TestmanagerRegister(unittest.TestCase): ...@@ -28,7 +28,7 @@ class TestmanagerRegister(unittest.TestCase):
self.phone = gl.get_value('phone') self.phone = gl.get_value('phone')
(self.smstoken) = csendvc.sendVerificationCode(self.phone,"REGISTER") (self.smstoken) = csendvc.sendVerificationCode(self.phone,"REGISTER")
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/managerRegister' % (self.ip) self.url = '%s/api/v1/jfa/managerRegister' % (self.ip)
# 测试API入参 # 测试API入参
......
...@@ -22,7 +22,7 @@ def authentication(): ...@@ -22,7 +22,7 @@ def authentication():
token = clogin.testuserlogin() token = clogin.testuserlogin()
#测试API地址 #测试API地址
url = '%s/api/v1/manager/authentication' % (ip) url = '%s/api/v1/jfa/authentication' % (ip)
#测试API入参 #测试API入参
payloadData = { payloadData = {
...@@ -40,8 +40,8 @@ def authentication(): ...@@ -40,8 +40,8 @@ def authentication():
data = json.dumps(payloadData) data = json.dumps(payloadData)
headers = payloadHeader headers = payloadHeader
r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False) r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False)
# print(r) #print(r)
rd = r['data'] rd = r['body']
bankToken = rd['bankToken'] bankToken = rd['bankToken']
# print(smsToken) # print(smsToken)
return bankToken,token return bankToken,token
......
...@@ -22,7 +22,7 @@ def checkBankPassword(): ...@@ -22,7 +22,7 @@ def checkBankPassword():
token = clogin.testuserlogin() token = clogin.testuserlogin()
#测试API地址 #测试API地址
url = '%s/api/v1/manager/checkBankPassword' % (ip) url = '%s/api/v1/jfa/checkBankPassword' % (ip)
#测试API入参 #测试API入参
payloadData = {"bankPassword":"ad4cf4a936024af729ddf7e0cc536622179991ca"} payloadData = {"bankPassword":"ad4cf4a936024af729ddf7e0cc536622179991ca"}
...@@ -38,7 +38,7 @@ def checkBankPassword(): ...@@ -38,7 +38,7 @@ def checkBankPassword():
headers = payloadHeader headers = payloadHeader
r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False) r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False)
print(r) print(r)
rd = r['data'] rd = r['body']
bankToken = rd['bankToken'] bankToken = rd['bankToken']
# print(bankToken) # print(bankToken)
return bankToken,token return bankToken,token
......
...@@ -22,10 +22,11 @@ def checkIdCard(): ...@@ -22,10 +22,11 @@ def checkIdCard():
token = clogin.testuserlogin() token = clogin.testuserlogin()
#测试API地址 #测试API地址
url = '%s/api/v1/manager/checkIdCard' % (ip) url = '%s/api/v1/jfa/checkIdCard'% (ip)
#测试API入参 #测试API入参
payloadData = {"userRealName":"朱凌","idCardNum":"310115198407101954"} payloadData = {"userRealName":"朱凌",
"idCardNum":"310115198407101954"}
#测试API请求头设置 #测试API请求头设置
payloadHeader = { payloadHeader = {
...@@ -37,11 +38,11 @@ def checkIdCard(): ...@@ -37,11 +38,11 @@ def checkIdCard():
data = json.dumps(payloadData) data = json.dumps(payloadData)
headers = payloadHeader headers = payloadHeader
r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False) r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False)
# print(r) print(r)
rd = r['data'] rd = r['body']
bankToken = rd['bankToken'] bankToken = rd['bankToken']
# print(bankToken) # print(bankToken)
return bankToken,token return bankToken,token
# (bankToken,token) = checkIdCard() (bankToken,token) = checkIdCard()
# print(bankToken) print(bankToken)
# print(token) print(token)
\ No newline at end of file \ No newline at end of file
...@@ -25,7 +25,7 @@ def checkVerificationCode(phone,templateType): ...@@ -25,7 +25,7 @@ def checkVerificationCode(phone,templateType):
url = '%s/api/v1/manager/checkVerificationCode' % (ip) url = '%s/api/v1/manager/checkVerificationCode' % (ip)
#测试API入参 #测试API入参
payloadData = {"phone": phone, "templateType": templateType,"smsToken":} payloadData = {"phone": phone, "templateType": templateType,"smsToken":smsToken}
# print(payloadData) # print(payloadData)
...@@ -44,6 +44,6 @@ def checkVerificationCode(phone,templateType): ...@@ -44,6 +44,6 @@ def checkVerificationCode(phone,templateType):
smsToken = rd['smsToken'] smsToken = rd['smsToken']
# print(smsToken) # print(smsToken)
return smsToken,token return smsToken,token
# (smstoken,token) = sendVerificationCode("FORGET_PASSWORD") # (smstoken,token) = templateType("FORGET_PASSWORD")
# print(smstoken) # print(smstoken)
# print(token) # print(token)
...@@ -23,7 +23,7 @@ def sendVerificationCode(phone,templateType): ...@@ -23,7 +23,7 @@ def sendVerificationCode(phone,templateType):
#测试API地址 #测试API地址
url = '%s/api/v1/manager/sendVerificationCode' % (ip) url = '%s/api/v1/sms/sendVerificationCode' % (ip)
#测试API入参 #测试API入参
payloadData = {"phone": phone, "templateType": templateType} payloadData = {"phone": phone, "templateType": templateType}
...@@ -41,7 +41,7 @@ def sendVerificationCode(phone,templateType): ...@@ -41,7 +41,7 @@ def sendVerificationCode(phone,templateType):
headers = payloadHeader headers = payloadHeader
r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False) r = gp.Runmain().send_post(url=url,data=data,headers=headers,verify=False)
# print(r) # print(r)
rd = r['data'] rd = r['body']
smsToken = rd['smsToken'] smsToken = rd['smsToken']
# print(smsToken) # print(smsToken)
return smsToken return smsToken
...@@ -55,10 +55,12 @@ def checkVerificationCode(phone,templateType): ...@@ -55,10 +55,12 @@ def checkVerificationCode(phone,templateType):
(smsToken) = sendVerificationCode(phone, templateType) (smsToken) = sendVerificationCode(phone, templateType)
#测试API地址 #测试API地址
url = '%s/api/v1/manager/checkVerificationCode' % (ip) url = '%s/api/v1/sms/checkVerificationCode' % (ip)
#测试API入参 #测试API入参
payloadData = { "templateType": templateType,"smsToken":smsToken,"verifyCode":"888888"} payloadData = { "templateType": templateType,
"smsToken":smsToken,
"verifyCode":"888888"}
# print(payloadData) # print(payloadData)
#测试API请求头设置 #测试API请求头设置
......
...@@ -26,12 +26,12 @@ class TestsendVerificationCode(unittest.TestCase): ...@@ -26,12 +26,12 @@ class TestsendVerificationCode(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.phone = gl.get_value('phone') self.phone = gl.get_value('phone')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/sendVerificationCode' % (self.ip) self.url = '%s/api/v1/sms/sendVerificationCode' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
"phone": self.phone, "phone": self.phone,
"templateType": "REGISTER" "templateType": "LOGIN"
} }
# 测试API请求头设置 # 测试API请求头设置
...@@ -47,10 +47,11 @@ class TestsendVerificationCode(unittest.TestCase): ...@@ -47,10 +47,11 @@ class TestsendVerificationCode(unittest.TestCase):
def testsendVerificationCode(self): def testsendVerificationCode(self):
r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False) r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False)
ul.log.logger.info(r) ul.log.logger.info(r)
#print(r)
try: try:
self.assertEqual('用户已存在',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(3001, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -30,7 +30,7 @@ class TestcheckVerificationCode(unittest.TestCase): ...@@ -30,7 +30,7 @@ class TestcheckVerificationCode(unittest.TestCase):
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/checkVerificationCode' % (self.ip) self.url = '%s/api/v1/sms/checkVerificationCode' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
...@@ -55,8 +55,9 @@ class TestcheckVerificationCode(unittest.TestCase): ...@@ -55,8 +55,9 @@ class TestcheckVerificationCode(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) # 判断返回结果为True
self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/getManagerInfo 获取理财师信息 #/api/v1/jfa/getManagerInfo 获取理财师信息
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -26,7 +26,7 @@ class TestgetManagerInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetManagerInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/getManagerInfo' % (self.ip) self.url = '%s/api/v1/jfa/getManagerInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -44,12 +44,12 @@ class TestgetManagerInfo(unittest.TestCase): ...@@ -44,12 +44,12 @@ class TestgetManagerInfo(unittest.TestCase):
def testgetManagerInfo(self): def testgetManagerInfo(self):
r = gp.Runmain().send_get(url=self.url,params=self.params,headers=self.headers,verify=False) r = gp.Runmain().send_get(url=self.url,params=self.params,headers=self.headers,verify=False)
# print(r) print(r)
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -28,7 +28,7 @@ class Testauthentication(unittest.TestCase): ...@@ -28,7 +28,7 @@ class Testauthentication(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/authentication' % (self.ip) self.url = '%s/api/v1/jfa/authentication' % (self.ip)
self.realName = gl.get_value('realName') self.realName = gl.get_value('realName')
self.idCardNum = gl.get_value('idCardNum') self.idCardNum = gl.get_value('idCardNum')
...@@ -55,8 +55,8 @@ class Testauthentication(unittest.TestCase): ...@@ -55,8 +55,8 @@ class Testauthentication(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/changeBankCardInfo 更换银行卡 #/api/v1/jfa/changeBankCardInfo 更换银行卡
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -31,15 +31,15 @@ class TestchangeBankCardInfo(unittest.TestCase): ...@@ -31,15 +31,15 @@ class TestchangeBankCardInfo(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.bankPassword = gl.get_value('bankPassword') self.bankPassword = gl.get_value('bankPassword')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/changeBankCardInfo' % (self.ip) self.url = '%s/api/v1/jfa/changeBankCardInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
"bankArea": "CHINESE_MAINLAN", "bankArea": "chineseMainlan",
"bankCardNum": "8887", "bankCardNum": "8887",
"bankName": "中国建设银行", "bankName": "中国建设银行",
"bankCode": "CCB", "bankCode": "ccb",
"bankToken": self.banktoken, "bankToken": self.banktoken,
"bankPassword": self.bankPassword "bankPassword": self.bankPassword
} }
...@@ -63,8 +63,8 @@ class TestchangeBankCardInfo(unittest.TestCase): ...@@ -63,8 +63,8 @@ class TestchangeBankCardInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -30,7 +30,7 @@ class TestcheckBankPassword(unittest.TestCase): ...@@ -30,7 +30,7 @@ class TestcheckBankPassword(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.bankPassword = gl.get_value('bankPassword') self.bankPassword = gl.get_value('bankPassword')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/checkBankPassword' % (self.ip) self.url = '%s/api/v1/jfa/checkBankPassword' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -57,8 +57,8 @@ class TestcheckBankPassword(unittest.TestCase): ...@@ -57,8 +57,8 @@ class TestcheckBankPassword(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -28,14 +28,17 @@ class TestcheckIdCard(unittest.TestCase): ...@@ -28,14 +28,17 @@ class TestcheckIdCard(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.realName = gl.get_value('realName') self.bankToken = gl.get_value('bankToken')
self.idCardNum = gl.get_value('idCardNum') self.bankPassword = gl.get_value('bankPassword')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/checkIdCard' % (self.ip) self.url = '%s/api/v1/jfa/checkIdCard' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = {"userRealName":self.realName,"idCardNum":self.idCardNum} self.payloadData = {
"idCardNum":"310115198407101954",
"userRealName": "朱凌"
}
# 测试API请求头设置 # 测试API请求头设置
...@@ -53,11 +56,12 @@ class TestcheckIdCard(unittest.TestCase): ...@@ -53,11 +56,12 @@ class TestcheckIdCard(unittest.TestCase):
def testcheckIdCard(self): def testcheckIdCard(self):
r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False) r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False)
print(r)
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -27,13 +27,13 @@ class TestresetPassword(unittest.TestCase): ...@@ -27,13 +27,13 @@ class TestresetPassword(unittest.TestCase):
self.testplanid = gl.get_value('test_plan_id') self.testplanid = gl.get_value('test_plan_id')
self.phone = gl.get_value('phone') self.phone = gl.get_value('phone')
self.password = gl.get_value('password') self.password = gl.get_value('password')
(self.smstoken) = csendvc.checkVerificationCode(self.phone,"FORGET_PASSWORD") (self.smstoken) = csendvc.checkVerificationCode(self.phone,"forgetPassword")
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/forgetPassword' % (self.ip) self.url = '%s/api/v1/jfa/forgetPassword' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -61,8 +61,8 @@ class TestresetPassword(unittest.TestCase): ...@@ -61,8 +61,8 @@ class TestresetPassword(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/getBankCardInfo' % (self.ip) self.url = '%s/api/v1/jfa/getBankCardInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -26,7 +26,7 @@ class TestgetManagerStatisticInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetManagerStatisticInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/getManagerStatisticInfo' % (self.ip) self.url = '%s/api/v1/jfa/getManagerStatisticInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetManagerStatisticInfo(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetManagerStatisticInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -56,8 +56,8 @@ class Testlogin(unittest.TestCase): ...@@ -56,8 +56,8 @@ class Testlogin(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -29,7 +29,7 @@ class TestrefreshToken(unittest.TestCase): ...@@ -29,7 +29,7 @@ class TestrefreshToken(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/refreshToken' % (self.ip) self.url = '%s/api/v1/jfa/refreshToken' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -54,8 +54,8 @@ class TestrefreshToken(unittest.TestCase): ...@@ -54,8 +54,8 @@ class TestrefreshToken(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["status"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -31,7 +31,7 @@ class TestresetBankPassword(unittest.TestCase): ...@@ -31,7 +31,7 @@ class TestresetBankPassword(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/resetBankPassword' % (self.ip) self.url = '%s/api/v1/jfa/resetBankPassword' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -59,8 +59,8 @@ class TestresetBankPassword(unittest.TestCase): ...@@ -59,8 +59,8 @@ class TestresetBankPassword(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/resetPassword 重设登录密码 #/api/v1/jfa/resetPassword 修改登录密码
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,13 +27,13 @@ class TestresetPassword(unittest.TestCase): ...@@ -27,13 +27,13 @@ class TestresetPassword(unittest.TestCase):
self.testplanid = gl.get_value('test_plan_id') self.testplanid = gl.get_value('test_plan_id')
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
(self.smstoken) = csendvc.checkVerificationCode("18021047680","CHANGE_PASSWORD") (self.smstoken) = csendvc.checkVerificationCode("18021047680","changePassword")
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.password = gl.get_value('password') self.password = gl.get_value('password')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/resetPassword' % (self.ip) self.url = '%s/api/v1/jfa/resetPassword' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -62,8 +62,8 @@ class TestresetPassword(unittest.TestCase): ...@@ -62,8 +62,8 @@ class TestresetPassword(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -32,21 +32,24 @@ class TestsetBankCardInfo(unittest.TestCase): ...@@ -32,21 +32,24 @@ class TestsetBankCardInfo(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
self.idCardNum= gl.get_value('idCardNum') self.idCardNum= gl.get_value('idCardNum')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/setBankCardInfo' % (self.ip) self.url = '%s/api/v1/jfa/setBankCardInfo' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
"bankArea": "CHINESE_MAINLAN", "bankArea": "chineseMainlan",
"bankCardNum": "8887", "bankCardNum": "8887",
"bankPassword": "1987", "bankName": "中国建设银行",
"bankCode": "ccb",
"bankToken": self.banktoken, "bankToken": self.banktoken,
"bankPassword": "1987",
"idCardNum": self.idCardNum, "idCardNum": self.idCardNum,
"bankCode": "CCB",
"bankName": "中国建设银行"
} }
# 测试API请求头设置 # 测试API请求头设置
self.payloadHeader = { self.payloadHeader = {
'Content-Type': "application/json", 'Content-Type': "application/json",
...@@ -65,8 +68,8 @@ class TestsetBankCardInfo(unittest.TestCase): ...@@ -65,8 +68,8 @@ class TestsetBankCardInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/smsCodeLogin 验证码登陆 #/api/v1/sms/checkVerificationCode 验证码登陆
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,7 +27,7 @@ class TestsmsCodeLogin(unittest.TestCase): ...@@ -27,7 +27,7 @@ class TestsmsCodeLogin(unittest.TestCase):
self.testplanid = gl.get_value('test_plan_id') self.testplanid = gl.get_value('test_plan_id')
self.phone = gl.get_value('phone') self.phone = gl.get_value('phone')
(self.smstoken) = csendvc.sendVerificationCode(self.phone,"LOGIN") (self.smstoken) = csendvc.sendVerificationCode(self.phone,"login")
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
...@@ -61,8 +61,8 @@ class TestsmsCodeLogin(unittest.TestCase): ...@@ -61,8 +61,8 @@ class TestsmsCodeLogin(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestupdateNickName(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestupdateNickName(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/updateNickName' % (self.ip) self.url = '%s/api/v1/jfa/updateNickName' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -55,11 +55,12 @@ class TestupdateNickName(unittest.TestCase): ...@@ -55,11 +55,12 @@ class TestupdateNickName(unittest.TestCase):
def testupdateNickName(self): def testupdateNickName(self):
r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False) r = gp.Runmain().send_post(url=self.url,data=self.data,headers=self.headers,verify=False)
print(r)
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/product/getFundInfo?fundId=298708666109005821 查询基金详情 #/api/v1/fund/getFundInfo?fundId=298708666109005821 查询基金详情
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -26,7 +26,7 @@ class TestgetFundInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetFundInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/product/getFundInfo?fundId=298708666109005821' % (self.ip) self.url = '%s/api/v1/fund/getFundInfo?fundId=298708666109005821' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetFundInfo(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetFundInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -26,7 +26,7 @@ class TestgetFundInfoNavHisList(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetFundInfoNavHisList(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/product/getFundInfoNavHisList?fundId=298708666109005821&fundNavHisDataType=NEARLY_ONE_MONTH' % (self.ip) self.url = '%s/api/v1/fund/getFundInfoNavHisList?fundId=298708666109005821&fundNavHisDataType=nearlyOneMonth' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetFundInfoNavHisList(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetFundInfoNavHisList(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -26,7 +26,7 @@ class TestgetFundNavHisList(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetFundNavHisList(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/product/getFundNavHisList?fundId=298708666109005821&pageNumber=1&pageSize=20' % (self.ip) self.url = '%s/api/v1/fund/getFundNavHisList?fundId=298708666109005821&pageNumber=1&pageSize=20' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetFundNavHisList(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetFundNavHisList(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -32,7 +32,7 @@ class TestgetProductList(unittest.TestCase): ...@@ -32,7 +32,7 @@ class TestgetProductList(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/product/getProductList' % (self.ip) self.url = '%s/api/v1/fund/getProductList' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -60,8 +60,8 @@ class TestgetProductList(unittest.TestCase): ...@@ -60,8 +60,8 @@ class TestgetProductList(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestgetCustomerInfo(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestgetCustomerInfo(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/customer/getCustomerInfo' % (self.ip) self.url = '%s/api/v1/customer/getCustomerInfo' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -60,8 +60,8 @@ class TestgetCustomerInfo(unittest.TestCase): ...@@ -60,8 +60,8 @@ class TestgetCustomerInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TesteditCustomerRemark(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TesteditCustomerRemark(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/customer/editCustomerRemark' % (self.ip) self.url = '%s/api/v1/customer/editCustomerRemark' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -61,8 +61,8 @@ class TesteditCustomerRemark(unittest.TestCase): ...@@ -61,8 +61,8 @@ class TesteditCustomerRemark(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestgetCustomerOrders(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestgetCustomerOrders(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/customer/getCustomerOrders' % (self.ip) self.url = '%s/api/v1/order/getCustomerOrders' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -60,8 +60,8 @@ class TestgetCustomerOrders(unittest.TestCase): ...@@ -60,8 +60,8 @@ class TestgetCustomerOrders(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestgetCustomers(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestgetCustomers(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/customer/getCustomers' % (self.ip) self.url = '%s/api/v1/customer/getCustomers' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -60,8 +60,8 @@ class TestgetCustomers(unittest.TestCase): ...@@ -60,8 +60,8 @@ class TestgetCustomers(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestgetAssets(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestgetAssets(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/cashFlow/getAssets' % (self.ip) self.url = '%s/api/v1/jfa/getAssets' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -58,8 +58,8 @@ class TestgetAssets(unittest.TestCase): ...@@ -58,8 +58,8 @@ class TestgetAssets(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -33,7 +33,7 @@ class TestgetCashFlows(unittest.TestCase): ...@@ -33,7 +33,7 @@ class TestgetCashFlows(unittest.TestCase):
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/cashFlow/getCashFlows' % (self.ip) self.url = '%s/api/v1/withdrawal/getCashFlows' % (self.ip)
# 测试API入参 # 测试API入参
...@@ -61,8 +61,8 @@ class TestgetCashFlows(unittest.TestCase): ...@@ -61,8 +61,8 @@ class TestgetCashFlows(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200,r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -26,7 +26,7 @@ class TestgetBankCardInfo(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/message/getAdvertisementList?advertPosition=FUND_RECOMMEND' % (self.ip) self.url = '%s/api/v1/ad/getAdvertisementList?advertPosition=FUND_RECOMMEND' % (self.ip)
# 测试API入参 # 测试API入参
self.params = {} self.params = {}
...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetBankCardInfo(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/message/getMessages?msgType=CAPITAL 查询基金详情 (CAPITAL、CUSTOMER) #/api/v1/message/getMessages?msgType=CAPITAL 获取理财师系统消息 (CAPITAL、CUSTOMER)
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -46,8 +46,8 @@ class TestgetMessages(unittest.TestCase): ...@@ -46,8 +46,8 @@ class TestgetMessages(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -50,8 +50,8 @@ class TestsetAllMessagesIsRead(unittest.TestCase): ...@@ -50,8 +50,8 @@ class TestsetAllMessagesIsRead(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/resource/upload?namespace= 上传文件 #/api/v1/resource/upload 上传文件
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,7 +27,7 @@ class TestsetAllMessagesIsRead(unittest.TestCase): ...@@ -27,7 +27,7 @@ class TestsetAllMessagesIsRead(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/resource/upload?namespace=' % (self.ip) self.url = '%s/api/v1/resource/upload' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
...@@ -61,8 +61,8 @@ class TestsetAllMessagesIsRead(unittest.TestCase): ...@@ -61,8 +61,8 @@ class TestsetAllMessagesIsRead(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/qualificationCertify 上传用户头像 #/api/v1/jfa/qualificationCertify 上传用户头像
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,11 +27,11 @@ class TestsetqualificationCertify(unittest.TestCase): ...@@ -27,11 +27,11 @@ class TestsetqualificationCertify(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/qualificationCertify' % (self.ip) self.url = '%s/api/v1/jfa/qualificationCertify' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
'metaId': '328678588335394816' 'metaId': '334143432652099589'
} }
...@@ -56,8 +56,8 @@ class TestsetqualificationCertify(unittest.TestCase): ...@@ -56,8 +56,8 @@ class TestsetqualificationCertify(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/getQualificationCertifyDetail 资格认证详情 #/api/v1/jfa/getQualificationCertifyDetail 资格认证详情
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,7 +27,7 @@ class TestgetQualificationCertifyDetail(unittest.TestCase): ...@@ -27,7 +27,7 @@ class TestgetQualificationCertifyDetail(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/getQualificationCertifyDetail' % (self.ip) self.url = '%s/api/v1/jfa/getQualificationCertifyDetail' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
...@@ -53,8 +53,8 @@ class TestgetQualificationCertifyDetail(unittest.TestCase): ...@@ -53,8 +53,8 @@ class TestgetQualificationCertifyDetail(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
#Author:johnnyzhu #Author:johnnyzhu
#project:jfa #project:jfa
""" """
#/api/v1/manager/uploadAvatar 上传用户头像 #/api/v1/jfa/uploadAvatar 上传用户头像
import util.test_get_post as gp import util.test_get_post as gp
import json import json
...@@ -27,11 +27,11 @@ class TestsetuploadAvatar(unittest.TestCase): ...@@ -27,11 +27,11 @@ class TestsetuploadAvatar(unittest.TestCase):
self.token = clogin.testuserlogin() self.token = clogin.testuserlogin()
self.ip = gl.get_value('apiip') self.ip = gl.get_value('apiip')
# 测试API地址 # 测试API地址
self.url = '%s/api/v1/manager/uploadAvatar' % (self.ip) self.url = '%s/api/v1/jfa/uploadAvatar' % (self.ip)
# 测试API入参 # 测试API入参
self.payloadData = { self.payloadData = {
'metaId': '328678588335394816' 'metaId': '334143432652099589'
} }
...@@ -56,8 +56,8 @@ class TestsetuploadAvatar(unittest.TestCase): ...@@ -56,8 +56,8 @@ class TestsetuploadAvatar(unittest.TestCase):
ul.log.logger.info(r) ul.log.logger.info(r)
try: try:
self.assertEqual('OK',r["errMsg"]) self.assertEqual(200, r["status"])
self.assertEqual(0, r["errCode"]) self.assertTrue(r["success"])
self.test_result = "p" self.test_result = "p"
#回写结果至testlink #回写结果至testlink
cr.report_test_result(self.testplanid, self.caseid, self.test_result) cr.report_test_result(self.testplanid, self.caseid, self.test_result)
......
...@@ -19,7 +19,7 @@ gl.set_value('key','34c3194c732457cca2f5b0bfad8b72fe') ...@@ -19,7 +19,7 @@ gl.set_value('key','34c3194c732457cca2f5b0bfad8b72fe')
gl.set_value('test_plan_id','3086') #//正式 gl.set_value('test_plan_id','3086') #//正式
#设置APIIP地址 #设置APIIP地址
gl.set_value('apiip','http://csptest.thiztech.com:7001') gl.set_value('apiip','http://csptest.thiztech.com')
# gl.set_value('apiip','http://192.168.68.205:8092') # gl.set_value('apiip','http://192.168.68.205:8092')
...@@ -36,5 +36,8 @@ gl.set_value('password','d67716c268638f29c0858e5fe84c99e023dade15') ...@@ -36,5 +36,8 @@ gl.set_value('password','d67716c268638f29c0858e5fe84c99e023dade15')
gl.set_value('realName','朱凌') gl.set_value('realName','朱凌')
gl.set_value('idCardNum','310115198407101954') gl.set_value('idCardNum','310115198407101954')
gl.set_value('bankPassword','ad4cf4a936024af729ddf7e0cc536622179991ca') gl.set_value('bankPassword','ad4cf4a936024af729ddf7e0cc536622179991ca')
#设置服务版本号
gl.set_value('tag','test-wlf-20191014-1351')
#设置smstoken #设置smstoken
# gl.set_value('token','Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJ1c2VybmFtZVwiOlwiODYxODAyMTA0NzY4MFwiLFwibGFzdExvZ2luVGltZVwiOlwiMjAxOS0wNy0xNlQwNzoyNDo0OS42OTVaXCIsXCJsYXN0QWNjZXNzVGltZVwiOlwiMjAxOS0wNy0xNlQwNzoyNDo0OS42OTVaXCJ9IiwiZXhwIjoxNTY1ODUzODg5fQ.UecdWTwNa7LlgZKumv6He3lBwMMhQt8Ppik6eoKWHZw') # gl.set_value('token','Bearer eyJhbGciOiJIUzI1NiJ9.eyJzdWIiOiJ7XCJ1c2VybmFtZVwiOlwiODYxODAyMTA0NzY4MFwiLFwibGFzdExvZ2luVGltZVwiOlwiMjAxOS0wNy0xNlQwNzoyNDo0OS42OTVaXCIsXCJsYXN0QWNjZXNzVGltZVwiOlwiMjAxOS0wNy0xNlQwNzoyNDo0OS42OTVaXCJ9IiwiZXhwIjoxNTY1ODUzODg5fQ.UecdWTwNa7LlgZKumv6He3lBwMMhQt8Ppik6eoKWHZw')
\ No newline at end of file
...@@ -181,9 +181,10 @@ ...@@ -181,9 +181,10 @@
<div class='page-header'> <div class='page-header'>
<h1>自动化测试报告,测试结果如下:</h1> <h1>自动化测试报告,测试结果如下:</h1>
<p class='attribute'><strong>开始时间:</strong> 2019-09-04 11:15:57</p> <p class='attribute'><strong>开始时间:</strong> 2019-10-17 10:52:53</p>
<p class='attribute'><strong>运行时长:</strong> 0:00:33.147896</p> <p class='attribute'><strong>运行时长:</strong> 0:00:20.427169</p>
<p class='attribute'><strong>状态:</strong> 通过 34</p> <p class='attribute'><strong>状态:</strong> 通过 34</p>
<p class='attribute'><strong>TAG:</strong> SCP-V1.1.1</p>
</div> </div>
<div style="float: left;width:50%;"><p class='description'>用例执行情况:</p></div> <div style="float: left;width:50%;"><p class='description'>用例执行情况:</p></div>
...@@ -253,7 +254,16 @@ ...@@ -253,7 +254,16 @@
<tr id='pt3.1' class='hiddenRow'> <tr id='pt3.1' class='hiddenRow'>
<td class='none'><div class='testcase'>testgetManagerInfo</div></td> <td class='none'><div class='testcase'>testgetManagerInfo</div></td>
<td colspan='5' align='center'>通过</td> <td colspan='5' align='center'>
<!--css div popup start-->
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt3.1')" >
通过</a>
<div id='div_pt3.1' class="popup_window">
<pre>pt3.1: {'status': 200, 'body': {'mobile': '18021047680', 'financialPlannerInviteCode': None, 'nickName': '333', 'inviteCode': 'LLZS8B', 'idCardNum': '310115198407101954', 'isRealName': True, 'lcsid': '320827288935600128', 'avatarUrl': 'http://csptest.thiztech.com/api/v1/resource/meta/334143432652099589', 'isHaveLowerLevel': False, 'isShare': False, 'certificationStatus': 'certifiedInReview', 'financialPlannerRank': '1', 'financialPlannerRankName': '注册理财师', 'lcsId': '320827288935600128', 'realName': '朱凌'}, 'success': True}
</pre>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
<tr class='passClass'> <tr class='passClass'>
...@@ -286,7 +296,7 @@ ...@@ -286,7 +296,7 @@
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt5.1')" > <a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt5.1')" >
通过</a> 通过</a>
<div id='div_pt5.1' class="popup_window"> <div id='div_pt5.1' class="popup_window">
<pre>pt5.1: {'errCode': 0, 'errMsg': 'OK', 'data': {'bankToken': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZDRjZjRhOTM2MDI0YWY3MjlkZGY3ZTBjYzUzNjYyMjE3OTk5MWNhIiwiZXhwIjoxNTY3NTY3MjYyfQ.dSmg4JtYHPmYkQqzuBj1Bl82AF-NBjEK1TuUPD2hTluiwwDEactYIMsj1teCf6hnJsD0xTP4rSbRieEYe9AJfQ'}} <pre>pt5.1: {'status': 200, 'body': {'bankToken': 'eyJhbGciOiJIUzUxMiJ9.eyJzdWIiOiJhZDRjZjRhOTM2MDI0YWY3MjlkZGY3ZTBjYzUzNjYyMjE3OTk5MWNhIiwiZXhwIjoxNTcxMjgxMDc1fQ.PtriBCltha4Yj9NDCsAZ8xAyilgumQnb3LWAF8oPbzHc-fQQZ8oD4rW18X4ES7WcZO-xYavEb5CSSRb95gaTsQ'}, 'success': True}
</pre> </pre>
</div> </div>
<!--css div popup end--> <!--css div popup end-->
...@@ -318,7 +328,16 @@ ...@@ -318,7 +328,16 @@
<tr id='pt7.1' class='hiddenRow'> <tr id='pt7.1' class='hiddenRow'>
<td class='none'><div class='testcase'>testcheckIdCard</div></td> <td class='none'><div class='testcase'>testcheckIdCard</div></td>
<td colspan='5' align='center'>通过</td> <td colspan='5' align='center'>
<!--css div popup start-->
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt7.1')" >
通过</a>
<div id='div_pt7.1' class="popup_window">
<pre>pt7.1: {'status': 200, 'body': {'bankToken': 'eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiIzMTAxMTUxOTg0MDcxMDE5NTQiLCJleHAiOjE1NzEyODEwNzZ9.dXJmZ7Cj1MQGbO9CcEe9f7AYz-qlh9U8RabSMG11vn12e0yS1LSHpBpcAI8q5R1I'}, 'success': True}
</pre>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
<tr class='passClass'> <tr class='passClass'>
...@@ -402,7 +421,16 @@ ...@@ -402,7 +421,16 @@
<tr id='pt13.1' class='hiddenRow'> <tr id='pt13.1' class='hiddenRow'>
<td class='none'><div class='testcase'>testresetBankPassword</div></td> <td class='none'><div class='testcase'>testresetBankPassword</div></td>
<td colspan='5' align='center'>通过</td> <td colspan='5' align='center'>
<!--css div popup start-->
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt13.1')" >
通过</a>
<div id='div_pt13.1' class="popup_window">
<pre>pt13.1: {'status': 200, 'body': {'bankToken': 'eyJhbGciOiJIUzM4NCJ9.eyJzdWIiOiIzMTAxMTUxOTg0MDcxMDE5NTQiLCJleHAiOjE1NzEyODEwNzh9.NE_EqgVC-la2Z4XaQm_hdk7tjzO3SJpAfClFuAig08m-P4HqP0VTDdgTkZZNUG1k'}, 'success': True}
</pre>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
<tr class='passClass'> <tr class='passClass'>
...@@ -458,7 +486,16 @@ ...@@ -458,7 +486,16 @@
<tr id='pt17.1' class='hiddenRow'> <tr id='pt17.1' class='hiddenRow'>
<td class='none'><div class='testcase'>testupdateNickName</div></td> <td class='none'><div class='testcase'>testupdateNickName</div></td>
<td colspan='5' align='center'>通过</td> <td colspan='5' align='center'>
<!--css div popup start-->
<a class="popup_link" onfocus='this.blur();' href="javascript:showTestDetail('div_pt17.1')" >
通过</a>
<div id='div_pt17.1' class="popup_window">
<pre>pt17.1: {'status': 200, 'success': True}
</pre>
</div>
<!--css div popup end-->
</td>
</tr> </tr>
<tr class='passClass'> <tr class='passClass'>
......
...@@ -86,7 +86,8 @@ import io ...@@ -86,7 +86,8 @@ import io
import time import time
import unittest import unittest
from xml.sax import saxutils from xml.sax import saxutils
import util.globalv as gl
import config.config
# ------------------------------------------------------------------------ # ------------------------------------------------------------------------
# The redirectors below are used to capture output during testing. Output # The redirectors below are used to capture output during testing. Output
...@@ -702,6 +703,7 @@ class HTMLTestRunner(Template_mixin): ...@@ -702,6 +703,7 @@ class HTMLTestRunner(Template_mixin):
""" """
startTime = str(self.startTime)[:19] startTime = str(self.startTime)[:19]
duration = str(self.stopTime - self.startTime) duration = str(self.stopTime - self.startTime)
tag= gl.get_value('tag')
status = [] status = []
if result.success_count: status.append(u'通过 %s' % result.success_count) if result.success_count: status.append(u'通过 %s' % result.success_count)
if result.failure_count: status.append(u'失败 %s' % result.failure_count) if result.failure_count: status.append(u'失败 %s' % result.failure_count)
...@@ -714,6 +716,7 @@ class HTMLTestRunner(Template_mixin): ...@@ -714,6 +716,7 @@ class HTMLTestRunner(Template_mixin):
(u'开始时间', startTime), (u'开始时间', startTime),
(u'运行时长', duration), (u'运行时长', duration),
(u'状态', status), (u'状态', status),
(u'TAG', tag),
] ]
def generateReport(self, test, result): def generateReport(self, test, result):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment