diff --git a/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot index 11bbf48..495138f 100644 --- a/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot +++ b/01-TestCase/tsg_bfapi/setting/HijackFile24Type.robot @@ -11,28 +11,27 @@ Resource ../../../03-Variable/Policy_Objects_Module.txt Library Custometest *** Variables *** -${url} /policy/profile/hijackfiles +${url} /v1/policy/profile/hijackfiles ${profileId} ${EMPTY} *** Keywords *** - ProfileComman - #此处只是示例,关键字要写到02-Keyword目录不要写在此处 - [Arguments] ${objectedit} ${type} - ${default_json} ${default_files} ${default_url} Run Keyword If "${type}"=="hijack" Set Variable ${setting_proxy_profiles_hijack} hijack_files/ /policy/profile/hijackfiles - ... ELSE IF Run Keyword If "${type}"=="insert" Set Variable ${setting_proxy_profiles_insert} insert_files/ /policy/profile/insertfiles - ... ELSE Set Variable a b c + [Arguments] ${objectedit} ${type} ${fileName} + ${default_json} ${default_files} ${default_url} Run Keyword If "${type}"=="hijack" Set Variable ${setting_proxy_profiles_hijack} hijack_files/ /v1/policy/profile/hijackfiles + ... ELSE IF Run Keyword If "${type}"=="insert" Set Variable ${setting_proxy_profiles_insert} insert_files/ /v1/policy/profile/insertfiles + ... ELSE Set Variable a b c ${objectDict} Jsoneditmanu ${default_json} ${objectedit} log ${objectDict} - ${response} CreatePolicyFile4 ${default_url} ${default_files} ${objectDict} + ${response} CreatePolicyFile4 ${default_url} ${default_files} ${fileName} ${objectDict} + #${url} ${filePath} ${fileName} ${objectDict} [Return] ${response} *** Test Cases *** -Hijack_file_24_type-test +Hijack_file_24_type-apk #Hijack 需要修改的内容 - ${objectedit} Create Dictionary profileName=Hijack_file_24_type-test contentName=Create-Hijack Files-test-0.apk contentType=application/vnd.android.package-archive - Comment 打印需要修改的json内容 - log ${objectedit} - ${response} ProfileComman ${objectedit} hijack + ${objectedit} Create Dictionary profileName=Hijack_file_24_type-apk contentName=Create-Hijack Files-test-0.apk contentType=application/vnd.android.package-archive + ${response} ProfileComman ${objectedit} hijack Create-Hijack Files-test-0.apk + # 查询 + ${profileId} Get From Dictionary ${response} profileId ##########################以上为封装示例################################### @@ -49,8 +48,8 @@ Hijack_file_24_type_apk-00000 ${profileName} Get From Dictionary ${response} profileName QueryPolicyFile ${url} profileId=${profileId}&profileName=${profileName} # 修改 - ${header_edit} Set Variable {"isValid":1,"contentType":"text/plain","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack Files-test-24.txt","profileId":"${profileId}","returnData":1} - UpdatePolicyFile ${url} hijack_files/ Create-Hijack Files-test-24.txt ${header_edit} + ${header_edit} Set Variable {"isValid":1,"contentType":"text/plain","opAction":"update","profileName":"test_edit","contentName":"Create-Hijack_Files-test-24.txt","profileId":"${profileId}","returnData":1} + UpdatePolicyFile ${url} hijack_files/ Create-Hijack_Files-test-24.txt ${header_edit} #DeletePolicyFile ${url} ${profileId} Hijack_file_24_type_exe-00001