Răsfoiți Sursa

1、数据库迁移后跑不通用例修改;2、未登记关联用例暂时不跑

jo 1 an în urmă
părinte
comite
2d3bc294e3

+ 2 - 2
AllSuite/ClientSuite/DeviceInformationSuite/RemoveDeviceRelevancyAsync.robot

@@ -40,7 +40,7 @@ Class_001_机构设备移除,移除机构设备
     #校验机构下不存在移除的设备
     ${res4}    FindDevicesByOrganizationCodeAsyncPost    ${token}    ${organizationInfo_mao}[0]
     log    ${res4}
-    ${containsFalg}    Set variable    false
+    ${containsFalg}    Set variable    False
     @{list}    Get From Dictionary    ${res4}    content
     FOR    ${value}    IN    @{list}
         log    ${value}
@@ -86,7 +86,7 @@ Class_002_机构设备移除,移除部门设备
     #校验机构下不存在移除的设备
     ${res4}    FindDevicesByOrganizationCodeAsyncPost    ${token}    ${organizationInfo_mao}[0]
     log    ${res4}
-    ${containsFalg}    Set variable    false
+    ${containsFalg}    Set variable    False
     @{list}    Get From Dictionary    ${res4}    content
     FOR    ${value}    IN    @{list}
         log    ${value}

+ 2 - 2
AllSuite/ClientSuite/InspectionRecordSuite/RelevanceRecordAsync.robot

@@ -62,7 +62,7 @@ Exception_003_关联检查,ExamCode非空校验
     #登录,获取用户Token
     ${token}    GetCommonLoginAsyncToken    ${user_mao}[0]    ${EMPTY}    ${user_mao}[1]    ${3}    ${0}
     #ExamCode值传入空值
-    ${res}    RelevanceRecordAsyncPost    ${token}    ${EMPTY}    B75483F91E1546CD9E46D09FD6D3179F
+    ${res}    RelevanceRecordAsyncPost    ${token}    ${EMPTY}    EEBC927973F1449C8FAE0D8372236BDE
     #校验
     ${flag}    Result Analysis Code    ${res}    false    ${9}
     Should Be True    ${flag}
@@ -71,7 +71,7 @@ Exception_004_关联检查,ExamCode正确性校验
     #登录,获取用户Token
     ${token}    GetCommonLoginAsyncToken    ${user_mao}[0]    ${EMPTY}    ${user_mao}[1]    ${3}    ${0}
     #ExamCode值传入空值
-    ${res}    RelevanceRecordAsyncPost    ${token}    123456    B75483F91E1546CD9E46D09FD6D3179F
+    ${res}    RelevanceRecordAsyncPost    ${token}    123456    EEBC927973F1449C8FAE0D8372236BDE
     #校验
     ${flag}    Result Analysis Code    ${res}    false    ${4015}
     Should Be True    ${flag}

+ 1 - 1
AllSuite/ClientSuite/OrganizationInformationSuite/FindOrganizationsByPageAsync.robot

@@ -50,7 +50,7 @@ Class_004_查询可转诊机构列表,传入存在的KeyWord
     #登录,获取用户Token
     ${token}    GetCommonLoginAsyncToken    ${user_mao}[0]    ${EMPTY}    ${user_mao}[1]    ${3}    ${0}
     #查询可转诊机构列表
-    ${res}    FindOrganizationsByPageAsyncPost    ${token}    1    10    jo
+    ${res}    FindOrganizationsByPageAsyncPost    ${token}    1    1000    jo
     log    ${res}
     ${content}    Get From Dictionary    ${res}    content
     @{list}    Get From Dictionary    ${content}    PageData

+ 1 - 0
AllSuite/ClientSuite/PatientInformationSuite/CreatePatientByUnregisteredAsync.robot

@@ -9,6 +9,7 @@ Resource          ../../../AllApi/ClientAPI/PatientInformationApi/FindPatientsAs
 
 *** Test Cases ***
 Class_001_未登记关联创建病人
+    [Tags]    inexecution
     #超声设备连接云服务(JMHLHL),获取超声设备Token
     ${usToken}    ConnectAsync.GetConnectAsyncToken    BFEBFBFF000906EA-S3YHNX0KC24771X    ${EMPTY}    USDemoV2    US    2.11.0    2.2.27.5    I5-8400    zh-CN    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    0    0    ${EMPTY}
     #超声机传一条未登记的病人检查

+ 1 - 0
AllSuite/ClientSuite/PatientInformationSuite/FindPatientsAsync.robot

@@ -24,6 +24,7 @@ Class_001_分页查询病人列表
     Should Not Be Empty    ${res}[content]
 
 Class_002_分页查询病人列表,未登记病人
+    [Tags]    inexecution
     #登录,获取用户Token
     ${token}    GetCommonLoginAsyncToken    ${user_mao}[0]    ${EMPTY}    ${user_mao}[1]    ${3}    ${0}
     #分页查询病人列表

+ 1 - 0
AllSuite/ClientSuite/PatientInformationSuite/SetValidPatient.robot

@@ -14,6 +14,7 @@ Resource          ../../../AllApi/ClientAPI/PatientInformationApi/CreatePatientB
 
 *** Test Cases ***
 Class_001_设置成有效已登记病人接口
+    [Tags]    inexecution
     #超声设备连接云服务(JMHLHL),获取超声设备Token
     ${usToken}    ConnectAsync.GetConnectAsyncToken    BFEBFBFF000906EA-S3YHNX0KC24771X    ${EMPTY}    USDemoV2    US    2.11.0    2.2.27.5    I5-8400    zh-CN    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    0    0    ${EMPTY}
     #超声机传一条未登记的病人检查

+ 2 - 2
AllSuite/ClientSuite/PersonalInformationSuite/AlterUserInfoAsync.robot

@@ -31,7 +31,7 @@ Class_001_修改用户信息,修改所属组织和姓名
 
 Class_002_修改用户信息,修改手机号
     [Template]
-    ${phone}    Set Variable    15522222222
+    ${phone}    Set Variable    15511111111
     ${username}    Random Characters
     ${res}    CommonSignUpAsyncPost    ${username}    ${EMPTY}    ${pass1}
     Log    ${res}
@@ -45,7 +45,7 @@ Class_002_修改用户信息,修改手机号
     ${content}    Get From Dictionary    ${res2}    content
     ${phone1}    Get From Dictionary    ${content}    Phone
     Should Be Equal As Strings    ${phone1}    ${phone}
-    ${res1}    AlterUserInfoAsyncPost    ${token}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${organizationCode}    ${EMPTY}
+    #${res1}    AlterUserInfoAsyncPost    ${token}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${EMPTY}    ${organizationCode}    ${EMPTY}
     [Teardown]    AlterUserInfoAsyncPost    ${token}    ${EMPTY}    ${EMPTY}    ${nickname}[0]    ${EMPTY}    ${EMPTY}    ${organizationCode_xuexue}    ${EMPTY}
 
 Class_003_修改用户信息,修改昵称

+ 1 - 1
AllSuite/ClientSuite/PersonalInformationSuite/CommonSignUpAsync.robot

@@ -50,7 +50,7 @@ Exception_004_用户名/手机号/邮箱非空校验
     Should Be True    ${flag}
 
 Exception_005_用户名注册,密码非空校验
-    ${res}    CommonSignUpAsyncPost    jojojo    ${EMPTY}    ${EMPTY}
+    ${res}    CommonSignUpAsyncPost    xuejojojo    ${EMPTY}    ${EMPTY}
     #${code}    Get From Dictionary    ${res}    code
     #${message}    Get From Dictionary    ${res}    message
     #Should Be Equal As Numbers    ${code}    ${6038}

+ 1 - 1
AllSuite/ClientSuite/PersonalInformationSuite/VerifyAccountAsync.robot

@@ -59,7 +59,7 @@ Exception_003_用户名注册,用户名大于20位
 
 Exception_004_用户名注册,用户名包含非字母和数字
     [Template]
-    ${result}    VerifyAccountAsyncPost    1Ab哈
+    ${result}    VerifyAccountAsyncPost    1Ab哈!@#$
     ${flag}    Result Analysis    ${result}    False    ${EMPTY}    ${EMPTY}
     Should Be True    ${flag}
 

+ 8 - 8
CommonConfig/Config.robot

@@ -2,27 +2,27 @@
 ${host}           http://192.168.6.117:8303
 @{user_mao}       mao    Symmetry_mk9xaN8L    # abc321
 ${pass1}          Symmetry_mk9xah8N    # abc123
-${organizationCode}    07F22977325846F79D9A25B904E35AFC    # jo下级测试医院机构编码
+${organizationCode}    E1963DD949E445AE927A1A42D79F492B    # jo下级测试医院机构编码
 @{authenticationRole}    Role_InternshipDoctor    Role_ExpertAssistant    Role_CertifiedPhysician    Role_CertifiedExpert    # 实习医生、专家助理、认证医师、认证专家
 @{user_jo0221}    jo0221    Symmetry_mk9xah8N    # abc123
 @{image}          http://flyinsono-bj-1300984704.cos.ap-beijing.myqcloud.com/5D1B1B2E9167441283A471239B4D06D7.png    http://flyinsono-bj-1300984704.cos.ap-beijing.myqcloud.com/70C7D736ADE9468BA7D84EB305D0D9D0.png    https://flyinsono-bj-1300984704.cos.ap-beijing.myqcloud.com/2795DBA081DE4547A12DB751430B4DE8.jpg
 @{nickname}       昵称修改测试001    昵称修改测试002
-${deviceCode_jopc}    BE17734F891C4B2994797B29190ECA87    # jo工作电脑
+${deviceCode_jopc}    B82CB3CCA8EB406591EB7C2C6832F2B2    # jo工作电脑
 @{languageCode}    zh-CN    en-US
-${deviceCode_109}    AECEB84374814CCF857A007BD745D841    #109未关联用户 C69W2G
+${deviceCode_109}    2AF612EB90964700A6883DACAA2F2635    #109未关联用户 C69W2G
 @{password}       Symmetry_mk9xaN8L    Symmetry_mk9xah8N    # abc321、abc123
 @{user_jo}        jo
 @{getOrganizationSettingAsync_settingType}    0    1    2    # 0-病人 1-检查 2-预约会诊
-@{organizationInfo_mao}    07F22977325846F79D9A25B904E35AFC    # jo下级测试医院:机构编码、
+@{organizationInfo_mao}    E1963DD949E445AE927A1A42D79F492B    # jo下级测试医院:机构编码、
 @{patientType}    0    1    # 机构服务对象病人类型:0-人用 1-兽用
 @{organizationType}    0    1    2    # 0-机构,1-部门,2-科室(暂未用到)
-@{organizationInfo_jo}    7C768C0426F74A1CB7848DB3A99FE740    jo测试医院    # jo测试医院:机构编码
+@{organizationInfo_jo}    1B5785CC6EAD46DDB8C24D225831904C    jo测试医院    # jo测试医院:机构编码
 @{isEncryptedShow}    false    true
-@{organzationCode_gary}    D4FF79C0C0794190A2588E0207288AA7    # jo上级测试医院
+@{organzationCode_gary}    EA81F6B6137148A08D75872BD3008B48    # jo上级测试医院
 @{regionCode}     130200    130100    # 唐山、石家庄
-@{usercode_maoage}    09556540BA004016A246E7E5CFE2FC49    DBE71752629A40CEB2BA0185B4020F71    16D7ABB3271B4B8C8DC5B3B9C2EB04D3    16DA1814E38E476896D7AAC0BA39F73E    # mao认证医师1,mao认证医师,mao认证专家1,mao认证专家
+@{usercode_maoage}    F365BD346BE24632A195B361797B4FD9    358B48B346C346E6B0D2A2BA269AF344    D1372618030E494CB8624C1B91EF3AE7    AD7DD7466A6C48EA96883A8E49C06EF3    # mao认证医师1,mao认证医师,mao认证专家1,mao认证专家
 @{diagnosisModule}    ThyroidLesionDetect    BreastLesionDetectBIRADS    LiverLesionDetect    CarotidPlaqueDetect    # 甲状腺辅助诊断|乳腺辅助诊断|肝脏辅助诊断|颈动脉辅助诊断
 @{deviceType_us}    US    USDemoV2
-${organizationCode_xuexue}    3C7F6EFF5C744A9E89D365083EBEFAE7    # 无用账号修改至该医院
+${organizationCode_xuexue}    A39B91B5C7C7442DA5AC2E277BC20C04    # 无用账号修改至该医院
 @{user_phone}     18862108573    Symmetry_mk9xah8N    # abc123
 @{user_email}     jo.xue@vinno.com    Symmetry_mk9xah8N    # abc123