From 19c31d27209089e4441695d2ba80e88e71ade56a Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Fri, 1 Oct 2021 15:47:11 -0400 Subject: [PATCH 1/4] Improve stability of scripts for ConditionalResumption --- .../001_conditional_resumption_allowed.lua | 5 ++--- .../002_conditional_resumption_denied.lua | 5 ++--- ...ditional_resumption_specific_hmi_level_navi.lua | 3 +-- ...al_resumption_specific_hmi_level_projection.lua | 3 +-- ...itional_resumption_specific_hmi_level_media.lua | 3 +-- ...esumption_specific_hmi_level_choose_highest.lua | 3 +-- .../SDL5_0/ConditionalResumption/common.lua | 14 ++++---------- 7 files changed, 12 insertions(+), 24 deletions(-) diff --git a/test_scripts/SDL5_0/ConditionalResumption/001_conditional_resumption_allowed.lua b/test_scripts/SDL5_0/ConditionalResumption/001_conditional_resumption_allowed.lua index b40063e471..08a753dc53 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/001_conditional_resumption_allowed.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/001_conditional_resumption_allowed.lua @@ -39,8 +39,7 @@ for option,appHMIType in pairs(common.appHMITypesByOption) do runner.Step("Set resumption config for " .. option, common.write_parameter_to_smart_device_link_ini, { option .. "TransportRequiredForResumption", "TCP_WIFI" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) - runner.Step("Pin OnHashChange", common.pinOnHashChange) - runner.Step("App activation", common.activateApp) + runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) end @@ -53,4 +52,4 @@ for option,appHMIType in pairs(common.appHMITypesByOption) do runner.Title("Postconditions") runner.Step("Clean sessions", common.cleanSessions) runner.Step("Stop SDL", common.postconditions) -end \ No newline at end of file +end diff --git a/test_scripts/SDL5_0/ConditionalResumption/002_conditional_resumption_denied.lua b/test_scripts/SDL5_0/ConditionalResumption/002_conditional_resumption_denied.lua index 9aece19bbb..7211ba240d 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/002_conditional_resumption_denied.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/002_conditional_resumption_denied.lua @@ -42,8 +42,7 @@ for option,appHMIType in pairs(common.appHMITypesByOption) do runner.Step("Set HMI level config for " .. option, common.writeLowBandwidthResumptionLevel, { option, "NONE" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) - runner.Step("Pin OnHashChange", common.pinOnHashChange) - runner.Step("App activation", common.activateApp) + runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) end @@ -56,4 +55,4 @@ for option,appHMIType in pairs(common.appHMITypesByOption) do runner.Title("Postconditions") runner.Step("Clean sessions", common.cleanSessions) runner.Step("Stop SDL", common.postconditions) -end \ No newline at end of file +end diff --git a/test_scripts/SDL5_0/ConditionalResumption/003_conditional_resumption_specific_hmi_level_navi.lua b/test_scripts/SDL5_0/ConditionalResumption/003_conditional_resumption_specific_hmi_level_navi.lua index a140b1bc33..18ffc7ad52 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/003_conditional_resumption_specific_hmi_level_navi.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/003_conditional_resumption_specific_hmi_level_navi.lua @@ -46,7 +46,6 @@ runner.Step("Set resumption config for " .. option, common.write_parameter_to_sm runner.Step("Set HMI level config for " .. option, common.writeLowBandwidthResumptionLevel, { option, "LIMITED" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) -runner.Step("Pin OnHashChange", common.pinOnHashChange) runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) @@ -58,4 +57,4 @@ runner.Step("App resumption", common.registrationWithResumption, { 1, resumptionLevelNavi, common.resumptionDataAddCommands }) runner.Title("Postconditions") -runner.Step("Stop SDL", common.postconditions) \ No newline at end of file +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/SDL5_0/ConditionalResumption/004_conditional_resumption_specific_hmi_level_projection.lua b/test_scripts/SDL5_0/ConditionalResumption/004_conditional_resumption_specific_hmi_level_projection.lua index 74df0da407..470fb970df 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/004_conditional_resumption_specific_hmi_level_projection.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/004_conditional_resumption_specific_hmi_level_projection.lua @@ -46,7 +46,6 @@ runner.Step("Set resumption config for " .. option, common.write_parameter_to_sm runner.Step("Set HMI level config for " .. option, common.writeLowBandwidthResumptionLevel, { option, "BACKGROUND" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) -runner.Step("Pin OnHashChange", common.pinOnHashChange) runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) @@ -58,4 +57,4 @@ runner.Step("App resumption", common.registrationWithResumption, { 1, resumptionLevelProjection, common.resumptionDataAddCommands }) runner.Title("Postconditions") -runner.Step("Stop SDL", common.postconditions) \ No newline at end of file +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/SDL5_0/ConditionalResumption/005_conditional_resumption_specific_hmi_level_media.lua b/test_scripts/SDL5_0/ConditionalResumption/005_conditional_resumption_specific_hmi_level_media.lua index c9beb909f3..69bd5f7b39 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/005_conditional_resumption_specific_hmi_level_media.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/005_conditional_resumption_specific_hmi_level_media.lua @@ -45,7 +45,6 @@ runner.Step("Set resumption config for " .. option, common.write_parameter_to_sm runner.Step("Set HMI level config for " .. option, common.writeMediaLowBandwidthResumptionLevel, { "FULL" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) -runner.Step("Pin OnHashChange", common.pinOnHashChange) runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) @@ -57,4 +56,4 @@ runner.Step("App resumption", common.registrationWithResumption, { 1, resumptionLevelMedia, common.resumptionDataAddCommands }) runner.Title("Postconditions") -runner.Step("Stop SDL", common.postconditions) \ No newline at end of file +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/SDL5_0/ConditionalResumption/006_conditional_resumption_specific_hmi_level_choose_highest.lua b/test_scripts/SDL5_0/ConditionalResumption/006_conditional_resumption_specific_hmi_level_choose_highest.lua index 8a09ddca61..6f566bb1b8 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/006_conditional_resumption_specific_hmi_level_choose_highest.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/006_conditional_resumption_specific_hmi_level_choose_highest.lua @@ -48,7 +48,6 @@ runner.Step("Set HMI level config for " .. option, common.writeLowBandwidthResum runner.Step("Set HMI level config for " .. option, common.writeMediaLowBandwidthResumptionLevel, { "FULL" }) runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) runner.Step("App registration", common.registerAppWOPTU) -runner.Step("Pin OnHashChange", common.pinOnHashChange) runner.Step("App activation", common.activateApp) for i = 1,3 do runner.Step("AddCommand" .. i, common.addCommand, { common.getAddCommandParams(i) }) @@ -60,4 +59,4 @@ runner.Step("App resumption", common.registrationWithResumption, { 1, resumptionLevelMedia, common.resumptionDataAddCommands }) runner.Title("Postconditions") -runner.Step("Stop SDL", common.postconditions) \ No newline at end of file +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/SDL5_0/ConditionalResumption/common.lua b/test_scripts/SDL5_0/ConditionalResumption/common.lua index 901a519cbe..cd52a676e5 100644 --- a/test_scripts/SDL5_0/ConditionalResumption/common.lua +++ b/test_scripts/SDL5_0/ConditionalResumption/common.lua @@ -61,16 +61,6 @@ function common.preconditions() common.hashID = nil end -function common.pinOnHashChange(pAppId) - if not pAppId then pAppId = 1 end - common.getMobileSession(pAppId):ExpectNotification("OnHashChange") - :Pin() - :Times(AnyNumber()) - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end - function common.cleanSessions() for i = 1, common.getAppsCount() do test.mobileSession[i]:StopRPC() @@ -165,6 +155,10 @@ function common.addCommand(pParams, pAppId) end) end mobSession:ExpectResponse(cid, { success = true, resultCode = "SUCCESS"}) + common.getMobileSession(pAppId):ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) end From 59cac5045545808be362afa33d075e9fde3b3d21 Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Wed, 6 Oct 2021 11:27:51 -0400 Subject: [PATCH 2/4] Improve stability of Policy scripts --- ...t_Remove_PTU_File_Got_From_Sync_After_Getting_The_Updates.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/test_scripts/Policies/Policy_Table_Update/154_ATF_PTU_SDL_Must_Remove_PTU_File_Got_From_Sync_After_Getting_The_Updates.lua b/test_scripts/Policies/Policy_Table_Update/154_ATF_PTU_SDL_Must_Remove_PTU_File_Got_From_Sync_After_Getting_The_Updates.lua index f438080deb..7412cb6dbd 100644 --- a/test_scripts/Policies/Policy_Table_Update/154_ATF_PTU_SDL_Must_Remove_PTU_File_Got_From_Sync_After_Getting_The_Updates.lua +++ b/test_scripts/Policies/Policy_Table_Update/154_ATF_PTU_SDL_Must_Remove_PTU_File_Got_From_Sync_After_Getting_The_Updates.lua @@ -56,6 +56,7 @@ require("user_modules/AppTypes") commonFunctions:newTestCasesGroup("Preconditions") function Test:Precondition_ActivateApp() + EXPECT_HMINOTIFICATION("SDL.OnStatusUpdate", {status = "UPDATE_NEEDED"}, {status = "UPDATING"}):Times(2) local requestId1 = self.hmiConnection:SendRequest("SDL.ActivateApp", { appID = self.applications["Test Application"] }) EXPECT_HMIRESPONSE(requestId1) :Do(function(_, data1) From acda7b06cb9b7109f1af82d6f77eff87813069c0 Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Wed, 6 Oct 2021 18:54:42 -0400 Subject: [PATCH 3/4] Improve stability of scripts for 2405 issue --- test_scripts/Defects/5_0/2405/common.lua | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/test_scripts/Defects/5_0/2405/common.lua b/test_scripts/Defects/5_0/2405/common.lua index d4fa3e7f97..7f701b2308 100644 --- a/test_scripts/Defects/5_0/2405/common.lua +++ b/test_scripts/Defects/5_0/2405/common.lua @@ -35,7 +35,12 @@ function m.policyTableUpdate(pGrp) table.insert(pTbl.policy_table.app_policies[appId].groups, pGrp[i].name) end end - ptuOrig(ptUpdate) + local function expMsgs() + common.getMobileSession():ExpectNotification("OnPermissionsChange") + common.hmi.getConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) + common.hmi.getConnection():ExpectNotification("SDL.OnStatusUpdate", { status = "UP_TO_DATE" }) + end + ptuOrig(ptUpdate, expMsgs) end local function getGroupId(pData, pGrpName) From b382648949a610e0cb8d8eb9201d8bf944c23e56 Mon Sep 17 00:00:00 2001 From: Dmitriy Boltovskiy Date: Wed, 6 Oct 2021 19:49:55 -0400 Subject: [PATCH 4/4] Fix script for 3674 issue for HTTP policy mode --- .../8_0/3674_2_HMI_starts_PTU_before_UpdateAppList.lua | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test_scripts/Defects/8_0/3674_2_HMI_starts_PTU_before_UpdateAppList.lua b/test_scripts/Defects/8_0/3674_2_HMI_starts_PTU_before_UpdateAppList.lua index 21bf32f6e7..5d586f8ce4 100644 --- a/test_scripts/Defects/8_0/3674_2_HMI_starts_PTU_before_UpdateAppList.lua +++ b/test_scripts/Defects/8_0/3674_2_HMI_starts_PTU_before_UpdateAppList.lua @@ -113,12 +113,13 @@ local function policyTableUpdateHttp() ptuTable.policy_table.app_policies[common.app.getPolicyAppId(i)] = common.ptu.getAppData(i) end utils.tableToJsonFile(ptuTable, ptuFileName) - local cid = common.getMobileSession(ptuAppNum):SendRPC("SystemRequest", - { requestType = "HTTP", fileName = "PolicyTableUpdate" }, ptuFileName) if not pExpNotificationFunc then common.getHMIConnection():ExpectRequest("VehicleInfo.GetVehicleData", { odometer = true }) - common.getHMIConnection():ExpectNotification("SDL.OnStatusUpdate", { status = "UP_TO_DATE" }) + common.getHMIConnection():ExpectNotification("SDL.OnStatusUpdate", + { status = "UPDATE_NEEDED" }, { status = "UPDATING" }, { status = "UP_TO_DATE" }):Times(3) end + local cid = common.getMobileSession(ptuAppNum):SendRPC("SystemRequest", + { requestType = "HTTP", fileName = "PolicyTableUpdate" }, ptuFileName) common.getMobileSession(ptuAppNum):ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) :Do(function() os.remove(ptuFileName) end) end