From 3df83ea488aa33c40bba1afce3f20af8d0286782 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Wed, 24 Jun 2020 16:07:02 -0400 Subject: [PATCH 01/14] Add tests for additional submenus and driver distraction systemCapability --- .../001_additional_submenu_success.lua | 63 ++++++++++++++++++ .../002_legacy_app_parentID_filtered.lua | 65 +++++++++++++++++++ .../001_get_driver_distraction_capability.lua | 54 +++++++++++++++ 3 files changed, 182 insertions(+) create mode 100644 test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua create mode 100644 test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua create mode 100644 test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua new file mode 100644 index 0000000000..d514c78a5f --- /dev/null +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -0,0 +1,63 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends AddSubMenu SubMenu with menuID = 1 +-- 3) Mobile sends additional AddSubMenu request with menuID = 99 and parentID = 1 +-- SDL does: +-- 1) Sends AddSubMenu requests to HMI with parentID in menu params +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local requestParams = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 +} + +local hmiRequestParams = { + menuID = 99, + menuParams = { + menuName = "SubMenu2", + parentID = 1 + } +} + +local function AdditionalSubmenu() + local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu", AdditionalSubmenu) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua new file mode 100644 index 0000000000..8951c7f2aa --- /dev/null +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -0,0 +1,65 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request with a legacy RPC spec version +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends AddSubMenu SubMenu with menuID = 1 +-- 3) Mobile sends additional AddSubMenu request with menuID = 99 and parentID = 1 +-- SDL does: +-- 1) Sends AddSubMenu requests to HMI with no parentID included in the requests +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 6, + minorVersion = 0 +} + +--[[ Local Variables ]] +local requestParams = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 +} + +local hmiRequestParams = { + menuID = 99, + menuParams = { + menuName = "SubMenu2" + } +} + +local function AdditionalSubmenu() + local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) + :ValidIf(function(_, data) + return data.params.menuParams["parentID"] == nil + end) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu for legacy app", AdditionalSubmenu) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua b/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua new file mode 100644 index 0000000000..d6eed5585c --- /dev/null +++ b/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua @@ -0,0 +1,54 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0152-driver-distraction-list-limits.md +-- Description: +-- In case: +-- 1) Mobile requests SystemCapability type DRIVER_DISTRACTION +-- SDL does: +-- 1) Send GetSystemCapability Response with submenuDepth and menuLength limitations +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local requestParams = { + systemCapabilityType = "DRIVER_DISTRACTION" +} + +local responseParams = { + systemCapability = { + systemCapabilityType="DRIVER_DISTRACTION", + driverDistractionCapability = { + subMenuDepth = 3, + menuLength = 10 + } + }, + success = true, + resultCode = "SUCCESS" +} + +local function GetDriverDistractionCapability() + local cid = common.getMobileSession():SendRPC("GetSystemCapability", requestParams) + common.getMobileSession():ExpectResponse(cid, responseParams) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Get Driver Distraction Capability", GetDriverDistractionCapability) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) From 06b38fa9c82d65cde024ac239741cba27742ed4c Mon Sep 17 00:00:00 2001 From: JackLivio Date: Tue, 14 Jul 2020 13:05:26 -0400 Subject: [PATCH 02/14] Add test set --- test_sets/additional_submenus_and_driver_distraction.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 test_sets/additional_submenus_and_driver_distraction.txt diff --git a/test_sets/additional_submenus_and_driver_distraction.txt b/test_sets/additional_submenus_and_driver_distraction.txt new file mode 100644 index 0000000000..6ef6c79323 --- /dev/null +++ b/test_sets/additional_submenus_and_driver_distraction.txt @@ -0,0 +1,3 @@ +./test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +./test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +./test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua From c93d96656593e472add2c4a2265095becb2d2566 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Tue, 14 Jul 2020 15:25:13 -0400 Subject: [PATCH 03/14] Address comments and add extra test cases --- ...bmenu_with_nested_submenu_and_commands.lua | 173 +++++++++++++++++ ...menu_with_nested_submenus_and_commands.lua | 176 ++++++++++++++++++ ...duplicate_name_different_level_success.lua | 81 ++++++++ .../006_duplicate_name_same_level_fail.lua | 75 ++++++++ ...tional_submenus_and_driver_distraction.txt | 6 +- user_modules/hmi_values.lua | 4 + 6 files changed, 514 insertions(+), 1 deletion(-) create mode 100644 test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua create mode 100644 test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua create mode 100644 test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua create mode 100644 test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua new file mode 100644 index 0000000000..782dcba0c0 --- /dev/null +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -0,0 +1,173 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends 3 AddSubMenu requests where each submenu is nested in the previous submenu +-- 3) Mobile sends 2 Add Command requests to populate the nested submenus +-- 4) Mobile requests to delete a nested submenu +-- SDL does: +-- 1) Sends DeleteSubmenu and DeleteCommand requests for the request submenu and all contents under that submenu +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local mobileAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + }, + submenu3 = { + menuID = 101, + menuName = "SubMenu3", + parentID = 99 + } +} + +local mobileAddCommandRequestParans = { + addCommand1 = { + cmdID = 44, + menuParams = { + parentID = 99, + menuName = "SubMenu2" + } + }, + addCommand2 = { + cmdID = 45, + menuParams = { + parentID = 101, + menuName = "SubMenu3" + } + } +} + +local mobileDeleteSubMenuRequestParams = { + menuID = 99 +} + +local hmiAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuParams = { + menuName = "SubMenu2", + parentID = 1 + } + }, + subMenu3 = { + menuID = 101, + menuParams = { + menuName = "SubMenu3", + parentID = 99 + } + }, + +local hmiAddCommandRequestParams = { + addCommand1 = { + cmdID = 44, + menuParams = { + parentID = 99, + menuName = "SubMenu2" + } + }, + addCommand2 = { + cmdID = 45, + menuParams = { + parentID = 101, + menuName = "SubMenu3" + } + } +} + +local hmiDeleteSubMenuRequestParams = { + deleteSubMenu2 = { + menuID = 101 + }, + deleteSubMenu3 = { + menuID = 99 + } +} + +local hmiDeleteCommandRequestParams = { + deleteCommand1 = { + cmdID = 44 + }, + deleteCommand2 = { + cmdID = 45 + } +} + +local function AddNestedSubMenus() + for key, params in pairs(mobileAddSubMenuRequestParams) do + local cid = common.getMobileSession():SendRPC("AddSubMenu", params) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) + end +end + +local function AddNestedCommands() + for key, params in pairs(mobileAddCommandRequestParans) do + local cid = common.getMobileSession():SendRPC("AddSubMenu", params) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddCommandRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) + end +end + +local function DeleteSubMenu() + local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) + for key, deleteCommandParams in pairs(hmiDeleteCommandRequestParams) do + common.getHMIConnection():ExpectRequest("UI.DeleteCommand", deleteCommandParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + end + + for key, deleteSubMenuParams in pairs(hmiDeleteCommandRequestParams) do + common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", deleteSubMenuParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + end + + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu", AddNestedSubMenus) +runner.Step("Add Commands to nested submenus", AddNestedCommands) +runner.Step("Send DeleteSubMenu", DeleteSubMenu) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua new file mode 100644 index 0000000000..eecfa8202a --- /dev/null +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -0,0 +1,176 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends 3 AddSubMenu requests where each submenu is nested in the previous submenu +-- 3) Mobile sends 2 Add Command requests to populate the nested submenus +-- 4) Mobile requests to delete the top level submenu +-- SDL does: +-- 1) Sends DeleteSubmenu and DeleteCommand requests for the requested submenu and all contents under that submenu +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local mobileAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + }, + submenu3 = { + menuID = 101, + menuName = "SubMenu3", + parentID = 99 + } +} + +local mobileAddCommandRequestParans = { + addCommand1 = { + cmdID = 44, + menuParams = { + parentID = 99, + menuName = "SubMenu2" + } + }, + addCommand2 = { + cmdID = 45, + menuParams = { + parentID = 101, + menuName = "SubMenu3" + } + } +} + +local mobileDeleteSubMenuRequestParams = { + menuID = 1 +} + +local hmiAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuParams = { + menuName = "SubMenu2", + parentID = 1 + } + }, + subMenu3 = { + menuID = 101, + menuParams = { + menuName = "SubMenu3", + parentID = 99 + } + }, + +local hmiAddCommandRequestParams = { + addCommand1 = { + cmdID = 44, + menuParams = { + parentID = 99, + menuName = "SubMenu2" + } + }, + addCommand2 = { + cmdID = 45, + menuParams = { + parentID = 101, + menuName = "SubMenu3" + } + } +} + +local hmiDeleteSubMenuRequestParams = { + deleteSubMenu1 = { + menuID = 101 + }, + deleteSubMenu2 = { + menuID = 99 + }, + deleteSubMenu3 = { + menuID = 1 + } +} + +local hmiDeleteCommandRequestParams = { + deleteCommand1 = { + cmdID = 44 + }, + deleteCommand2 = { + cmdID = 45 + } +} + +local function AddNestedSubMenus() + for key, params in pairs(mobileAddSubMenuRequestParams) do + local cid = common.getMobileSession():SendRPC("AddSubMenu", params) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) + end +end + +local function AddNestedCommands() + for key, params in pairs(mobileAddCommandRequestParans) do + local cid = common.getMobileSession():SendRPC("AddSubMenu", params) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddCommandRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) + end +end + +local function DeleteSubMenu() + local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) + for key, deleteCommandParams in pairs(hmiDeleteCommandRequestParams) do + common.getHMIConnection():ExpectRequest("UI.DeleteCommand", deleteCommandParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + end + + for key, deleteSubMenuParams in pairs(hmiDeleteCommandRequestParams) do + common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", deleteSubMenuParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + end + + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu", AddNestedSubMenus) +runner.Step("Add Commands to nested submenus", AddNestedCommands) +runner.Step("Send DeleteSubMenu", DeleteTopLevelSubMenu) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua new file mode 100644 index 0000000000..77b22bc880 --- /dev/null +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -0,0 +1,81 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends AddSubMenu SubMenu with menuID = 1 +-- 3) Mobile sends additional AddSubMenu requests where a nested submenu has the same menu name as its parent menu +-- SDL does: +-- 1) Sends AddSubMenu requests to HMI with parentID in menu params +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local mobileAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + }, + submenu3 = { + menuID = 101, + menuName = "SubMenu2", + parentID = 99 + } +} + +local hmiAddSubMenuRequestParams = { + subMenu2 = { + menuID = 99, + menuParams = { + menuName = "SubMenu2", + parentID = 1 + } + }, + subMenu3 = { + menuID = 101, + menuParams = { + menuName = "SubMenu2", + parentID = 99 + } + } +} + +local function AddNestedSubMenus() + for key, params in pairs(mobileAddSubMenuRequestParams) do + local cid = common.getMobileSession():SendRPC("AddSubMenu", params) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) + end +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu", AddNestedSubMenus) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua new file mode 100644 index 0000000000..d2d6052940 --- /dev/null +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -0,0 +1,75 @@ +--------------------------------------------------------------------------------------------------- +-- Proposal: +-- https://github.com/smartdevicelink/sdl_evolution/blob/master/proposals/0148-template-additional-submenus.md#backwards-compatibility +-- Description: Tests sending a parentID param in a AddSubMenu request +-- In case: +-- 1) Mobile application is set to appropriate HMI level and System Context MENU, MAIN +-- 2) Mobile application sends AddSubMenu SubMenu with menuID = 1 +-- 3) Mobile sends additional AddSubMenu requests where two submenus at the same level have a duplicate menuName +-- SDL does: +-- 1) Fails the request with result code DUPLICATE_NAME +--------------------------------------------------------------------------------------------------- +-- [[ Required Shared libraries ]] +local runner = require('user_modules/script_runner') +local common = require('test_scripts/Smoke/commonSmoke') + +-- [[ Test Configuration ]] +runner.testSettings.isSelfIncluded = false +config.application1.registerAppInterfaceParams.syncMsgVersion = { + majorVersion = 7, + minorVersion = 0 +} + +--[[ Local Variables ]] +local requestParams = { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 +} + +local hmiRequestParams = { + menuID = 99, + menuParams = { + menuName = "SubMenu2", + parentID = 1 + } +} + +local duplicateNameRequestParams = { + menuID = 101, + menuName = "SubMenu2", + parentID = 1 +} + +local function AdditionalSubmenu() + local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) +end + +local function DuplicateNameMenu() + local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + common.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "DUPLICATE_NAME" }) +end + +--[[ Scenario ]] +runner.Title("Preconditions") +runner.Step("Clean environment", common.preconditions) +runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) +runner.Step("App registration", common.registerApp) + +runner.Title("Test") +runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) +runner.Step("Add menu", common.addSubMenu) +runner.Step("Add additional submenu", AdditionalSubmenu) +runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) + +runner.Title("Postconditions") +runner.Step("Stop SDL", common.postconditions) diff --git a/test_sets/additional_submenus_and_driver_distraction.txt b/test_sets/additional_submenus_and_driver_distraction.txt index 6ef6c79323..96ed09e254 100644 --- a/test_sets/additional_submenus_and_driver_distraction.txt +++ b/test_sets/additional_submenus_and_driver_distraction.txt @@ -1,3 +1,7 @@ ./test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua ./test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua -./test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua +./test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +./test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +./test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +./test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +./test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua \ No newline at end of file diff --git a/user_modules/hmi_values.lua b/user_modules/hmi_values.lua index cb78767e84..4f8a2d48d0 100644 --- a/user_modules/hmi_values.lua +++ b/user_modules/hmi_values.lua @@ -394,6 +394,10 @@ function module.getDefaultHMITable() diagonalScreenSize = 10, pixelPerInch = 150, scale = 2.5 + }, + driverDistractionCapability = { + subMenuDepth = 3, + menuLength = 10 } } }, From 76a9e023a403c16dd16cfebb4ae44ec6e293ba68 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Wed, 15 Jul 2020 15:12:50 -0400 Subject: [PATCH 04/14] Fix test cases --- ...bmenu_with_nested_submenu_and_commands.lua | 84 +++++++++--------- ...menu_with_nested_submenus_and_commands.lua | 87 ++++++++++--------- ...duplicate_name_different_level_success.lua | 28 +++--- .../006_duplicate_name_same_level_fail.lua | 2 +- 4 files changed, 103 insertions(+), 98 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index 782dcba0c0..a9bd56757b 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -70,7 +70,8 @@ local hmiAddSubMenuRequestParams = { menuName = "SubMenu3", parentID = 99 } - }, + } +} local hmiAddCommandRequestParams = { addCommand1 = { @@ -107,51 +108,48 @@ local hmiDeleteCommandRequestParams = { } } -local function AddNestedSubMenus() - for key, params in pairs(mobileAddSubMenuRequestParams) do - local cid = common.getMobileSession():SendRPC("AddSubMenu", params) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) - end +local function AddNestedSubMenus(key) + local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) end -local function AddNestedCommands() - for key, params in pairs(mobileAddCommandRequestParans) do - local cid = common.getMobileSession():SendRPC("AddSubMenu", params) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddCommandRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) - end +local function AddNestedCommands(key) + local cid = common.getMobileSession():SendRPC("AddCommand", mobileAddCommandRequestParans[key]) + common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiAddCommandRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) end local function DeleteSubMenu() local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) - for key, deleteCommandParams in pairs(hmiDeleteCommandRequestParams) do - common.getHMIConnection():ExpectRequest("UI.DeleteCommand", deleteCommandParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - end - for key, deleteSubMenuParams in pairs(hmiDeleteCommandRequestParams) do - common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", deleteSubMenuParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - end + common.getHMIConnection():ExpectRequest("UI.DeleteCommand", + hmiDeleteCommandRequestParams[deleteCommand1], + hmiDeleteCommandRequestParams[deleteCommand2] + ) + :Times(2) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + + common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", + hmiDeleteSubMenuRequestParams[deleteSubMenu2], + hmiDeleteSubMenuRequestParams[deleteSubMenu3] + ) + :Times(2) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) end @@ -165,8 +163,12 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", AddNestedSubMenus) -runner.Step("Add Commands to nested submenus", AddNestedCommands) +for key, params in pairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +end +for key, params in pairs(mobileAddCommandRequestParans) do + runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) +end runner.Step("Send DeleteSubMenu", DeleteSubMenu) runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index eecfa8202a..69df7c2d15 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -70,7 +70,8 @@ local hmiAddSubMenuRequestParams = { menuName = "SubMenu3", parentID = 99 } - }, + } +} local hmiAddCommandRequestParams = { addCommand1 = { @@ -110,51 +111,49 @@ local hmiDeleteCommandRequestParams = { } } -local function AddNestedSubMenus() - for key, params in pairs(mobileAddSubMenuRequestParams) do - local cid = common.getMobileSession():SendRPC("AddSubMenu", params) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) - end +local function AddNestedSubMenus(key) + local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) end -local function AddNestedCommands() - for key, params in pairs(mobileAddCommandRequestParans) do - local cid = common.getMobileSession():SendRPC("AddSubMenu", params) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddCommandRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) - end +local function AddNestedCommands(key) + local cid = common.getMobileSession():SendRPC("AddCommand", mobileAddCommandRequestParans[key]) + common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiAddCommandRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) end local function DeleteSubMenu() local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) - for key, deleteCommandParams in pairs(hmiDeleteCommandRequestParams) do - common.getHMIConnection():ExpectRequest("UI.DeleteCommand", deleteCommandParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - end - for key, deleteSubMenuParams in pairs(hmiDeleteCommandRequestParams) do - common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", deleteSubMenuParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - end + common.getHMIConnection():ExpectRequest("UI.DeleteCommand", + hmiDeleteCommandRequestParams[deleteCommand1], + hmiDeleteCommandRequestParams[deleteCommand2] + ) + :Times(2) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + + common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", + hmiDeleteSubMenuRequestParams[deleteSubMenu1], + hmiDeleteSubMenuRequestParams[deleteSubMenu2], + hmiDeleteSubMenuRequestParams[deleteSubMenu3] + ) + :Times(3) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) end @@ -168,9 +167,13 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", AddNestedSubMenus) -runner.Step("Add Commands to nested submenus", AddNestedCommands) -runner.Step("Send DeleteSubMenu", DeleteTopLevelSubMenu) +for key, params in pairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +end +for key, params in pairs(mobileAddCommandRequestParans) do + runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) +end +runner.Step("Send DeleteSubMenu", DeleteSubMenu) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index 77b22bc880..f7ed4b6f8e 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -51,19 +51,17 @@ local hmiAddSubMenuRequestParams = { } } -local function AddNestedSubMenus() - for key, params in pairs(mobileAddSubMenuRequestParams) do - local cid = common.getMobileSession():SendRPC("AddSubMenu", params) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) - end +local function AddNestedSubMenus(key) + local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) end --[[ Scenario ]] @@ -75,7 +73,9 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", AddNestedSubMenus) +for key, params in pairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +end runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index d2d6052940..d50640bc39 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -55,7 +55,7 @@ local function AdditionalSubmenu() end local function DuplicateNameMenu() - local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + local cid = common.getMobileSession():SendRPC("AddSubMenu", duplicateNameRequestParams) common.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "DUPLICATE_NAME" }) end From bc5294bda178d51ad23dac63b7018a9ecfb30cef Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 23 Jul 2020 16:39:16 -0400 Subject: [PATCH 05/14] Remove 7.0 declarations in each test --- .../Additional_Submenus/001_additional_submenu_success.lua | 4 ---- ...delete_nested_submenu_with_nested_submenu_and_commands.lua | 4 ---- ...te_top_level_submenu_with_nested_submenus_and_commands.lua | 4 ---- .../005_duplicate_name_different_level_success.lua | 4 ---- .../006_duplicate_name_same_level_fail.lua | 4 ---- .../001_get_driver_distraction_capability.lua | 4 ---- 6 files changed, 24 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index d514c78a5f..8c7f7ce61d 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -15,10 +15,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local requestParams = { diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index a9bd56757b..1a25a93d72 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -16,10 +16,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index 69df7c2d15..a0f315a1ad 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -16,10 +16,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index f7ed4b6f8e..cb03fd2359 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -15,10 +15,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index d50640bc39..fc56830b00 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -15,10 +15,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local requestParams = { diff --git a/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua b/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua index d6eed5585c..a281f559ef 100644 --- a/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua +++ b/test_scripts/API/DriverDistractionCapability/001_get_driver_distraction_capability.lua @@ -13,10 +13,6 @@ local common = require('test_scripts/Smoke/commonSmoke') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false -config.application1.registerAppInterfaceParams.syncMsgVersion = { - majorVersion = 7, - minorVersion = 0 -} --[[ Local Variables ]] local requestParams = { From eb71cff808c9f2fdbfe5335ce23f751514939506 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 23 Jul 2020 13:42:08 -0700 Subject: [PATCH 06/14] Update test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua Co-authored-by: Jacob Keeler --- ...lete_top_level_submenu_with_nested_submenus_and_commands.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index a0f315a1ad..2c19e70179 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -167,7 +167,7 @@ for key, params in pairs(mobileAddSubMenuRequestParams) do runner.Step("Add additional submenu", AddNestedSubMenus, { key }) end for key, params in pairs(mobileAddCommandRequestParans) do - runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) + runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) end runner.Step("Send DeleteSubMenu", DeleteSubMenu) From 3df62c7f0c71cddbc69ac9cf5016f60ee7f70ae1 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Fri, 24 Jul 2020 12:37:06 -0400 Subject: [PATCH 07/14] Address comments --- .../001_additional_submenu_success.lua | 17 +-- .../002_legacy_app_parentID_filtered.lua | 19 +-- ...bmenu_with_nested_submenu_and_commands.lua | 122 ++++++----------- ...menu_with_nested_submenus_and_commands.lua | 127 ++++++------------ ...duplicate_name_different_level_success.lua | 39 ++---- .../006_duplicate_name_same_level_fail.lua | 17 +-- .../additional_submenus_common.lua | 66 +++++++++ 7 files changed, 163 insertions(+), 244 deletions(-) create mode 100644 test_scripts/API/Additional_Submenus/additional_submenus_common.lua diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index 8c7f7ce61d..53e3214332 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -11,7 +11,7 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -30,19 +30,6 @@ local hmiRequestParams = { parentID = 1 } } - -local function AdditionalSubmenu() - local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end --[[ Scenario ]] runner.Title("Preconditions") @@ -53,7 +40,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", AdditionalSubmenu) +runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index 8951c7f2aa..aece6415de 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -11,7 +11,7 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -34,21 +34,6 @@ local hmiRequestParams = { } } -local function AdditionalSubmenu() - local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) - :ValidIf(function(_, data) - return data.params.menuParams["parentID"] == nil - end) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end --[[ Scenario ]] runner.Title("Preconditions") @@ -59,7 +44,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu for legacy app", AdditionalSubmenu) +runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index 1a25a93d72..c4118932ff 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -12,19 +12,19 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { - subMenu2 = { + { menuID = 99, menuName = "SubMenu2", parentID = 1 }, - submenu3 = { + { menuID = 101, menuName = "SubMenu3", parentID = 99 @@ -32,18 +32,18 @@ local mobileAddSubMenuRequestParams = { } local mobileAddCommandRequestParans = { - addCommand1 = { + { cmdID = 44, menuParams = { - parentID = 99, - menuName = "SubMenu2" + parentID = mobileAddSubMenuRequestParams[1].menuID, + menuName = "Add Command 1" } }, - addCommand2 = { + { cmdID = 45, menuParams = { - parentID = 101, - menuName = "SubMenu3" + parentID = mobileAddSubMenuRequestParams[2].menuID, + menuName = "Add Command 2" } } } @@ -53,102 +53,56 @@ local mobileDeleteSubMenuRequestParams = { } local hmiAddSubMenuRequestParams = { - subMenu2 = { - menuID = 99, + { + menuID = mobileAddSubMenuRequestParams[1].menuID, menuParams = { - menuName = "SubMenu2", - parentID = 1 + menuName = mobileAddSubMenuRequestParams[1].menuName, + parentID = mobileAddSubMenuRequestParams[1].parentID } }, - subMenu3 = { - menuID = 101, + { + menuID = mobileAddSubMenuRequestParams[2].menuID, menuParams = { - menuName = "SubMenu3", - parentID = 99 + menuName = mobileAddSubMenuRequestParams[2].menuName, + parentID = mobileAddSubMenuRequestParams[2].parentID } } } local hmiAddCommandRequestParams = { - addCommand1 = { - cmdID = 44, + { + cmdID = mobileAddCommandRequestParans[1].cmdID, menuParams = { - parentID = 99, - menuName = "SubMenu2" + parentID = mobileAddCommandRequestParans[1].menuParams.parentID, + menuName = mobileAddCommandRequestParans[1].menuParams.menuName } }, - addCommand2 = { - cmdID = 45, + { + cmdID = mobileAddCommandRequestParans[2].cmdID, menuParams = { - parentID = 101, - menuName = "SubMenu3" + parentID = mobileAddCommandRequestParans[2].menuParams.parentID, + menuName = mobileAddCommandRequestParans[2].menuParams.menuName } } } local hmiDeleteSubMenuRequestParams = { - deleteSubMenu2 = { - menuID = 101 + { + menuID = mobileAddSubMenuRequestParams[2].menuID }, - deleteSubMenu3 = { - menuID = 99 + { + menuID = mobileAddSubMenuRequestParams[1].menuID } } local hmiDeleteCommandRequestParams = { - deleteCommand1 = { - cmdID = 44 + { + cmdID = mobileAddCommandRequestParans[1].cmdID }, - deleteCommand2 = { - cmdID = 45 + { + cmdID = mobileAddCommandRequestParans[2].cmdID } } - -local function AddNestedSubMenus(key) - local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) -end - -local function AddNestedCommands(key) - local cid = common.getMobileSession():SendRPC("AddCommand", mobileAddCommandRequestParans[key]) - common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiAddCommandRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end - -local function DeleteSubMenu() - local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) - - common.getHMIConnection():ExpectRequest("UI.DeleteCommand", - hmiDeleteCommandRequestParams[deleteCommand1], - hmiDeleteCommandRequestParams[deleteCommand2] - ) - :Times(2) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - - common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", - hmiDeleteSubMenuRequestParams[deleteSubMenu2], - hmiDeleteSubMenuRequestParams[deleteSubMenu3] - ) - :Times(2) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) -end --[[ Scenario ]] runner.Title("Preconditions") @@ -159,13 +113,13 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -for key, params in pairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +for i, _ in ipairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end -for key, params in pairs(mobileAddCommandRequestParans) do - runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) +for i, _ in ipairs(mobileAddCommandRequestParans) do + runner.Step("Add Commands to nested submenus", common.AddNestedCommands, { mobileAddCommandRequestParans[i], hmiAddCommandRequestParams[i]}) end -runner.Step("Send DeleteSubMenu", DeleteSubMenu) +runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index a0f315a1ad..98e0e40288 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -12,19 +12,19 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { - subMenu2 = { + { menuID = 99, menuName = "SubMenu2", parentID = 1 }, - submenu3 = { + { menuID = 101, menuName = "SubMenu3", parentID = 99 @@ -32,18 +32,18 @@ local mobileAddSubMenuRequestParams = { } local mobileAddCommandRequestParans = { - addCommand1 = { + { cmdID = 44, menuParams = { - parentID = 99, - menuName = "SubMenu2" + parentID = mobileAddSubMenuRequestParams[1].menuID, + menuName = "Add Command 1" } }, - addCommand2 = { + { cmdID = 45, menuParams = { - parentID = 101, - menuName = "SubMenu3" + parentID = mobileAddSubMenuRequestParams[2].menuID, + menuName = "Add Command 2" } } } @@ -53,106 +53,59 @@ local mobileDeleteSubMenuRequestParams = { } local hmiAddSubMenuRequestParams = { - subMenu2 = { - menuID = 99, + { + menuID = mobileAddSubMenuRequestParams[1].menuID, menuParams = { - menuName = "SubMenu2", - parentID = 1 + menuName = mobileAddSubMenuRequestParams[1].menuName, + parentID = mobileAddSubMenuRequestParams[1].parentID } }, - subMenu3 = { - menuID = 101, + { + menuID = mobileAddSubMenuRequestParams[2].menuID, menuParams = { - menuName = "SubMenu3", - parentID = 99 + menuName = mobileAddSubMenuRequestParams[2].menuName, + parentID = mobileAddSubMenuRequestParams[2].parentID } } } local hmiAddCommandRequestParams = { - addCommand1 = { - cmdID = 44, + { + cmdID = mobileAddCommandRequestParans[1].cmdID, menuParams = { - parentID = 99, - menuName = "SubMenu2" + parentID = mobileAddCommandRequestParans[1].menuParams.parentID, + menuName = mobileAddCommandRequestParans[1].menuParams.menuName } }, - addCommand2 = { - cmdID = 45, + { + cmdID = mobileAddCommandRequestParans[2].cmdID, menuParams = { - parentID = 101, - menuName = "SubMenu3" + parentID = mobileAddCommandRequestParans[2].menuParams.parentID, + menuName = mobileAddCommandRequestParans[2].menuParams.menuName } } } local hmiDeleteSubMenuRequestParams = { - deleteSubMenu1 = { - menuID = 101 + { + menuID = mobileAddSubMenuRequestParams[1].menuID }, - deleteSubMenu2 = { - menuID = 99 + { + menuID = mobileAddSubMenuRequestParams[2].menuID }, - deleteSubMenu3 = { - menuID = 1 + { + menuID = mobileDeleteSubMenuRequestParams.menuID } } local hmiDeleteCommandRequestParams = { - deleteCommand1 = { - cmdID = 44 + { + cmdID = mobileAddCommandRequestParans[1].cmdID }, - deleteCommand2 = { - cmdID = 45 + { + cmdID = mobileAddCommandRequestParans[2].cmdID } } - -local function AddNestedSubMenus(key) - local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) -end - -local function AddNestedCommands(key) - local cid = common.getMobileSession():SendRPC("AddCommand", mobileAddCommandRequestParans[key]) - common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiAddCommandRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end - -local function DeleteSubMenu() - local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileDeleteSubMenuRequestParams) - - common.getHMIConnection():ExpectRequest("UI.DeleteCommand", - hmiDeleteCommandRequestParams[deleteCommand1], - hmiDeleteCommandRequestParams[deleteCommand2] - ) - :Times(2) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - - common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", - hmiDeleteSubMenuRequestParams[deleteSubMenu1], - hmiDeleteSubMenuRequestParams[deleteSubMenu2], - hmiDeleteSubMenuRequestParams[deleteSubMenu3] - ) - :Times(3) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) -end --[[ Scenario ]] runner.Title("Preconditions") @@ -163,13 +116,13 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -for key, params in pairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +for i, _ in ipairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end -for key, params in pairs(mobileAddCommandRequestParans) do - runner.Step("Add Commands to nested submenus", AddNestedCommands, { key }) +for i, _ in ipairs(mobileAddCommandRequestParans) do + runner.Step("Add Commands to nested submenus", common.AddNestedCommands, { mobileAddCommandRequestParans[i], hmiAddCommandRequestParams[i]}) end -runner.Step("Send DeleteSubMenu", DeleteSubMenu) +runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index cb03fd2359..5197ad3f4f 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -11,19 +11,19 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local mobileAddSubMenuRequestParams = { - subMenu2 = { + { menuID = 99, menuName = "SubMenu2", parentID = 1 }, - submenu3 = { + { menuID = 101, menuName = "SubMenu2", parentID = 99 @@ -31,34 +31,21 @@ local mobileAddSubMenuRequestParams = { } local hmiAddSubMenuRequestParams = { - subMenu2 = { - menuID = 99, + { + menuID = mobileAddSubMenuRequestParams[1].menuID, menuParams = { - menuName = "SubMenu2", - parentID = 1 + menuName = mobileAddSubMenuRequestParams[1].menuName, + parentID = mobileAddSubMenuRequestParams[1].parentID } }, - subMenu3 = { - menuID = 101, + { + menuID = mobileAddSubMenuRequestParams[2].menuID, menuParams = { - menuName = "SubMenu2", - parentID = 99 + menuName = mobileAddSubMenuRequestParams[2].menuName, + parentID = mobileAddSubMenuRequestParams[2].parentID } } } - -local function AddNestedSubMenus(key) - local cid = common.getMobileSession():SendRPC("AddSubMenu", mobileAddSubMenuRequestParams[key]) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiAddSubMenuRequestParams[key]) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end --[[ Scenario ]] runner.Title("Preconditions") @@ -69,8 +56,8 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -for key, params in pairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", AddNestedSubMenus, { key }) +for i, _ in ipairs(mobileAddSubMenuRequestParams) do + runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index fc56830b00..3f3c856bca 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -11,7 +11,7 @@ --------------------------------------------------------------------------------------------------- -- [[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local common = require('test_scripts/Smoke/commonSmoke') +local common = require('test_scripts/API/Additional_Submenus/additional_submenus_common') -- [[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -36,19 +36,6 @@ local duplicateNameRequestParams = { menuName = "SubMenu2", parentID = 1 } - -local function AdditionalSubmenu() - local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) - common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) - :Do(function(_, data) - common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) - end) - common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) - common.getMobileSession():ExpectNotification("OnHashChange") - :Do(function(_, data) - common.hashId = data.payload.hashID - end) -end local function DuplicateNameMenu() local cid = common.getMobileSession():SendRPC("AddSubMenu", duplicateNameRequestParams) @@ -64,7 +51,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", AdditionalSubmenu) +runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua new file mode 100644 index 0000000000..ff2a1c41f4 --- /dev/null +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -0,0 +1,66 @@ +local common = require('test_scripts/Smoke/commonSmoke') + +local function reverseArray(arr) + local rev = {} + for i=#arr, 1, -1 do + rev[#rev+1] = arr[i] + end + return rev +end + +function common.AdditionalSubmenu(requestParams, hmiRequestParams, parentPresent) + local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) + common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) + :ValidIf(function(_, data) + if parentPresent == true then + return true + else + return data.params.menuParams["parentID"] == nil + end + end) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) +end + +function common.AddNestedCommands(mobileParams, hmiParams) + local cid = common.getMobileSession():SendRPC("AddCommand", mobileParams) + common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) + common.getMobileSession():ExpectNotification("OnHashChange") + :Do(function(_, data) + common.hashId = data.payload.hashID + end) +end + +function common.DeleteSubMenu(mobileParams, hmiDeleteCommandParams, hmiDeleteSubMenuParams) + local cid = common.getMobileSession():SendRPC("DeleteSubMenu", mobileParams) + + common.getHMIConnection():ExpectRequest("UI.DeleteCommand", + unpack(reverseArray(hmiDeleteCommandParams)) + ) + :Times(#hmiDeleteCommandParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + + common.getHMIConnection():ExpectRequest("UI.DeleteSubMenu", + unpack(reverseArray(hmiDeleteSubMenuParams)) + ) + :Times(#hmiDeleteSubMenuParams) + :Do(function(_, data) + common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {}) + end) + + common.getMobileSession():ExpectResponse(cid, { success = true, resultCode = "SUCCESS" }) +end + +return common From 3bf3e47ca1f98050664b30c53ce4e702adbfe557 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 08:13:15 -0700 Subject: [PATCH 08/14] Apply suggestions from code review Co-authored-by: Jacob Keeler --- .../Additional_Submenus/001_additional_submenu_success.lua | 6 +++--- .../002_legacy_app_parentID_filtered.lua | 4 ++-- ...lete_nested_submenu_with_nested_submenu_and_commands.lua | 2 +- .../API/Additional_Submenus/additional_submenus_common.lua | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index 53e3214332..f4934f0621 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -24,10 +24,10 @@ local requestParams = { } local hmiRequestParams = { - menuID = 99, + menuID = requestParams.menuID, menuParams = { - menuName = "SubMenu2", - parentID = 1 + menuName = requestParams.menuName, + parentID = requestParams.parentID } } diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index aece6415de..2e3d02c991 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -28,9 +28,9 @@ local requestParams = { } local hmiRequestParams = { - menuID = 99, + menuID = requestParams.menuID, menuParams = { - menuName = "SubMenu2" + menuName = requestParams.menuName } } diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index c4118932ff..29dbe27c98 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -31,7 +31,7 @@ local mobileAddSubMenuRequestParams = { } } -local mobileAddCommandRequestParans = { +local mobileAddCommandRequestParams = { { cmdID = 44, menuParams = { diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index ff2a1c41f4..2a99564476 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -8,7 +8,7 @@ local function reverseArray(arr) return rev end -function common.AdditionalSubmenu(requestParams, hmiRequestParams, parentPresent) +function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) :ValidIf(function(_, data) @@ -28,7 +28,7 @@ function common.AdditionalSubmenu(requestParams, hmiRequestParams, parentPresent end) end -function common.AddNestedCommands(mobileParams, hmiParams) +function common.addCommand(mobileParams, hmiParams) local cid = common.getMobileSession():SendRPC("AddCommand", mobileParams) common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiParams) :Do(function(_, data) From 6f748231688cdafd618dde47c319f3a9d75cdc3c Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 11:35:08 -0400 Subject: [PATCH 09/14] Address comments --- .../001_additional_submenu_success.lua | 2 +- .../002_legacy_app_parentID_filtered.lua | 2 +- ...bmenu_with_nested_submenu_and_commands.lua | 38 +++++++++--------- ...menu_with_nested_submenus_and_commands.lua | 40 ++++++++++--------- ...duplicate_name_different_level_success.lua | 11 ++--- .../006_duplicate_name_same_level_fail.lua | 12 +++--- .../additional_submenus_common.lua | 28 ++++++++++++- 7 files changed, 82 insertions(+), 51 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index f4934f0621..3c5066ad94 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -40,7 +40,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index 2e3d02c991..7947a49038 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -44,7 +44,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index 29dbe27c98..b135a8b31b 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -18,29 +18,31 @@ local common = require('test_scripts/API/Additional_Submenus/additional_submenus runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] +local menuIDs = {1, 99, 101} +local cmdIDs = {44, 45} local mobileAddSubMenuRequestParams = { { - menuID = 99, + menuID = menuIDs[2], menuName = "SubMenu2", - parentID = 1 + parentID = menuIDs[1] }, { - menuID = 101, + menuID = menuIDs[3], menuName = "SubMenu3", - parentID = 99 + parentID = menuIDs[2] } } local mobileAddCommandRequestParams = { { - cmdID = 44, + cmdID = cmdIDs[1], menuParams = { parentID = mobileAddSubMenuRequestParams[1].menuID, menuName = "Add Command 1" } }, { - cmdID = 45, + cmdID = cmdIDs[2], menuParams = { parentID = mobileAddSubMenuRequestParams[2].menuID, menuName = "Add Command 2" @@ -49,7 +51,7 @@ local mobileAddCommandRequestParams = { } local mobileDeleteSubMenuRequestParams = { - menuID = 99 + menuID = menuIDs[2] } local hmiAddSubMenuRequestParams = { @@ -71,17 +73,17 @@ local hmiAddSubMenuRequestParams = { local hmiAddCommandRequestParams = { { - cmdID = mobileAddCommandRequestParans[1].cmdID, + cmdID = mobileAddCommandRequestParams[1].cmdID, menuParams = { - parentID = mobileAddCommandRequestParans[1].menuParams.parentID, - menuName = mobileAddCommandRequestParans[1].menuParams.menuName + parentID = mobileAddCommandRequestParams[1].menuParams.parentID, + menuName = mobileAddCommandRequestParams[1].menuParams.menuName } }, { - cmdID = mobileAddCommandRequestParans[2].cmdID, + cmdID = mobileAddCommandRequestParams[2].cmdID, menuParams = { - parentID = mobileAddCommandRequestParans[2].menuParams.parentID, - menuName = mobileAddCommandRequestParans[2].menuParams.menuName + parentID = mobileAddCommandRequestParams[2].menuParams.parentID, + menuName = mobileAddCommandRequestParams[2].menuParams.menuName } } } @@ -97,10 +99,10 @@ local hmiDeleteSubMenuRequestParams = { local hmiDeleteCommandRequestParams = { { - cmdID = mobileAddCommandRequestParans[1].cmdID + cmdID = mobileAddCommandRequestParams[1].cmdID }, { - cmdID = mobileAddCommandRequestParans[2].cmdID + cmdID = mobileAddCommandRequestParams[2].cmdID } } @@ -114,10 +116,10 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end -for i, _ in ipairs(mobileAddCommandRequestParans) do - runner.Step("Add Commands to nested submenus", common.AddNestedCommands, { mobileAddCommandRequestParans[i], hmiAddCommandRequestParams[i]}) +for i, _ in ipairs(mobileAddCommandRequestParams) do + runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i], hmiAddCommandRequestParams[i]}) end runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index 34f080d254..2f2e164c7f 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -18,29 +18,31 @@ local common = require('test_scripts/API/Additional_Submenus/additional_submenus runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] +local menuIDs = { 1, 99, 101 } +local cmdIDs = { 44, 45 } local mobileAddSubMenuRequestParams = { { - menuID = 99, + menuID = menuIDs[2], menuName = "SubMenu2", - parentID = 1 + parentID = menuIDs[1] }, { - menuID = 101, + menuID = menuIDs[3], menuName = "SubMenu3", - parentID = 99 + parentID = menuIDs[2] } } -local mobileAddCommandRequestParans = { +local mobileAddCommandRequestParams = { { - cmdID = 44, + cmdID = cmdIDs[1], menuParams = { parentID = mobileAddSubMenuRequestParams[1].menuID, menuName = "Add Command 1" } }, { - cmdID = 45, + cmdID = cmdIDs[2], menuParams = { parentID = mobileAddSubMenuRequestParams[2].menuID, menuName = "Add Command 2" @@ -49,7 +51,7 @@ local mobileAddCommandRequestParans = { } local mobileDeleteSubMenuRequestParams = { - menuID = 1 + menuID = menuIDs[1] } local hmiAddSubMenuRequestParams = { @@ -71,17 +73,17 @@ local hmiAddSubMenuRequestParams = { local hmiAddCommandRequestParams = { { - cmdID = mobileAddCommandRequestParans[1].cmdID, + cmdID = mobileAddCommandRequestParams[1].cmdID, menuParams = { - parentID = mobileAddCommandRequestParans[1].menuParams.parentID, - menuName = mobileAddCommandRequestParans[1].menuParams.menuName + parentID = mobileAddCommandRequestParams[1].menuParams.parentID, + menuName = mobileAddCommandRequestParams[1].menuParams.menuName } }, { - cmdID = mobileAddCommandRequestParans[2].cmdID, + cmdID = mobileAddCommandRequestParams[2].cmdID, menuParams = { - parentID = mobileAddCommandRequestParans[2].menuParams.parentID, - menuName = mobileAddCommandRequestParans[2].menuParams.menuName + parentID = mobileAddCommandRequestParams[2].menuParams.parentID, + menuName = mobileAddCommandRequestParams[2].menuParams.menuName } } } @@ -100,10 +102,10 @@ local hmiDeleteSubMenuRequestParams = { local hmiDeleteCommandRequestParams = { { - cmdID = mobileAddCommandRequestParans[1].cmdID + cmdID = mobileAddCommandRequestParams[1].cmdID }, { - cmdID = mobileAddCommandRequestParans[2].cmdID + cmdID = mobileAddCommandRequestParams[2].cmdID } } @@ -117,10 +119,10 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end -for i, _ in ipairs(mobileAddCommandRequestParans) do - runner.Step("Add Commands to nested submenus", common.AddNestedCommands, { mobileAddCommandRequestParans[i], hmiAddCommandRequestParams[i]}) +for i, _ in ipairs(mobileAddCommandRequestParams) do + runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i], hmiAddCommandRequestParams[i]}) end runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index 5197ad3f4f..ac0c5b22da 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -17,16 +17,17 @@ local common = require('test_scripts/API/Additional_Submenus/additional_submenus runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] +local menuIDs = { 1, 99, 101 } local mobileAddSubMenuRequestParams = { { - menuID = 99, + menuID = menuIDs[2], menuName = "SubMenu2", - parentID = 1 + parentID = menuIDs[1] }, { - menuID = 101, + menuID = menuIDs[3], menuName = "SubMenu2", - parentID = 99 + parentID = menuIDs[2] } } @@ -57,7 +58,7 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.AdditionalSubmenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) end runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index 3f3c856bca..0018f48dff 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -24,17 +24,17 @@ local requestParams = { } local hmiRequestParams = { - menuID = 99, + menuID = requestParams.menuID, menuParams = { - menuName = "SubMenu2", - parentID = 1 + menuName = requestParams.menuName, + parentID = requestParams.parentID } } local duplicateNameRequestParams = { menuID = 101, - menuName = "SubMenu2", - parentID = 1 + menuName = requestParams.menuName, + parentID = requestParams.parentID } local function DuplicateNameMenu() @@ -51,7 +51,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.AdditionalSubmenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index 2a99564476..3151d9f06e 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -8,14 +8,34 @@ local function reverseArray(arr) return rev end +common.reqParams = { + AddCommand = { + mob = { cmdID = 1, vrCommands = { "OnlyVRCommand" }}, + hmi = { cmdID = 1, type = "Command", vrCommands = { "OnlyVRCommand" }} + }, + AddSubMenu = { + mob = { menuID = 1, position = 500, menuName = "SubMenu" }, + hmi = { menuID = 1, menuParams = { position = 500, menuName = "SubMenu" }} + } + } + function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) + if requestParams == nil then + requestParams = common.reqParams.AddSubMenu.mob + end + if hmiRequestParams == nil then + hmiRequestParams = common.reqParams.AddSubMenu.hmi + end + if parentPresent == nil then + parentPresent = false + end local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) :ValidIf(function(_, data) if parentPresent == true then return true else - return data.params.menuParams["parentID"] == nil + return data.params.menuParams["parentID"] == nil or data.params.menuParams["parentID"] == 0 end end) :Do(function(_, data) @@ -29,6 +49,12 @@ function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) end function common.addCommand(mobileParams, hmiParams) + if requestParams == nil then + requestParams = common.reqParams.AddCommand.mob + end + if hmiRequestParams == nil then + hmiRequestParams = common.reqParams.AddCommand.hmi + end local cid = common.getMobileSession():SendRPC("AddCommand", mobileParams) common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiParams) :Do(function(_, data) From bc93611c999033906b4026a760a1cd8c4d85a087 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 12:30:37 -0700 Subject: [PATCH 10/14] Update test_scripts/API/Additional_Submenus/additional_submenus_common.lua Co-authored-by: Jacob Keeler --- .../API/Additional_Submenus/additional_submenus_common.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index 3151d9f06e..48b16c107c 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -27,7 +27,7 @@ function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) hmiRequestParams = common.reqParams.AddSubMenu.hmi end if parentPresent == nil then - parentPresent = false + parentPresent = (requestParams.parentID != nil) end local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) From 132e2a7bab67e83d934d98c9878ac947b44b0d39 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 15:39:17 -0400 Subject: [PATCH 11/14] Create hmi params from mobile params --- .../001_additional_submenu_success.lua | 10 +---- .../002_legacy_app_parentID_filtered.lua | 9 +---- ...bmenu_with_nested_submenu_and_commands.lua | 38 +------------------ ...menu_with_nested_submenus_and_commands.lua | 38 +------------------ ...duplicate_name_different_level_success.lua | 19 +--------- .../006_duplicate_name_same_level_fail.lua | 10 +---- .../additional_submenus_common.lua | 20 ++++++---- 7 files changed, 20 insertions(+), 124 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index 3c5066ad94..379b69f1f9 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -23,14 +23,6 @@ local requestParams = { parentID = 1 } -local hmiRequestParams = { - menuID = requestParams.menuID, - menuParams = { - menuName = requestParams.menuName, - parentID = requestParams.parentID - } -} - --[[ Scenario ]] runner.Title("Preconditions") runner.Step("Clean environment", common.preconditions) @@ -40,7 +32,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index 7947a49038..ddad322724 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -26,13 +26,6 @@ local requestParams = { menuName = "SubMenu2", parentID = 1 } - -local hmiRequestParams = { - menuID = requestParams.menuID, - menuParams = { - menuName = requestParams.menuName - } -} --[[ Scenario ]] @@ -44,7 +37,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index b135a8b31b..91c3688d49 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -54,40 +54,6 @@ local mobileDeleteSubMenuRequestParams = { menuID = menuIDs[2] } -local hmiAddSubMenuRequestParams = { - { - menuID = mobileAddSubMenuRequestParams[1].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[1].menuName, - parentID = mobileAddSubMenuRequestParams[1].parentID - } - }, - { - menuID = mobileAddSubMenuRequestParams[2].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[2].menuName, - parentID = mobileAddSubMenuRequestParams[2].parentID - } - } -} - -local hmiAddCommandRequestParams = { - { - cmdID = mobileAddCommandRequestParams[1].cmdID, - menuParams = { - parentID = mobileAddCommandRequestParams[1].menuParams.parentID, - menuName = mobileAddCommandRequestParams[1].menuParams.menuName - } - }, - { - cmdID = mobileAddCommandRequestParams[2].cmdID, - menuParams = { - parentID = mobileAddCommandRequestParams[2].menuParams.parentID, - menuName = mobileAddCommandRequestParams[2].menuParams.menuName - } - } -} - local hmiDeleteSubMenuRequestParams = { { menuID = mobileAddSubMenuRequestParams[2].menuID @@ -116,10 +82,10 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) end for i, _ in ipairs(mobileAddCommandRequestParams) do - runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i], hmiAddCommandRequestParams[i]}) + runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i] }) end runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index 2f2e164c7f..a28629f1ce 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -54,40 +54,6 @@ local mobileDeleteSubMenuRequestParams = { menuID = menuIDs[1] } -local hmiAddSubMenuRequestParams = { - { - menuID = mobileAddSubMenuRequestParams[1].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[1].menuName, - parentID = mobileAddSubMenuRequestParams[1].parentID - } - }, - { - menuID = mobileAddSubMenuRequestParams[2].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[2].menuName, - parentID = mobileAddSubMenuRequestParams[2].parentID - } - } -} - -local hmiAddCommandRequestParams = { - { - cmdID = mobileAddCommandRequestParams[1].cmdID, - menuParams = { - parentID = mobileAddCommandRequestParams[1].menuParams.parentID, - menuName = mobileAddCommandRequestParams[1].menuParams.menuName - } - }, - { - cmdID = mobileAddCommandRequestParams[2].cmdID, - menuParams = { - parentID = mobileAddCommandRequestParams[2].menuParams.parentID, - menuName = mobileAddCommandRequestParams[2].menuParams.menuName - } - } -} - local hmiDeleteSubMenuRequestParams = { { menuID = mobileAddSubMenuRequestParams[1].menuID @@ -119,10 +85,10 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) end for i, _ in ipairs(mobileAddCommandRequestParams) do - runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i], hmiAddCommandRequestParams[i]}) + runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i] }) end runner.Step("Send DeleteSubMenu", common.DeleteSubMenu, {mobileDeleteSubMenuRequestParams, hmiDeleteCommandRequestParams, hmiDeleteSubMenuRequestParams}) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index ac0c5b22da..e50f587c0d 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -31,23 +31,6 @@ local mobileAddSubMenuRequestParams = { } } -local hmiAddSubMenuRequestParams = { - { - menuID = mobileAddSubMenuRequestParams[1].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[1].menuName, - parentID = mobileAddSubMenuRequestParams[1].parentID - } - }, - { - menuID = mobileAddSubMenuRequestParams[2].menuID, - menuParams = { - menuName = mobileAddSubMenuRequestParams[2].menuName, - parentID = mobileAddSubMenuRequestParams[2].parentID - } - } -} - --[[ Scenario ]] runner.Title("Preconditions") runner.Step("Clean environment", common.preconditions) @@ -58,7 +41,7 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], hmiAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) end runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index 0018f48dff..abdd9ac6aa 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -23,14 +23,6 @@ local requestParams = { parentID = 1 } -local hmiRequestParams = { - menuID = requestParams.menuID, - menuParams = { - menuName = requestParams.menuName, - parentID = requestParams.parentID - } -} - local duplicateNameRequestParams = { menuID = 101, menuName = requestParams.menuName, @@ -51,7 +43,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, hmiRequestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index 48b16c107c..bf711866ca 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -19,16 +19,20 @@ common.reqParams = { } } -function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) +function common.addSubMenu(requestParams, parentPresent) if requestParams == nil then requestParams = common.reqParams.AddSubMenu.mob end - if hmiRequestParams == nil then - hmiRequestParams = common.reqParams.AddSubMenu.hmi - end if parentPresent == nil then - parentPresent = (requestParams.parentID != nil) + parentPresent = (requestParams.parentID ~= nil) end + local hmiRequestParams = { + menuID = requestParams.menuID, + menuParams = { + position = requestParams.position, + menuName = requestParams.menuName + } + } local cid = common.getMobileSession():SendRPC("AddSubMenu", requestParams) common.getHMIConnection():ExpectRequest("UI.AddSubMenu", hmiRequestParams) :ValidIf(function(_, data) @@ -48,13 +52,13 @@ function common.addSubMenu(requestParams, hmiRequestParams, parentPresent) end) end -function common.addCommand(mobileParams, hmiParams) +function common.addCommand(mobileParams) + local hmiRequestParams = mobileParams if requestParams == nil then requestParams = common.reqParams.AddCommand.mob - end - if hmiRequestParams == nil then hmiRequestParams = common.reqParams.AddCommand.hmi end + local cid = common.getMobileSession():SendRPC("AddCommand", mobileParams) common.getHMIConnection():ExpectRequest("UI.AddCommand", hmiParams) :Do(function(_, data) From 1cbd71fad69b114b7fe4bf33030fe12c8e02343f Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 15:55:39 -0400 Subject: [PATCH 12/14] Fix parentPresent --- .../Additional_Submenus/001_additional_submenu_success.lua | 2 +- .../002_legacy_app_parentID_filtered.lua | 2 +- ...lete_nested_submenu_with_nested_submenu_and_commands.lua | 2 +- ..._top_level_submenu_with_nested_submenus_and_commands.lua | 2 +- .../005_duplicate_name_different_level_success.lua | 2 +- .../006_duplicate_name_same_level_fail.lua | 2 +- .../API/Additional_Submenus/additional_submenus_common.lua | 6 ++---- 7 files changed, 8 insertions(+), 10 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index 379b69f1f9..2b099a39a0 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -32,7 +32,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index ddad322724..45453341d6 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -37,7 +37,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index 91c3688d49..a76a3c71cf 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -82,7 +82,7 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end for i, _ in ipairs(mobileAddCommandRequestParams) do runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i] }) diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index a28629f1ce..ff5d069ce9 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -85,7 +85,7 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end for i, _ in ipairs(mobileAddCommandRequestParams) do runner.Step("Add Commands to nested submenus", common.addCommand, { mobileAddCommandRequestParams[i] }) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index e50f587c0d..fa9bb1f0f8 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -41,7 +41,7 @@ runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i], true }) + runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index abdd9ac6aa..0e447fd8c4 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -43,7 +43,7 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams, true}) +runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index bf711866ca..488999a70d 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -19,13 +19,11 @@ common.reqParams = { } } -function common.addSubMenu(requestParams, parentPresent) +function common.addSubMenu(requestParams) if requestParams == nil then requestParams = common.reqParams.AddSubMenu.mob end - if parentPresent == nil then - parentPresent = (requestParams.parentID ~= nil) - end + local parentPresent = (requestParams.parentID ~= nil) local hmiRequestParams = { menuID = requestParams.menuID, menuParams = { From 8e3cef921ea0e20198a4f33aec3bbbe18b958aef Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 13:37:24 -0700 Subject: [PATCH 13/14] Apply suggestions from code review Co-authored-by: Jacob Keeler --- .../005_duplicate_name_different_level_success.lua | 4 ++-- .../API/Additional_Submenus/additional_submenus_common.lua | 6 ++---- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua index fa9bb1f0f8..7043fba01d 100644 --- a/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua +++ b/test_scripts/API/Additional_Submenus/005_duplicate_name_different_level_success.lua @@ -19,6 +19,7 @@ runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local menuIDs = { 1, 99, 101 } local mobileAddSubMenuRequestParams = { + common.reqParams.AddSubMenu.mob, { menuID = menuIDs[2], menuName = "SubMenu2", @@ -39,9 +40,8 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do - runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) + runner.Step("Add submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end runner.Title("Postconditions") diff --git a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua index 488999a70d..140141a732 100644 --- a/test_scripts/API/Additional_Submenus/additional_submenus_common.lua +++ b/test_scripts/API/Additional_Submenus/additional_submenus_common.lua @@ -10,12 +10,10 @@ end common.reqParams = { AddCommand = { - mob = { cmdID = 1, vrCommands = { "OnlyVRCommand" }}, - hmi = { cmdID = 1, type = "Command", vrCommands = { "OnlyVRCommand" }} + mob = { cmdID = 1, vrCommands = { "OnlyVRCommand" }} }, AddSubMenu = { - mob = { menuID = 1, position = 500, menuName = "SubMenu" }, - hmi = { menuID = 1, menuParams = { position = 500, menuName = "SubMenu" }} + mob = { menuID = 1, position = 500, menuName = "SubMenu" } } } From 52aad11b9d8c930100b1a8152fa931165f694af8 Mon Sep 17 00:00:00 2001 From: JackLivio Date: Thu, 30 Jul 2020 16:48:31 -0400 Subject: [PATCH 14/14] Refactor again --- .../001_additional_submenu_success.lua | 14 +++++++++----- .../002_legacy_app_parentID_filtered.lua | 14 +++++++++----- ...ubmenu_with_nested_submenu_and_commands.lua | 10 +++++----- ...bmenu_with_nested_submenus_and_commands.lua | 10 +++++----- .../006_duplicate_name_same_level_fail.lua | 18 +++++++++++------- 5 files changed, 39 insertions(+), 27 deletions(-) diff --git a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua index 2b099a39a0..3c52712be2 100644 --- a/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua +++ b/test_scripts/API/Additional_Submenus/001_additional_submenu_success.lua @@ -18,9 +18,12 @@ runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local requestParams = { - menuID = 99, - menuName = "SubMenu2", - parentID = 1 + common.reqParams.AddSubMenu.mob, + { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + } } --[[ Scenario ]] @@ -31,8 +34,9 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) +for i, _ in ipairs(requestParams) do + runner.Step("Add submenu", common.addSubMenu, { requestParams[i] }) +end runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua index 45453341d6..aa266905ec 100644 --- a/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua +++ b/test_scripts/API/Additional_Submenus/002_legacy_app_parentID_filtered.lua @@ -22,9 +22,12 @@ config.application1.registerAppInterfaceParams.syncMsgVersion = { --[[ Local Variables ]] local requestParams = { - menuID = 99, - menuName = "SubMenu2", - parentID = 1 + common.reqParams.AddSubMenu.mob, + { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + } } @@ -36,8 +39,9 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) +for i, _ in ipairs(requestParams) do + runner.Step("Add submenu", common.addSubMenu, { requestParams[i] }) +end runner.Title("Postconditions") runner.Step("Stop SDL", common.postconditions) diff --git a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua index a76a3c71cf..ceb74d418c 100644 --- a/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/003_delete_nested_submenu_with_nested_submenu_and_commands.lua @@ -21,6 +21,7 @@ runner.testSettings.isSelfIncluded = false local menuIDs = {1, 99, 101} local cmdIDs = {44, 45} local mobileAddSubMenuRequestParams = { + common.reqParams.AddSubMenu.mob, { menuID = menuIDs[2], menuName = "SubMenu2", @@ -37,14 +38,14 @@ local mobileAddCommandRequestParams = { { cmdID = cmdIDs[1], menuParams = { - parentID = mobileAddSubMenuRequestParams[1].menuID, + parentID = mobileAddSubMenuRequestParams[2].menuID, menuName = "Add Command 1" } }, { cmdID = cmdIDs[2], menuParams = { - parentID = mobileAddSubMenuRequestParams[2].menuID, + parentID = mobileAddSubMenuRequestParams[3].menuID, menuName = "Add Command 2" } } @@ -56,10 +57,10 @@ local mobileDeleteSubMenuRequestParams = { local hmiDeleteSubMenuRequestParams = { { - menuID = mobileAddSubMenuRequestParams[2].menuID + menuID = mobileAddSubMenuRequestParams[3].menuID }, { - menuID = mobileAddSubMenuRequestParams[1].menuID + menuID = mobileAddSubMenuRequestParams[2].menuID } } @@ -80,7 +81,6 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end diff --git a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua index ff5d069ce9..56ad1ca86f 100644 --- a/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua +++ b/test_scripts/API/Additional_Submenus/004_delete_top_level_submenu_with_nested_submenus_and_commands.lua @@ -21,6 +21,7 @@ runner.testSettings.isSelfIncluded = false local menuIDs = { 1, 99, 101 } local cmdIDs = { 44, 45 } local mobileAddSubMenuRequestParams = { + common.reqParams.AddSubMenu.mob, { menuID = menuIDs[2], menuName = "SubMenu2", @@ -37,14 +38,14 @@ local mobileAddCommandRequestParams = { { cmdID = cmdIDs[1], menuParams = { - parentID = mobileAddSubMenuRequestParams[1].menuID, + parentID = mobileAddSubMenuRequestParams[2].menuID, menuName = "Add Command 1" } }, { cmdID = cmdIDs[2], menuParams = { - parentID = mobileAddSubMenuRequestParams[2].menuID, + parentID = mobileAddSubMenuRequestParams[3].menuID, menuName = "Add Command 2" } } @@ -56,10 +57,10 @@ local mobileDeleteSubMenuRequestParams = { local hmiDeleteSubMenuRequestParams = { { - menuID = mobileAddSubMenuRequestParams[1].menuID + menuID = mobileAddSubMenuRequestParams[2].menuID }, { - menuID = mobileAddSubMenuRequestParams[2].menuID + menuID = mobileAddSubMenuRequestParams[3].menuID }, { menuID = mobileDeleteSubMenuRequestParams.menuID @@ -83,7 +84,6 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) for i, _ in ipairs(mobileAddSubMenuRequestParams) do runner.Step("Add additional submenu", common.addSubMenu, { mobileAddSubMenuRequestParams[i] }) end diff --git a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua index 0e447fd8c4..f76fd729af 100644 --- a/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua +++ b/test_scripts/API/Additional_Submenus/006_duplicate_name_same_level_fail.lua @@ -18,15 +18,18 @@ runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local requestParams = { - menuID = 99, - menuName = "SubMenu2", - parentID = 1 + common.reqParams.AddSubMenu.mob, + { + menuID = 99, + menuName = "SubMenu2", + parentID = 1 + } } local duplicateNameRequestParams = { menuID = 101, - menuName = requestParams.menuName, - parentID = requestParams.parentID + menuName = requestParams[2].menuName, + parentID = requestParams[2].parentID } local function DuplicateNameMenu() @@ -42,8 +45,9 @@ runner.Step("App registration", common.registerApp) runner.Title("Test") runner.Step("App activate, HMI SystemContext MAIN", common.activateApp) -runner.Step("Add menu", common.addSubMenu) -runner.Step("Add additional submenu", common.addSubMenu, {requestParams}) +for i, _ in ipairs(requestParams) do + runner.Step("Add submenu", common.addSubMenu, { requestParams[i] }) +end runner.Step("Duplicate Name SubMenu", DuplicateNameMenu) runner.Title("Postconditions")