From e49dc6ae44579a61fce66e2c24c205d12f6bbbc3 Mon Sep 17 00:00:00 2001
From: dongxiaoyan <dongxiaoyan@zdjizhi.com>
Date: Thu, 18 Jun 2020 11:37:02 +0800
Subject: [PATCH] =?UTF-8?q?1=E3=80=81=E8=B0=83=E6=95=B4=E7=A4=BA=E4=BE=8B?=
 =?UTF-8?q?=E9=80=82=E5=BA=94=E5=AF=B9=E5=BA=94=E5=85=B3=E9=94=AE=E5=AD=97?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=9B=202=E3=80=81=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E4=B8=AD=E5=BC=95=E7=94=A8=E6=96=87=E4=BB=B6?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../tsg_bfapi/setting/HijackFile24Type.robot  | 29 +++++++++----------
 1 file changed, 14 insertions(+), 15 deletions(-)

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