diff --git a/000-LoginToken/1-dataDriven.robot b/000-LoginToken/1-dataDriven.robot index 4a27eb6..963038e 100644 --- a/000-LoginToken/1-dataDriven.robot +++ b/000-LoginToken/1-dataDriven.robot @@ -1,5 +1,4 @@ *** Settings *** -Library ExcelLibrary Library DateTime Library String Library Collections diff --git a/000-LoginToken/2.1-APPlogin.robot b/000-LoginToken/2.1-APPlogin.robot index 099c546..6b49767 100644 --- a/000-LoginToken/2.1-APPlogin.robot +++ b/000-LoginToken/2.1-APPlogin.robot @@ -27,15 +27,6 @@ login_token Set Global Variable ${userId} Set Global Variable ${gettoken} Set Global Variable ${client_firstlogin_header} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 7 {'Content-Type':'application/json','Authorization':'QNT ${gettoken}','X-APP-ID':'470236309865238528'} #写入移动端请求头数据 - #Save Excel DatadrivenC-1.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenC-1.xls - #${client_firstlogin_header} Read Cell Data By Name ztbsc D8 #客户端首次登录header - #Set Global Variable ${client_firstlogin_header} - #sleep 0.5 get_baseInfo #获取用户基础信息 @@ -58,15 +49,6 @@ get_baseInfo Set Global Variable ${packerName} Set Global Variable ${orgfullName} Set Global Variable ${client_headerP} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 1 {'Content-Type':'application/json','Authorization':'QNT ${gettoken}','X-APP-ID':'470236309865238528','X-ORGANIZATION-ID':'${orgId}','X-PACKING-FACTORY-ID':'${packerId}'} #写入移动端请求头数据 - #Save Excel DatadrivenB-1.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenB-1.xls - #${client_headerP} Read Cell Data By Name ztbsc D2 #客户端首次登录header - #Set Global Variable ${client_headerP} - #sleep 0.5 get_Personal_baseInfo #切换组织--个人 diff --git a/000-LoginToken/3-WebLogin.robot b/000-LoginToken/3-WebLogin.robot index 0d210d9..d0fd86e 100644 --- a/000-LoginToken/3-WebLogin.robot +++ b/000-LoginToken/3-WebLogin.robot @@ -26,15 +26,6 @@ Papermill_Login Set Global Variable ${PM_userId} Set Global Variable ${PM_token} Set Global Variable ${ztbsc_papermill_header} - #Execl写入数据 - Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - Put String To Cell ztbsc 3 20 {'Content-Type':'application/json','Authorization':'QNT ${PM_token}','X-APP-ID':'503258978847966406'} #写入纸厂端请求头数据 - Save Excel Datadriven.xls - #数据驱动 - Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\Datadriven.xls - ${ztbsc_papermill_header} Read Cell Data By Name ztbsc D21 #纸厂端header - Set Global Variable ${ztbsc_papermill_header} - sleep 0.5 #获取用户组织信息 Create Session ZTBT ${ztbclient} ${ztbsc_papermill_header} ${reps} GET On Session ZTBT ztb-supply-chain-service/get/paper-mill/user-base-info @@ -47,15 +38,6 @@ Papermill_Login ${ztbsc_papermill_header} Set Variable {'Content-Type':'application/json','Authorization':'QNT ${PM_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'${papermill_orgId}'} #纸厂端切换组织后的请求头 Set Global Variable ${papermill_name} Set Global Variable ${ztbsc_papermill_header} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 20 {'Content-Type':'application/json','Authorization':'QNT ${PM_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'${papermill_orgId}'} #写入纸厂端请求头数据 - #Save Excel DatadrivenP.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenP.xls - #${ztbsc_papermill_header} Read Cell Data By Name ztbsc D21 #纸厂端header - #Set Global Variable ${ztbsc_papermill_header} - #sleep 0.5 Factoring_Login #保理web端登录 @@ -76,12 +58,3 @@ Factoring_Login Set Global Variable ${F_userId} Set Global Variable ${F_token} Set Global Variable ${ztbsc_factoring_header} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 24 {'Content-Type':'application/json','Authorization':'QNT ${F_token}','X-APP-ID':'503258978847966410','X-ORGANIZATION-ID':'710132392618233856'} #写入保理商端请求头数据 - #Save Excel DatadrivenF.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenF.xls - #${ztbsc_factoring_header} Read Cell Data By Name ztbsc D25 #保理商端header - #Set Global Variable ${ztbsc_factoring_header} - #sleep 0.5 diff --git a/005-AgencyForwardFactoring/3-Factoring/1.1-Trader.robot b/005-AgencyForwardFactoring/3-Factoring/1.1-Trader.robot index 11dd528..f3eccdb 100644 --- a/005-AgencyForwardFactoring/3-Factoring/1.1-Trader.robot +++ b/005-AgencyForwardFactoring/3-Factoring/1.1-Trader.robot @@ -3,7 +3,6 @@ Library Collections Library RequestsLibrary Library DatabaseLibrary Library urllib3 -Library ExcelLibrary *** Test Cases *** Traders_Login @@ -25,15 +24,6 @@ Traders_Login Set Global Variable ${T_userId} Set Global Variable ${T_token} Set Global Variable ${ztbsc_traders_header} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 17 {'Content-Type':'application/json','Authorization':'QNT ${T_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'721760754042277888'} #写入代理商端请求头数据 - #Save Excel DatadrivenT.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenT.xls - #${ztbsc_traders_header} Read Cell Data By Name ztbsc D18 #代理商端header - #Set Global Variable ${ztbsc_traders_header} - #sleep 0.5 #获取用户组织信息 Create Session ZTBT ${ztbclient} ${ztbsc_traders_header} ${reps} GET On Session ZTBT ztb-supply-chain-service/get/agent/user-base-info @@ -46,15 +36,6 @@ Traders_Login ${ztbsc_traders_header} Set Variable {'Content-Type':'application/json','Authorization':'QNT ${T_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'${trader_orgId}'} #代理商端切换组织后请求头数据 Set Global Variable ${trader_name} Set Global Variable ${ztbsc_traders_header} - #Execl写入数据 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls - #Put String To Cell ztbsc 3 17 {'Content-Type':'application/json','Authorization':'QNT ${T_token}','X-APP-ID':'503258978847966406','X-ORGANIZATION-ID':'${trader_orgId}'} #写入代理商端请求头数据 - #Save Excel DatadrivenTT.xls - #数据驱动 - #Open Excel D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenTT.xls - #${ztbsc_traders_header} Read Cell Data By Name ztbsc D18 #代理商端header - #Set Global Variable ${ztbsc_traders_header} - #sleep 0.5 Agent_collection_list #代理商端收款管理