From b9b724f6abcbb0834c1ec1fd98f9e920cef7e005 Mon Sep 17 00:00:00 2001
From: LG_lai <laiyonglan0921@163.com>
Date: Wed, 14 Sep 2022 15:07:51 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=99=BB=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 0-Datadriven/2.1-APPlogin.robot        |   8 ++++----
 0-Datadriven/2.2-APPlogin.robot        |   8 ++++----
 0-Datadriven/3-WebLogin.robot          |  12 ++++++------
 Datadriven.xls                         | Bin 9728 -> 9728 bytes
 DatadrivenB-1.xls                      | Bin 9728 -> 9728 bytes
 DatadrivenB-2.xls                      | Bin 9728 -> 9728 bytes
 DatadrivenC-1.xls                      | Bin 9728 -> 9728 bytes
 DatadrivenC-2.xls                      | Bin 9728 -> 9728 bytes
 DatadrivenF.xls                        | Bin 9728 -> 9728 bytes
 DatadrivenP.xls                        | Bin 9728 -> 9728 bytes
 DatadrivenT.xls                        | Bin 9728 -> 9728 bytes
 RF-TEST/0-Data driven/dataDriven.robot |  16 ++++++++++------
 RF-TEST/2-Platform/0-login.robot       |   1 +
 RF-TEST/2-Platform/Auction.robot       |   6 +++---
 14 files changed, 28 insertions(+), 23 deletions(-)

diff --git a/0-Datadriven/2.1-APPlogin.robot b/0-Datadriven/2.1-APPlogin.robot
index 471fcd1..7e31eec 100644
--- a/0-Datadriven/2.1-APPlogin.robot
+++ b/0-Datadriven/2.1-APPlogin.robot
@@ -26,11 +26,11 @@ login_token
     Set Global Variable    ${userId}
     Set Global Variable    ${gettoken}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenC-1.xls
     ${client_firstlogin_header}    Read Cell Data By Name    ztbsc    D8    #客户端首次登录header
     Set Global Variable    ${client_firstlogin_header}
     sleep    0.5
@@ -55,11 +55,11 @@ get_baseInfo
     Set Global Variable    ${packerName}
     Set Global Variable    ${orgfullName}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenB-1.xls
     ${client_headerP}    Read Cell Data By Name    ztbsc    D2    #客户端首次登录header
     Set Global Variable    ${client_headerP}
     sleep    0.5
diff --git a/0-Datadriven/2.2-APPlogin.robot b/0-Datadriven/2.2-APPlogin.robot
index 716e8f9..b2f31a5 100644
--- a/0-Datadriven/2.2-APPlogin.robot
+++ b/0-Datadriven/2.2-APPlogin.robot
@@ -26,11 +26,11 @@ login_token
     Set Global Variable    ${userId}
     Set Global Variable    ${gettoken}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.xls
     Put String To Cell    ztbsc    3    7    {'Content-Type':'application/json','Authorization':'QNT ${gettoken}','X-APP-ID':'470236309865238528'}    #写入移动端请求头数据
     Save Excel    DatadrivenC-2.xls
     #数据驱动
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenC-2.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenC-2.xls
     ${client_firstlogin_header}    Read Cell Data By Name    ztbsc    D8    #客户端首次登录header
     Set Global Variable    ${client_firstlogin_header}
     sleep    0.5
@@ -55,11 +55,11 @@ get_baseInfo
     Set Global Variable    ${packerName}
     Set Global Variable    ${orgfullName}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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-2.xls
     #数据驱动
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\DatadrivenB-2.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenB-2.xls
     ${client_headerT}    Read Cell Data By Name    ztbsc    D2    #客户端首次登录header
     Set Global Variable    ${client_headerT}
     sleep    0.5
diff --git a/0-Datadriven/3-WebLogin.robot b/0-Datadriven/3-WebLogin.robot
index 86422ec..6d9784e 100644
--- a/0-Datadriven/3-WebLogin.robot
+++ b/0-Datadriven/3-WebLogin.robot
@@ -25,11 +25,11 @@ Papermill_Login
     Set Global Variable    ${PM_userId}
     Set Global Variable    ${PM_token}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\Datadriven.xls
     ${ztbsc_papermill_header}    Read Cell Data By Name    ztbsc    D21    #纸厂端header
     Set Global Variable    ${ztbsc_papermill_header}
     sleep    0.5
@@ -44,11 +44,11 @@ Papermill_Login
     END
     Set Global Variable    ${papermill_name}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenP.xls
     ${ztbsc_papermill_header}    Read Cell Data By Name    ztbsc    D21    #纸厂端header
     Set Global Variable    ${ztbsc_papermill_header}
     sleep    0.5
@@ -71,11 +71,11 @@ Factoring_Login
     Set Global Variable    ${F_userId}
     Set Global Variable    ${F_token}
     #Execl写入数据
-    Open Excel    D:\\LYL\\Study\\Robot_framework\\New_Trading\\数据驱动.xls
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\数据驱动.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
+    Open Excel    D:\\LYL\\Study\\Robot_framework\\space\\ztb-ops-rf-api\\DatadrivenF.xls
     ${ztbsc_factoring_header}    Read Cell Data By Name    ztbsc    D25    #保理商端header
     ${ztbsc_factoring_login_header}    Read Cell Data By Name    ztbsc    D23    #保理商端登录header
     Set Global Variable    ${ztbsc_factoring_header}
diff --git a/Datadriven.xls b/Datadriven.xls
index 51d1207ecf2c04a809e4370fa656a14937404114..5f8ee34ad8fc6424a993f30d4069498fae45010a 100644
GIT binary patch
delta 63
zcmZqhY4F*wN=PptGQ%`oJ6GGxBGE6Y#6Qb1#lSo}HLbwHHLRqtFgMRJII|)sz$4Sr
S-Q3aEcCw9t(&k@6Y{CG!QxzBh

delta 63
zcmZqhY4F*wN=VN)P~SBmz1+yh%*@Tw-Px(C#6{oBIIyy)!qPa`JIguL-PPGWydXCt
SFDKpBcCw9t(&k@6Y{CGX&=jTs

diff --git a/DatadrivenB-1.xls b/DatadrivenB-1.xls
index af89b3673967da6b35270466628d82d0857e8a67..f421ec05fdb3f4ee6b45182fb5aaa137973d0a32 100644
GIT binary patch
delta 62
zcmZqhY4F)lEu>qLT50BFoMw{YX^`Yom=cg4U>cZVo||ImSY;BX?;U2Q?_ZQ!5#knJ
R;Am?*`5%|!=95C^!T^{R6!ZW9

delta 62
zcmZqhY4F)lEu@>~;*?sLomF6&5s+3{=w@JGksnoFtnCt>?d%n1;O3w1kx`jlQsQdr
Ro^ES9`5%|!=95C^!T`0g70v(v

diff --git a/DatadrivenB-2.xls b/DatadrivenB-2.xls
index 90dd0e90d2b99bbde89d43e53b8f68090a3cf4c5..37d1751af15e1c6409af4b253a2484077d4f74cf 100644
GIT binary patch
delta 62
zcmZqhY4F)lEu>qLT50BFoMw{YX^`Yom=cg4U>ca=X&RN2Q{@q9oF5U88{k{&6X@p|
R7-(xd`5%|!=95C^!T_b>6>9(h

delta 62
zcmZqhY4F)lEu@>~;*?sLomF6&5s+3{=w@JGksnp=7VPfgXzCZ4m7L@4l#^x=nw(N*
R=4fj>`5%|!=95C^!T_*(6_Ee{

diff --git a/DatadrivenC-1.xls b/DatadrivenC-1.xls
index fd67012811b36ec4bd55816279ecb399b2363e08..d6b95e2312c46efbaaa9aba13b4539020a9c79cb 100644
GIT binary patch
delta 56
zcmZqhY4F)_K}fqKwbIPVIL#!((;&&GFeM;8z%($!JU7MAvC1S&-#g4q-@hoeBE&7c
Lz;W|$Ay#1kFnSXa

delta 56
zcmZqhY4F)_K}b8z#VNHgJFCDlBOtA^(9OWWB0s9USlcB$+u1A3z|BA1Bcn3Aq{P+K
LJ$>_UAy#1kNct1&

diff --git a/DatadrivenC-2.xls b/DatadrivenC-2.xls
index 7da9d67c03643d95bb46f91a5f55ef0dc8b5d26b..fb0cc61c374c5cc0bac516b614fea4bf3c9cbd9f 100644
GIT binary patch
delta 56
zcmZqhY4F)_K}fqKwbIPVIL#!((;&&GFeM;8z%($!(=;k4r^+MJI6opFH^8^lC(zF`
LFmUs4Ay#1kJAD&~

delta 56
zcmZqhY4F)_K}b8z#VNHgJFCDlBOtA^(9OWWB0s9!E!f?~(bO+8D>=v8DJRV$G&!Zr
L%yIK?Ay#1kMKKeu

diff --git a/DatadrivenF.xls b/DatadrivenF.xls
index d2042da7e4832016b30ab9dcaaaaddef22dd4e44..aa50754ca44f9467bdc25b0e40c2f6ecf6903cbc 100644
GIT binary patch
delta 56
zcmZqhY4F*wOh~&VBq}#8*T*c$z}U>#)HlL8J*cQ4u{1I(B)G)HuO!LSD6AqPy&}^h
L-D~qjA$?&0HEa{C

delta 56
zcmZqhY4F*wOh~)T&^5(7BiF6mDK#@REYs8=tF$yKEjQQK(K*X6#XVWy)!eH*ti-b@
L(0KDjA$?&0K?xJI

diff --git a/DatadrivenP.xls b/DatadrivenP.xls
index 62f63e0701114a34dcf0c616fce500a2dd2d60d9..19d9fd9cff7dc89996457217821750e86cdd0348 100644
GIT binary patch
delta 84
zcmZqhY4F*wN=PptGQ%`oJ6GGxBGE6Y#6Qb1#lSo}HLbwHHLRqtFgMRJII|)sz$4Sr
o-Q3aEcCw9t;^dz~5(1V6rp6}bmd2)*W)=pfhDMteh3^Xi0HqEZDF6Tf

delta 84
zcmZqhY4F*wN=VN)P~SBmz1+yh%*@Tw-Px(C#6{oBIIyy)!qPa`JIguL-PPGWydXCt
oFDKpBcCw9t;^dz~5&}j>h88B~24?2QmL?{q=4P7}h3^Xi0Dh<$wg3PC

diff --git a/DatadrivenT.xls b/DatadrivenT.xls
index 2d53e1d0685e93c44ffea1daeb94e9a45f694e13..8e976c76f4f924f7abfb097dfbce2df2bbe8180e 100644
GIT binary patch
delta 575
zcmYk2OD_Xa6vxk<GWD*CKIT!QNTjAyiatn)mV`({?2uS!B|=2eQX~=^U%-i#jab@{
zjJ2Je4<HsSBsLPC0CDcj1anvCe}3~j_uS*$aqi|`6ue&4!~i~vU#N@q0vp2%x8Hno
zpR-t}7wD^o!*ae<IDsH+D?Dh1OrcQR-7L3nEtg7_;?BwmG{L)hUHeiKn=NKDLwob7
ziG$U0d^WL=Sl=uZcPjbpp`KmOtS#<uq;oU*@#N%mYHnl%#~M}hv8C1>>H#0Azn~6U
zKmZ;1=sT#P$^{YpmJAlfsH`vpr(`1(1J$8hiSC8^--^?xvZ2I)SvDW_`^akBe3tD=
z*7P`poqzm9_S2U3bU*O}ApTY^FtAGrcgGz=z@lw;fY?qtwmU#>12+^c!dbpakl4SQ
z1}&Q3#O}FZ5O4pPC5yJrlEw0^_!~%M9>h;YV{uef$&-Kvrz7)@IiXgVH%Sq|5w#ed
zv(_X&gkC)<=%$np1WHqQ*B17qA>w459KsJP(<$S_1S@OPG|w<Z9nM8r5_8%TOPg2P
JsBqa)^#j0lXQluE

delta 662
zcmZvY%}X0m6vgkG=rkHj5;c=#Ch0IOBAQH1jfoY-jhGTpj1{R_6#T?2qAqH`0-_sN
z-4q^Ob=PIP3CvzZ5I61$UFxD;_FqWpxigdC!g;(I?s@0_&YgF%aI(<6RF!2R$AWQr
zqqgKHHRSwz@KyAOqJ*cL8i$*2woWNQRr#aG5I>!(p4(uy(kO4dE034<G9N!IzFnLz
zt>q^+>M!2EDlM%Z94-}WFROF4MrC<_Z)aCVBGb;pfxl{cgkoT}sF(Ulp;6+9GYX;#
zP+Drboz5W9a}2<tk=m&Ol$Gmn*p%|MK{%dLs8ccHyKe8;B;1S`&c~4DWyClGJE%m!
zCF-Kj0v|dTQP<5{jx4-+J`Id#omn)H#yhiUpk(EYVXfrg=K15U+e?kZ`vj|f0<WK%
zfOa>PJ6U52XC^?gWz#T3US1p4ahslG9h*H#m(Ksp-AR!1K3%_u&RUzUgD^}(ewGf-
z1oinG{SL=~CirfgdTLih3n+<>U=>(j1`F~}`ggbpls7b+i}KeaD?CXfzQ)eyQZ-r2
kK;uyrS1X!kcnTNd^#-67<hJ=*Ogb0ltRiz(;@jh{|A6ynGXMYp

diff --git a/RF-TEST/0-Data driven/dataDriven.robot b/RF-TEST/0-Data driven/dataDriven.robot
index bf50b13..7c6739a 100644
--- a/RF-TEST/0-Data driven/dataDriven.robot	
+++ b/RF-TEST/0-Data driven/dataDriven.robot	
@@ -6,6 +6,7 @@ Library           Collections
 Library           RequestsLibrary
 Library           urllib3
 Library           DatabaseLibrary
+Library           MockServerLibrary
 
 *** Test Cases ***
 ztbsc
@@ -128,12 +129,15 @@ ztbsc
     #...
     # ELSE    log    true
     #IF，ELSE IF语句    [3041,3042,3043,3044]
-    ${ServiceFeeType}    Set Variable    [3041,3042,3043,3044]
-    ${ServiceFeeType}    Evaluate    random.choice(${ServiceFeeType})    random    #保理服务费类型
-    Run Keyword If    ${ServiceFeeType}==3041    Run Keyword    ServiceFee3041
-    ...    ELSE IF    ${ServiceFeeType}==3042    Run Keyword    ServiceFee3042
-    ...    ELSE IF    ${ServiceFeeType}==3043    Run Keyword    ServiceFee3043
-    ...    ELSE    ${ServiceFeeType}==3044    Run Keyword    ServiceFee3044
+    #${ServiceFeeType}    Set Variable    [3041,3042,3043,3044]
+    #${ServiceFeeType}    Evaluate    random.choice(${ServiceFeeType})    random    #保理服务费类型
+    #Run Keyword If    ${ServiceFeeType}==3041    Run Keyword    ServiceFee3041
+    # ELSE IF    ${ServiceFeeType}==3042    Run Keyword    ServiceFee3042    # ELSE IF    ${ServiceFeeType}==3043    Run Keyword    ServiceFee3043    # ELSE    ${ServiceFeeType}==3044    Run Keyword    ServiceFee3044
+    #Mock
+    #Make Headers
+    Create Mock Session    login
+    Create Mock Request Matcher    post    recycle-service/admin/login    form-data    username=laiyonglan@qniao.cn    password=qn123456
+    Create Mock Response    200
 
 *** Keywords ***
 ServiceFee3041
diff --git a/RF-TEST/2-Platform/0-login.robot b/RF-TEST/2-Platform/0-login.robot
index f2a4650..c6c8ed5 100644
--- a/RF-TEST/2-Platform/0-login.robot
+++ b/RF-TEST/2-Platform/0-login.robot
@@ -10,3 +10,4 @@ pwlogin
     Create Session    ZTBSC    ${ztbops}    ${ztbsc_ops_login_header}
     ${data}    Create Dictionary    username=${ztbsc_account}    password=${ztbsc_password}
     ${reps}    Post On Session    ZTBSC    recycle-service/admin/login    params=${data}
+    Should Be Equal As Strings    ${reps.json()['message']}    登陆成功
diff --git a/RF-TEST/2-Platform/Auction.robot b/RF-TEST/2-Platform/Auction.robot
index 81fe199..9d298ed 100644
--- a/RF-TEST/2-Platform/Auction.robot
+++ b/RF-TEST/2-Platform/Auction.robot
@@ -79,13 +79,13 @@ auction_detail
     ${Num}    Evaluate    random.randint(1,6)    random    #获取随机数字
     ${bidders_List}    Evaluate    random.sample(${List},${Num})    random    #获取多个竞拍人员id
     ${BList}    Convert To String    ${bidders_List}
-    ${BiddersList}    Replace String Using Regexp    ${BList}    '    \
+    ${BiddersList}    Replace String Using Regexp    ${BList}    '    ${EMPTY}
     #获取时间
     ${time}    Get Current Date    result_format=%Y-%m-%d %H:%M:00    #获取当前时间
     ${start_time}    Add Time To Date    ${time}    00:05:00    #获取未来两小时
     ${start_time}    Get Substring    ${start_time}    0    19    #截取正常时间时间
-    #${end_time}    Add Time To Date    ${time}    1 day    #获取第二天当前时间
-    ${end_time}    Add Time To Date    ${time}    00:10:00
+    ${end_time}    Add Time To Date    ${time}    1 day    #获取第二天当前时间
+    #${end_time}    Add Time To Date    ${time}    00:10:00
     ${end_time}    Get Substring    ${end_time}    0    19    #截取正常时间时间
     #保存拍品规则
     ${bidScale}    Evaluate    random.randint(1,10)    random    #加价幅度