From 79a073b718f8a83c27faea5808e90fe3aadd2dcd Mon Sep 17 00:00:00 2001 From: "Oleksandr Deriabin (GitHub)" Date: Tue, 5 Feb 2019 19:50:20 +0200 Subject: [PATCH] Adapt RC tests for Remote connection --- ...se_moduleType_is_an_empty_array_in_LPT.lua | 3 +- .../017_Success_audio_source_values.lua | 3 +- ...CE_in_case_RC_interface_is_unavailable.lua | 3 +- ...se_moduleType_is_an_empty_array_in_LPT.lua | 3 +- ...EAD_ONLY_in_case_statusAvailable_false.lua | 3 +- ...SOURCE_in_case_statusAvailable_omitted.lua | 3 +- ...ED_RESOURCE_in_case_light_name_omitted.lua | 3 +- ...n_press_allowed_if_moduleType_is_empty.lua | 3 +- ..._generic_error_if_no_response_from_hmi.lua | 4 +- ..._supported_parameter_and_reject_others.lua | 3 +- .../005_Resend_only_supported_parameters.lua | 3 +- ...f_HMI_respond_to_RC_IsReady_with_false.lua | 3 +- ...nt_respond_to_RC_GetCapabilities_RADIO.lua | 3 +- ..._respond_to_RC_GetCapabilities_CLIMATE.lua | 3 +- ...nt_respond_to_RC_GetCapabilities_RADIO.lua | 3 +- ..._respond_to_RC_GetCapabilities_CLIMATE.lua | 3 +- .../006_RPC_parameters_values.lua | 10 +-- ...ERIC_ERROR_in_case_HMI_did_not_respond.lua | 4 +- ...se_moduleType_is_an_empty_array_in_LPT.lua | 3 +- .../005_TIMED_OUT_from_HMI_SIVD.lua | 3 +- .../006_TIMED_OUT_from_HMI_BP.lua | 3 +- .../007_HMI_no_response_SIVD.lua | 3 +- .../008_HMI_no_response_BP.lua | 3 +- .../009_HMI_invalid_response_SIVD.lua | 3 +- .../010_HMI_invalid_response_BP.lua | 3 +- .../011_TIMED_OUT_after_default_timeout.lua | 3 +- .../GetSystemCapability/001_Success_flow.lua | 3 +- ..._subscribing_with_no_response_from_HMI.lua | 4 +- .../016_RPC_parameters_values.lua | 10 +-- .../008_Allowed_false.lua | 4 +- ...lease_resource_on_PTU_with_app_revoked.lua | 3 +- .../024_Allowed_false_no_PTU.lua | 3 +- ...rams_does_not_correspond_to_moduleType.lua | 4 +- .../006_RPC_parameters_values.lua | 10 +-- ...se_moduleType_is_an_empty_array_in_LPT.lua | 3 +- ...cle_data_if_read_only_params_requested.lua | 3 +- ...read-only_and_not_read-only_parameters.lua | 3 +- ...ERIC_ERROR_in_case_HMI_did_not_respond.lua | 4 +- ..._RESOURCE_hdRadioEnableAvailable_false.lua | 3 +- ...ESOURCE_hdRadioEnableAvailable_omitted.lua | 3 +- ..._RESOURCE_siriusxmRadioAvailable_false.lua | 3 +- ...ESOURCE_siriusxmRadioAvailable_omitted.lua | 3 +- ..._false_by_app_unregistration_2_modules.lua | 8 +- ...D_subscribe_false_by_app_disallowed_RC.lua | 10 +-- ...D_subscribe_false_without_subscribtion.lua | 7 +- ...GetInteriorVD_limitation_time_interval.lua | 3 +- .../common_interiorVDcache.lua | 3 + ...ity_allowed_on_hmi_with_registered_app.lua | 4 +- ..._by_revoking_several_modules_by_policy.lua | 3 +- .../RC/OnRCStatus/commonOnRCStatus.lua | 5 +- ...snt_respond_to_RC_GetCapabilities_SEAT.lua | 3 +- ...snt_respond_to_RC_GetCapabilities_SEAT.lua | 3 +- ...se_moduleType_is_an_empty_array_in_LPT.lua | 3 +- ...ERIC_ERROR_in_case_HMI_did_not_respond.lua | 3 +- test_scripts/RC/commonRC.lua | 77 ++++++------------- user_modules/utils.lua | 62 +++++++++++++++ 56 files changed, 153 insertions(+), 194 deletions(-) diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua index b1c2f9cc90..d78d840304 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua @@ -16,7 +16,6 @@ --------------------------------------------------------------------------------------------------- --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local json = require('modules/json') local common = require("test_scripts/RC/commonRC") --[[ Test Configuration ]] @@ -25,7 +24,7 @@ runner.testSettings.isSelfIncluded = false local function PTUfunc(tbl) local appId = config.application1.registerAppInterfaceParams.fullAppID tbl.policy_table.app_policies[appId] = common.getRCAppConfig() - tbl.policy_table.app_policies[appId].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[appId].moduleType = common.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/017_Success_audio_source_values.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/017_Success_audio_source_values.lua index 1dcd91b912..098f7d58f4 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/017_Success_audio_source_values.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/017_Success_audio_source_values.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require("test_scripts/RC/commonRC") -local utils = require("user_modules/utils") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -44,7 +43,7 @@ local function subscribeToModule(pAudioSources) end return true end) - utils.wait(500) + common.wait(500) end --[[ Scenario ]] diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetSystemCapability/003_UNSUPPORTED_RESOURCE_in_case_RC_interface_is_unavailable.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetSystemCapability/003_UNSUPPORTED_RESOURCE_in_case_RC_interface_is_unavailable.lua index 21c9239096..36b068ab6d 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetSystemCapability/003_UNSUPPORTED_RESOURCE_in_case_RC_interface_is_unavailable.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetSystemCapability/003_UNSUPPORTED_RESOURCE_in_case_RC_interface_is_unavailable.lua @@ -17,7 +17,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require("test_scripts/RC/commonRC") -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -27,7 +26,7 @@ config.checkAllValidations = true --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = common.getDefaultHMITable() params.RC.IsReady.params.available = false -- RC interface is unavailable params.RC.GetCapabilities.params = { } params.RC.GetCapabilities.occurrence = 0 diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua index c99da448a9..0c32671f24 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua @@ -16,7 +16,6 @@ --------------------------------------------------------------------------------------------------- --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') -local json = require('modules/json') local common = require("test_scripts/RC/commonRC") --[[ Test Configuration ]] @@ -29,7 +28,7 @@ local modules = { "CLIMATE", "AUDIO", "LIGHT", "HMI_SETTINGS" } --[[ Local Functions ]] local function PTUfunc(tbl) tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID] = common.getRCAppConfig() - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = common.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/019_Light_more_values_READ_ONLY_in_case_statusAvailable_false.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/019_Light_more_values_READ_ONLY_in_case_statusAvailable_false.lua index acb61ece78..ddf959e20e 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/019_Light_more_values_READ_ONLY_in_case_statusAvailable_false.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/019_Light_more_values_READ_ONLY_in_case_statusAvailable_false.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require("test_scripts/RC/commonRC") -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -28,7 +27,7 @@ local Module = "LIGHT" local function setStatusAvailableFalse() local lightParams = common.getModuleControlData(Module) local lightName = lightParams.lightControlData.lightState[1].id - local hmiValues = hmi_values.getDefaultHMITable() + local hmiValues = common.getDefaultHMITable() for _, value in pairs (hmiValues.RC.GetCapabilities.params.remoteControlCapability.lightControlCapabilities.supportedLights) do if value.name == lightName then value.statusAvailable = false diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/020_Light_more_values_UNSUPPORTED_RESOURCE_in_case_statusAvailable_omitted.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/020_Light_more_values_UNSUPPORTED_RESOURCE_in_case_statusAvailable_omitted.lua index 413eeeb765..7d09580f62 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/020_Light_more_values_UNSUPPORTED_RESOURCE_in_case_statusAvailable_omitted.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/020_Light_more_values_UNSUPPORTED_RESOURCE_in_case_statusAvailable_omitted.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require("test_scripts/RC/commonRC") -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -28,7 +27,7 @@ local Module = "LIGHT" local function removeLightValueFromCapabilities() local lightParams = common.getModuleControlData(Module) local lightName = lightParams.lightControlData.lightState[1].id - local hmiValues = hmi_values.getDefaultHMITable() + local hmiValues = common.getDefaultHMITable() for key, value in pairs (hmiValues.RC.GetCapabilities.params.remoteControlCapability.lightControlCapabilities.supportedLights) do if value.name == lightName then hmiValues.RC.GetCapabilities.params.remoteControlCapability.lightControlCapabilities.supportedLights[key].statusAvailable = nil diff --git a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/022_Light_more_values_UNSUPPORTED_RESOURCE_in_case_light_name_omitted.lua b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/022_Light_more_values_UNSUPPORTED_RESOURCE_in_case_light_name_omitted.lua index 32ce37b637..736c12029e 100644 --- a/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/022_Light_more_values_UNSUPPORTED_RESOURCE_in_case_light_name_omitted.lua +++ b/test_scripts/RC/AUDIO_LIGHT_HMI_SETTINGS/SetInteriorVehicleData/022_Light_more_values_UNSUPPORTED_RESOURCE_in_case_light_name_omitted.lua @@ -17,7 +17,6 @@ local runner = require('user_modules/script_runner') local common = require("test_scripts/RC/commonRC") -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local Module = "LIGHT" local function removeLightValueFromCapabilities() local lightParams = common.getModuleControlData(Module) local lightName = lightParams.lightControlData.lightState[1].id - local hmiValues = hmi_values.getDefaultHMITable() + local hmiValues = common.getDefaultHMITable() for key, value in pairs (hmiValues.RC.GetCapabilities.params.remoteControlCapability.lightControlCapabilities.supportedLights) do if value.name == lightName then table.remove(hmiValues.RC.GetCapabilities.params.remoteControlCapability.lightControlCapabilities.supportedLights, diff --git a/test_scripts/RC/CLIMATE_RADIO/ButtonPress/007_button_press_allowed_if_moduleType_is_empty.lua b/test_scripts/RC/CLIMATE_RADIO/ButtonPress/007_button_press_allowed_if_moduleType_is_empty.lua index 6945ae8b0d..c410b55f1e 100644 --- a/test_scripts/RC/CLIMATE_RADIO/ButtonPress/007_button_press_allowed_if_moduleType_is_empty.lua +++ b/test_scripts/RC/CLIMATE_RADIO/ButtonPress/007_button_press_allowed_if_moduleType_is_empty.lua @@ -17,14 +17,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local json = require('modules/json') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Functions ]] local function PTUfunc(tbl) - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = commonRC.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/ButtonPress/010_generic_error_if_no_response_from_hmi.lua b/test_scripts/RC/CLIMATE_RADIO/ButtonPress/010_generic_error_if_no_response_from_hmi.lua index 42747b0d0b..9e684e525a 100644 --- a/test_scripts/RC/CLIMATE_RADIO/ButtonPress/010_generic_error_if_no_response_from_hmi.lua +++ b/test_scripts/RC/CLIMATE_RADIO/ButtonPress/010_generic_error_if_no_response_from_hmi.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -40,8 +39,7 @@ local function getDataForModule(pModuleType) end) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR"}) - - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/004_Resend_only_supported_parameter_and_reject_others.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/004_Resend_only_supported_parameter_and_reject_others.lua index eacb31f08b..9d85001ef7 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/004_Resend_only_supported_parameter_and_reject_others.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/004_Resend_only_supported_parameter_and_reject_others.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local common_functions = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -47,7 +46,7 @@ local function setVehicleData(pParams) else EXPECT_HMICALL("RC.SetInteriorVehicleData"):Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "UNSUPPORTED_RESOURCE" }) - common_functions:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end end diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/005_Resend_only_supported_parameters.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/005_Resend_only_supported_parameters.lua index e2d0d86a11..3e8763e56f 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/005_Resend_only_supported_parameters.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/005_Resend_only_supported_parameters.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local common_functions = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -51,7 +50,7 @@ local function setVehicleData(params) else EXPECT_HMICALL("RC.SetInteriorVehicleData"):Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "UNSUPPORTED_RESOURCE" }) - common_functions.DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end end diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/007_Reject_GIVD_SIVD_BP_if_HMI_respond_to_RC_IsReady_with_false.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/007_Reject_GIVD_SIVD_BP_if_HMI_respond_to_RC_IsReady_with_false.lua index 9aa2be83d8..c31accff14 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/007_Reject_GIVD_SIVD_BP_if_HMI_respond_to_RC_IsReady_with_false.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/007_Reject_GIVD_SIVD_BP_if_HMI_respond_to_RC_IsReady_with_false.lua @@ -17,14 +17,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady.params.available = false params.RC.GetCapabilities.params = { } params.RC.GetCapabilities.occurrence = 0 diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/008_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/008_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua index f899485bd7..5ba8738ec1 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/008_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/008_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local enabledModule = "RADIO" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady = nil params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/009_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/009_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua index 8cea3b4dc6..4e9ef58eae 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/009_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/009_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local enabledModule = "CLIMATE" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady = nil params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/010_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/010_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua index 67c763343a..1b14085b59 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/010_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/010_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local enabledModule = "RADIO" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady.params.available = true params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/CLIMATE_RADIO/Capabilities/011_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua b/test_scripts/RC/CLIMATE_RADIO/Capabilities/011_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua index c237454554..4b25754cd9 100644 --- a/test_scripts/RC/CLIMATE_RADIO/Capabilities/011_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua +++ b/test_scripts/RC/CLIMATE_RADIO/Capabilities/011_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local enabledModule = "CLIMATE" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady.params.available = true params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/006_RPC_parameters_values.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/006_RPC_parameters_values.lua index 999ea56a04..3d67dc329f 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/006_RPC_parameters_values.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/006_RPC_parameters_values.lua @@ -19,7 +19,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -35,8 +34,7 @@ local function invalidParamName(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function invalidParamType(pModuleType) @@ -49,8 +47,7 @@ local function invalidParamType(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function missingMandatoryParam() @@ -63,8 +60,7 @@ local function missingMandatoryParam() :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function fakeParam(pModuleType) diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/007_GENERIC_ERROR_in_case_HMI_did_not_respond.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/007_GENERIC_ERROR_in_case_HMI_did_not_respond.lua index 85c4f25f40..c97587f551 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/007_GENERIC_ERROR_in_case_HMI_did_not_respond.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/007_GENERIC_ERROR_in_case_HMI_did_not_respond.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -37,8 +36,7 @@ local function getDataForModule(pModuleType) end) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR"}) - - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua index a5431322e5..a6030e18bc 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua @@ -17,14 +17,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local json = require('modules/json') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Functions ]] local function PTUfunc(tbl) - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = commonRC.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/005_TIMED_OUT_from_HMI_SIVD.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/005_TIMED_OUT_from_HMI_SIVD.lua index fe82b4fc91..d5be4b7ef1 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/005_TIMED_OUT_from_HMI_SIVD.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/005_TIMED_OUT_from_HMI_SIVD.lua @@ -24,7 +24,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -41,7 +40,7 @@ local function rpcTimedOutHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "TIMED_OUT", info = info }) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/006_TIMED_OUT_from_HMI_BP.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/006_TIMED_OUT_from_HMI_BP.lua index 15d824bae3..8a0b436599 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/006_TIMED_OUT_from_HMI_BP.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/006_TIMED_OUT_from_HMI_BP.lua @@ -24,7 +24,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -41,7 +40,7 @@ local function rpcTimedOutHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "TIMED_OUT", info = info }) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/007_HMI_no_response_SIVD.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/007_HMI_no_response_SIVD.lua index 8103413821..417940cfc3 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/007_HMI_no_response_SIVD.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/007_HMI_no_response_SIVD.lua @@ -22,7 +22,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -38,7 +37,7 @@ local function rpcNoHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR" }) - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/008_HMI_no_response_BP.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/008_HMI_no_response_BP.lua index 7d996cefb2..3a5088f5ee 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/008_HMI_no_response_BP.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/008_HMI_no_response_BP.lua @@ -22,7 +22,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -38,7 +37,7 @@ local function rpcNoHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR" }) - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/009_HMI_invalid_response_SIVD.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/009_HMI_invalid_response_SIVD.lua index bb62073931..180b69b34f 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/009_HMI_invalid_response_SIVD.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/009_HMI_invalid_response_SIVD.lua @@ -22,7 +22,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -40,7 +39,7 @@ local function rpcInvalidHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR" }) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/010_HMI_invalid_response_BP.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/010_HMI_invalid_response_BP.lua index 6e251d517a..9a51fedaa0 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/010_HMI_invalid_response_BP.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/010_HMI_invalid_response_BP.lua @@ -22,7 +22,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -40,7 +39,7 @@ local function rpcInvalidHMIResponse(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR" }) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/011_TIMED_OUT_after_default_timeout.lua b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/011_TIMED_OUT_after_default_timeout.lua index 78b76438ab..cedd22388c 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/011_TIMED_OUT_after_default_timeout.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/011_TIMED_OUT_after_default_timeout.lua @@ -21,7 +21,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -44,7 +43,7 @@ local function rpcHMIRespondAfterDefaultTimeout() end) commonRC.getMobileSession(2):ExpectResponse(cid1, { success = false, resultCode = "GENERIC_ERROR" }) - commonTestCases:DelayedExp(12000) + commonRC.wait(12000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/GetSystemCapability/001_Success_flow.lua b/test_scripts/RC/CLIMATE_RADIO/GetSystemCapability/001_Success_flow.lua index b2f0119703..9b01fca30a 100644 --- a/test_scripts/RC/CLIMATE_RADIO/GetSystemCapability/001_Success_flow.lua +++ b/test_scripts/RC/CLIMATE_RADIO/GetSystemCapability/001_Success_flow.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -27,7 +26,7 @@ for _, v in pairs(commonRC.modules) do capabParams[v] = commonRC.DEFAULT end -- --[[ Local Functions ]] local function buildHmiRcCapabilities(pCapabilities) - local hmiParams = hmi_values.getDefaultHMITable() + local hmiParams = commonRC.getDefaultHMITable() hmiParams.RC.IsReady.params.available = true local capParams = hmiParams.RC.GetCapabilities.params.remoteControlCapability for k, v in pairs(commonRC.capMap) do diff --git a/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/007_Absence_of_OnIVD_in_case_of_subscribing_with_no_response_from_HMI.lua b/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/007_Absence_of_OnIVD_in_case_of_subscribing_with_no_response_from_HMI.lua index 0e39b69808..5a41fb5f56 100644 --- a/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/007_Absence_of_OnIVD_in_case_of_subscribing_with_no_response_from_HMI.lua +++ b/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/007_Absence_of_OnIVD_in_case_of_subscribing_with_no_response_from_HMI.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -39,8 +38,7 @@ local function subscriptionToModule(pModuleType) end) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR" }) - - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/016_RPC_parameters_values.lua b/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/016_RPC_parameters_values.lua index 7d5f48386c..1c396d55b2 100644 --- a/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/016_RPC_parameters_values.lua +++ b/test_scripts/RC/CLIMATE_RADIO/OnInteriorVehicleData/016_RPC_parameters_values.lua @@ -20,7 +20,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -33,8 +32,7 @@ local function invalidParamName(pModuleType) commonRC.getMobileSession():ExpectNotification("OnInteriorVehicleData") :Times(0) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function invalidParamType(pModuleType) @@ -47,8 +45,7 @@ local function invalidParamType(pModuleType) commonRC.getMobileSession():ExpectNotification("OnInteriorVehicleData") :Times(0) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function missingMandatoryParam(pModuleType) @@ -61,8 +58,7 @@ local function missingMandatoryParam(pModuleType) commonRC.getMobileSession():ExpectNotification("OnInteriorVehicleData") :Times(0) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/008_Allowed_false.lua b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/008_Allowed_false.lua index be48cef37a..6feb3b0c4c 100644 --- a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/008_Allowed_false.lua +++ b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/008_Allowed_false.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -52,8 +51,7 @@ local function disableRcFromHmi() mobileSession1:ExpectNotification("OnHMIStatus"):Times(0) mobileSession2:ExpectNotification("OnHMIStatus"):Times(0) mobileSession3:ExpectNotification("OnHMIStatus"):Times(0) -- NAVIGATION app - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/023_Release_resource_on_PTU_with_app_revoked.lua b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/023_Release_resource_on_PTU_with_app_revoked.lua index 0429e924d4..e259ce50bb 100644 --- a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/023_Release_resource_on_PTU_with_app_revoked.lua +++ b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/023_Release_resource_on_PTU_with_app_revoked.lua @@ -16,14 +16,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local json = require("modules/json") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Functions ]] local function PTUfunc(tbl) - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID] = json.null + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID] = commonRC.json.null tbl.policy_table.app_policies[config.application2.registerAppInterfaceParams.fullAppID] = commonRC.getRCAppConfig() end diff --git a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/024_Allowed_false_no_PTU.lua b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/024_Allowed_false_no_PTU.lua index f87585e865..3ca33247a4 100644 --- a/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/024_Allowed_false_no_PTU.lua +++ b/test_scripts/RC/CLIMATE_RADIO/OnRemoteControlSettings/024_Allowed_false_no_PTU.lua @@ -17,7 +17,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -40,7 +39,7 @@ local function disableRCFromHMI() EXPECT_HMINOTIFICATION("BasicCommunication.OnAppUnregistered") :Times(0) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/005_INVALID_DATA_in_case_params_does_not_correspond_to_moduleType.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/005_INVALID_DATA_in_case_params_does_not_correspond_to_moduleType.lua index 62c97b71d1..1c3a24811e 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/005_INVALID_DATA_in_case_params_does_not_correspond_to_moduleType.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/005_INVALID_DATA_in_case_params_does_not_correspond_to_moduleType.lua @@ -19,7 +19,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -44,8 +43,7 @@ local function setVehicleData(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA" }) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/006_RPC_parameters_values.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/006_RPC_parameters_values.lua index 15c5c64698..1dfddb850f 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/006_RPC_parameters_values.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/006_RPC_parameters_values.lua @@ -19,7 +19,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -34,8 +33,7 @@ local function invalidParamName(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function invalidParamType(pModuleType) @@ -50,8 +48,7 @@ local function invalidParamType(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function missingMandatoryParam(pModuleType) @@ -66,8 +63,7 @@ local function missingMandatoryParam(pModuleType) :Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "INVALID_DATA"}) - - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end local function fakeParam(pModuleType) diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/007_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/007_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua index 2bb0c0248b..66cc1e6fb3 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/007_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/007_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua @@ -17,14 +17,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local json = require('modules/json') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Functions ]] local function PTUfunc(tbl) - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = commonRC.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/010_Read_only_response_for_set_interior_vehicle_data_if_read_only_params_requested.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/010_Read_only_response_for_set_interior_vehicle_data_if_read_only_params_requested.lua index 9ce54bf2a7..32b2e3a549 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/010_Read_only_response_for_set_interior_vehicle_data_if_read_only_params_requested.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/010_Read_only_response_for_set_interior_vehicle_data_if_read_only_params_requested.lua @@ -17,7 +17,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -33,7 +32,7 @@ local function setVehicleData(module_data) EXPECT_HMICALL("RC.SetInteriorVehicleData"):Times(0) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "READ_ONLY" }) - commonTestCases:DelayedExp(commonRC.timeout) + commonRC.wait(commonRC.timeout) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/011_Cut-off_read-only_parameters_in_case_request_with_read-only_and_not_read-only_parameters.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/011_Cut-off_read-only_parameters_in_case_request_with_read-only_and_not_read-only_parameters.lua index 68867ba9ec..b6454c0ea0 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/011_Cut-off_read-only_parameters_in_case_request_with_read-only_and_not_read-only_parameters.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/011_Cut-off_read-only_parameters_in_case_request_with_read-only_and_not_read-only_parameters.lua @@ -17,7 +17,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonFunctions = require('user_modules/shared_testcases/commonFunctions') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -29,7 +28,7 @@ local function isModuleDataCorrect(pModuleType, actualModuleData) for param_actual, _ in pairs(commonRC.getModuleParams(actualModuleData)) do if param_readonly == param_actual then isFalse = true - commonFunctions:userPrint(36, "Unexpected read-only parameter: " .. param_readonly) + commonRC.cprint(36, "Unexpected read-only parameter: " .. param_readonly) end end end diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/013_GENERIC_ERROR_in_case_HMI_did_not_respond.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/013_GENERIC_ERROR_in_case_HMI_did_not_respond.lua index 1214163e59..9bb1e3e9c8 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/013_GENERIC_ERROR_in_case_HMI_did_not_respond.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/013_GENERIC_ERROR_in_case_HMI_did_not_respond.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -36,8 +35,7 @@ local function setVehicleData(pModuleType) end) commonRC.getMobileSession():ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR"}) - - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/016_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_false.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/016_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_false.lua index 6f706b8049..f89e73189f 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/016_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_false.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/016_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_false.lua @@ -16,14 +16,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local Module = "RADIO" -local hmiValues = hmi_values.getDefaultHMITable() +local hmiValues = commonRC.getDefaultHMITable() hmiValues.RC.GetCapabilities.params.remoteControlCapability.radioControlCapabilities[1].hdRadioEnableAvailable = false --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/017_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_omitted.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/017_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_omitted.lua index f4481ddd10..40ea281b86 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/017_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_omitted.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/017_UNSUPPORTED_RESOURCE_hdRadioEnableAvailable_omitted.lua @@ -16,14 +16,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local Module = "RADIO" -local hmiValues = hmi_values.getDefaultHMITable() +local hmiValues = commonRC.getDefaultHMITable() hmiValues.RC.GetCapabilities.params.remoteControlCapability.radioControlCapabilities[1].hdRadioEnableAvailable = nil --[[ Scenario ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/019_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_false.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/019_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_false.lua index fa9a847276..672740c0cc 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/019_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_false.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/019_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_false.lua @@ -16,14 +16,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local Module = "RADIO" -local hmiValues = hmi_values.getDefaultHMITable() +local hmiValues = commonRC.getDefaultHMITable() hmiValues.RC.GetCapabilities.params.remoteControlCapability.radioControlCapabilities[1].siriusxmRadioAvailable = false --[[ Local Functions ]] diff --git a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/020_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_omitted.lua b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/020_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_omitted.lua index f738d6a4d5..6da8e51444 100644 --- a/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/020_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_omitted.lua +++ b/test_scripts/RC/CLIMATE_RADIO/SetInteriorVehicleData/020_UNSUPPORTED_RESOURCE_siriusxmRadioAvailable_omitted.lua @@ -16,14 +16,13 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require("user_modules/hmi_values") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false --[[ Local Variables ]] local Module = "RADIO" -local hmiValues = hmi_values.getDefaultHMITable() +local hmiValues = commonRC.getDefaultHMITable() hmiValues.RC.GetCapabilities.params.remoteControlCapability.radioControlCapabilities[1].siriusxmRadioAvailable = nil --[[ Local Functions ]] diff --git a/test_scripts/RC/InteriorVehicleData_cache/033_GetInteriorVD_subscribe_false_by_app_unregistration_2_modules.lua b/test_scripts/RC/InteriorVehicleData_cache/033_GetInteriorVD_subscribe_false_by_app_unregistration_2_modules.lua index 78066f3a48..eb1d6dc7b1 100644 --- a/test_scripts/RC/InteriorVehicleData_cache/033_GetInteriorVD_subscribe_false_by_app_unregistration_2_modules.lua +++ b/test_scripts/RC/InteriorVehicleData_cache/033_GetInteriorVD_subscribe_false_by_app_unregistration_2_modules.lua @@ -17,8 +17,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache') -local commonRC = require('test_scripts/RC/commonRC') -local commonFunctions = require("user_modules/shared_testcases/commonFunctions") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -26,7 +24,7 @@ runner.testSettings.isSelfIncluded = false -- [[ Local Function ]] local function unregistrationApp() local rpc = "GetInteriorVehicleData" - EXPECT_HMICALL(commonRC.getHMIEventName(rpc)) + EXPECT_HMICALL(common.getHMIEventName(rpc)) :Do(function(_, data) if data.params.moduleType == "CLIMATE" then common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", @@ -43,7 +41,7 @@ local function unregistrationApp() else ExpectedResult = common.getHMIRequestParams(rpc, "RADIO", 1, false) end - if false == commonFunctions:is_table_equal(data.params, ExpectedResult) then + if false == common.isTableEqual(data.params, ExpectedResult) then return false, "Parameters in RC.GetInteriorVehicleData are not match to expected result.\n" .. "Actual result:" .. common.tableToString(data.params) .. "\n" .. "Expected result:" ..common.tableToString(ExpectedResult) .."\n" @@ -52,7 +50,7 @@ local function unregistrationApp() end) :Times(2) local mobSession = common.getMobileSession(1) - local hmiAppId = commonRC.getHMIAppId(1) + local hmiAppId = common.getHMIAppId(1) local cid = mobSession:SendRPC("UnregisterAppInterface",{}) EXPECT_HMINOTIFICATION("BasicCommunication.OnAppUnregistered", { appID = hmiAppId, unexpectedDisconnect = false }) mobSession:ExpectResponse(cid, { success = true, resultCode = "SUCCESS"}) diff --git a/test_scripts/RC/InteriorVehicleData_cache/035_GetInteriorVD_subscribe_false_by_app_disallowed_RC.lua b/test_scripts/RC/InteriorVehicleData_cache/035_GetInteriorVD_subscribe_false_by_app_disallowed_RC.lua index ea2ace7cd6..21190f6aef 100644 --- a/test_scripts/RC/InteriorVehicleData_cache/035_GetInteriorVD_subscribe_false_by_app_disallowed_RC.lua +++ b/test_scripts/RC/InteriorVehicleData_cache/035_GetInteriorVD_subscribe_false_by_app_disallowed_RC.lua @@ -16,10 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache') -local commonRC = require('test_scripts/RC/commonRC') -local commonFunctions = require("user_modules/shared_testcases/commonFunctions") -local test = require("user_modules/dummy_connecttest") - --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -27,21 +23,21 @@ runner.testSettings.isSelfIncluded = false -- [[ Local Functions ]] local function dissalowRCFunctionality() local rpc = "GetInteriorVehicleData" - EXPECT_HMICALL(commonRC.getHMIEventName(rpc)) + EXPECT_HMICALL(common.getHMIEventName(rpc)) :Do(function(_, data) common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", common.getHMIResponseParams(rpc, common.modules[1], false)) end) :ValidIf(function(_, data) local ExpectedResult = common.getHMIRequestParams(rpc, common.modules[1], 1, false) - if false == commonFunctions:is_table_equal(data.params, ExpectedResult) then + if false == common.isTableEqual(data.params, ExpectedResult) then return false, "Parameters in RC.GetInteriorVehicleData are not match to expected result.\n" .. "Actual result:" .. common.tableToString(data.params) .. "\n" .. "Expected result:" ..common.tableToString(ExpectedResult) .."\n" end return true end) - commonRC.defineRAMode(false, nil, test) + common.defineRAMode(false, nil) end --[[ Scenario ]] diff --git a/test_scripts/RC/InteriorVehicleData_cache/037_GetInteriorVD_subscribe_false_without_subscribtion.lua b/test_scripts/RC/InteriorVehicleData_cache/037_GetInteriorVD_subscribe_false_without_subscribtion.lua index f79d55256f..574c61a803 100644 --- a/test_scripts/RC/InteriorVehicleData_cache/037_GetInteriorVD_subscribe_false_without_subscribtion.lua +++ b/test_scripts/RC/InteriorVehicleData_cache/037_GetInteriorVD_subscribe_false_without_subscribtion.lua @@ -20,7 +20,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache') -local commonRC = require('test_scripts/RC/commonRC') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -30,11 +29,11 @@ local function GetInteriorVehicleData(pModuleType, isSubscribe) local rpc = "GetInteriorVehicleData" local subscribe = isSubscribe local mobSession = common.getMobileSession(1) - local cid = mobSession:SendRPC(commonRC.getAppEventName(rpc), - commonRC.getAppRequestParams(rpc, pModuleType, subscribe)) + local cid = mobSession:SendRPC(common.getAppEventName(rpc), + common.getAppRequestParams(rpc, pModuleType, subscribe)) local hmiRequestParams = common.getHMIRequestParams(rpc, pModuleType, 1, subscribe) hmiRequestParams.subscribe = nil - EXPECT_HMICALL(commonRC.getHMIEventName(rpc), hmiRequestParams) + EXPECT_HMICALL(common.getHMIEventName(rpc), hmiRequestParams) :Do(function(_, data) local hmiResponseParams = common.getHMIResponseParams(rpc, pModuleType, subscribe) hmiResponseParams.subscribe = nil diff --git a/test_scripts/RC/InteriorVehicleData_cache/039_GetInteriorVD_limitation_time_interval.lua b/test_scripts/RC/InteriorVehicleData_cache/039_GetInteriorVD_limitation_time_interval.lua index a4156b4bb4..09ecde4ef8 100644 --- a/test_scripts/RC/InteriorVehicleData_cache/039_GetInteriorVD_limitation_time_interval.lua +++ b/test_scripts/RC/InteriorVehicleData_cache/039_GetInteriorVD_limitation_time_interval.lua @@ -18,7 +18,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache') -local functionId = require('function_id') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -76,7 +75,7 @@ local function GetInteriorVehicleDataRejectedSuccess(pModuleType, pCompareReques mobSession:ExpectAny() :ValidIf(function(_, data) - if data.rpcFunctionId == functionId[rpc] then + if data.rpcFunctionId == common.functionId[rpc] then if data.payload.resultCode == "SUCCESS" then local timeToRequest = { [1] = timestampArray[4] - timestampArray[1], diff --git a/test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache.lua b/test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache.lua index eb959002f9..c46c6e52b8 100644 --- a/test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache.lua +++ b/test_scripts/RC/InteriorVehicleData_cache/common_interiorVDcache.lua @@ -5,15 +5,18 @@ local actions = require("user_modules/sequences/actions") local commonRC = require('test_scripts/RC/commonRC') local utils = require("user_modules/utils") +local functionId = require('function_id') --[[ Module ]] commonRC.tableToString = utils.tableToString +commonRC.isTableEqual = utils.isTableEqual commonRC.wait = utils.wait config.application1.registerAppInterfaceParams.isMediaApplication = true config.application2.registerAppInterfaceParams.isMediaApplication = false commonRC.modules = { "RADIO", "CLIMATE", "SEAT", "AUDIO", "LIGHT", "HMI_SETTINGS" } +commonRC.functionId = functionId function commonRC.GetInteriorVehicleData(pModuleType, isSubscribe, isHMIreqExpect, pAppId) if not pAppId then pAppId = 1 end diff --git a/test_scripts/RC/OnRCStatus/023_notification_by_rc_functionality_allowed_on_hmi_with_registered_app.lua b/test_scripts/RC/OnRCStatus/023_notification_by_rc_functionality_allowed_on_hmi_with_registered_app.lua index 47f4c3b75f..a3a1cefa50 100644 --- a/test_scripts/RC/OnRCStatus/023_notification_by_rc_functionality_allowed_on_hmi_with_registered_app.lua +++ b/test_scripts/RC/OnRCStatus/023_notification_by_rc_functionality_allowed_on_hmi_with_registered_app.lua @@ -19,8 +19,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/OnRCStatus/commonOnRCStatus') -local commonRC = require('test_scripts/RC/commonRC') -local test = require("user_modules/dummy_connecttest") --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -40,7 +38,7 @@ local function registerRCAppRCDisallowed() allowed = false } - commonRC.registerAppWOPTU(1, test) + common.registerAppWOPTU(1) common.validateOnRCStatusForApp(1, pModuleStatusForApp, true) EXPECT_HMINOTIFICATION("RC.OnRCStatus") :Times(0) diff --git a/test_scripts/RC/OnRCStatus/029_notification_by_revoking_several_modules_by_policy.lua b/test_scripts/RC/OnRCStatus/029_notification_by_revoking_several_modules_by_policy.lua index aac719af65..63d272cabc 100644 --- a/test_scripts/RC/OnRCStatus/029_notification_by_revoking_several_modules_by_policy.lua +++ b/test_scripts/RC/OnRCStatus/029_notification_by_revoking_several_modules_by_policy.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local common = require('test_scripts/RC/OnRCStatus/commonOnRCStatus') -local json = require('modules/json') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -34,7 +33,7 @@ local allocatedModules = { local function pTUfunc(tbl) local appId1 = config.application1.registerAppInterfaceParams.fullAppID tbl.policy_table.app_policies[appId1] = common.getRCAppConfig(tbl) - tbl.policy_table.app_policies[appId1].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[appId1].moduleType = commonRC.json.EMPTY_ARRAY local appId2 = config.application2.registerAppInterfaceParams.fullAppID tbl.policy_table.app_policies[appId2] = common.getRCAppConfig(tbl) end diff --git a/test_scripts/RC/OnRCStatus/commonOnRCStatus.lua b/test_scripts/RC/OnRCStatus/commonOnRCStatus.lua index 688482c661..9bd7b99f94 100644 --- a/test_scripts/RC/OnRCStatus/commonOnRCStatus.lua +++ b/test_scripts/RC/OnRCStatus/commonOnRCStatus.lua @@ -3,7 +3,6 @@ --------------------------------------------------------------------------------------------------- --[[ Required Shared libraries ]] local commonRC = require('test_scripts/RC/commonRC') -local commonFunctions = require("user_modules/shared_testcases/commonFunctions") local utils = require("user_modules/utils") --[[ Common Variables ]] @@ -12,11 +11,11 @@ commonRC.cloneTable = utils.cloneTable --[[ Common Functions ]] function commonRC.getModules() - return commonFunctions:cloneTable({ "RADIO", "CLIMATE" }) + return { "RADIO", "CLIMATE" } end function commonRC.getAllModules() - return commonFunctions:cloneTable({ "RADIO", "CLIMATE", "SEAT", "AUDIO", "LIGHT", "HMI_SETTINGS" }) + return { "RADIO", "CLIMATE", "SEAT", "AUDIO", "LIGHT", "HMI_SETTINGS" } end function commonRC.getModulesArray(pModules) diff --git a/test_scripts/RC/SEAT/Capabilities/005_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua b/test_scripts/RC/SEAT/Capabilities/005_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua index eaa1e28a13..a2753b52b7 100644 --- a/test_scripts/RC/SEAT/Capabilities/005_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua +++ b/test_scripts/RC/SEAT/Capabilities/005_Default_capabilities_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -27,7 +26,7 @@ local enabledModule = "SEAT" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady = nil params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/SEAT/Capabilities/006_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua b/test_scripts/RC/SEAT/Capabilities/006_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua index 7fdd448673..f55774c3a4 100644 --- a/test_scripts/RC/SEAT/Capabilities/006_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua +++ b/test_scripts/RC/SEAT/Capabilities/006_Default_capabilities_if_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_SEAT.lua @@ -16,7 +16,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local hmi_values = require('user_modules/hmi_values') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -27,7 +26,7 @@ local enabledModule = "SEAT" --[[ Local Functions ]] local function getHMIParams() - local params = hmi_values.getDefaultHMITable() + local params = commonRC.getDefaultHMITable() params.RC.IsReady.params.available = true params.RC.GetCapabilities = nil return params diff --git a/test_scripts/RC/SEAT/GetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua b/test_scripts/RC/SEAT/GetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua index 8320449e0f..c9c2e28e08 100644 --- a/test_scripts/RC/SEAT/GetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua +++ b/test_scripts/RC/SEAT/GetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua @@ -14,7 +14,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local json = require('modules/json') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -45,7 +44,7 @@ local function getDataForModule(pModuleType) end local function PTUfunc(tbl) - tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = json.EMPTY_ARRAY + tbl.policy_table.app_policies[config.application1.registerAppInterfaceParams.fullAppID].moduleType = commonRC.json.EMPTY_ARRAY end --[[ Scenario ]] diff --git a/test_scripts/RC/SEAT/SetInteriorVehicleData/006_GENERIC_ERROR_in_case_HMI_did_not_respond.lua b/test_scripts/RC/SEAT/SetInteriorVehicleData/006_GENERIC_ERROR_in_case_HMI_did_not_respond.lua index bb7d661c39..aa75ec33d9 100644 --- a/test_scripts/RC/SEAT/SetInteriorVehicleData/006_GENERIC_ERROR_in_case_HMI_did_not_respond.lua +++ b/test_scripts/RC/SEAT/SetInteriorVehicleData/006_GENERIC_ERROR_in_case_HMI_did_not_respond.lua @@ -14,7 +14,6 @@ --[[ Required Shared libraries ]] local runner = require('user_modules/script_runner') local commonRC = require('test_scripts/RC/commonRC') -local commonTestCases = require('user_modules/shared_testcases/commonTestCases') --[[ Test Configuration ]] runner.testSettings.isSelfIncluded = false @@ -35,7 +34,7 @@ local function setVehicleData(pModuleType) end) mobileSession:ExpectResponse(cid, { success = false, resultCode = "GENERIC_ERROR"}) - commonTestCases:DelayedExp(11000) + commonRC.wait(11000) end --[[ Scenario ]] diff --git a/test_scripts/RC/commonRC.lua b/test_scripts/RC/commonRC.lua index 66d06f6027..fa8aad77dc 100644 --- a/test_scripts/RC/commonRC.lua +++ b/test_scripts/RC/commonRC.lua @@ -2,7 +2,6 @@ -- RC common module --------------------------------------------------------------------------------------------------- --[[ General configuration parameters ]] -config.mobileHost = "127.0.0.1" config.defaultProtocolVersion = 2 config.ValidateSchema = false config.checkAllValidations = true @@ -14,14 +13,12 @@ config.application3.registerAppInterfaceParams.syncMsgVersion.majorVersion = 5 --[[ Required Shared libraries ]] local test = require("user_modules/dummy_connecttest") -local commonFunctions = require("user_modules/shared_testcases/commonFunctions") -local commonTestCases = require("user_modules/shared_testcases/commonTestCases") -local commonPreconditions = require('user_modules/shared_testcases/commonPreconditions') local json = require("modules/json") local hmi_values = require("user_modules/hmi_values") local events = require("events") local utils = require('user_modules/utils') local actions = require("user_modules/sequences/actions") +local SDL = require('modules/SDL') --[[ Common Variables ]] @@ -41,6 +38,10 @@ commonRC.jsonFileToTable = utils.jsonFileToTable commonRC.tableToJsonFile = utils.tableToJsonFile commonRC.cloneTable = utils.cloneTable commonRC.wait = utils.wait +commonRC.cprint = utils.cprint +commonRC.start = actions.start + +commonRC.json = json commonRC.modules = { "RADIO", "CLIMATE" } commonRC.allModules = { "RADIO", "CLIMATE", "SEAT", "AUDIO", "LIGHT", "HMI_SETTINGS" } @@ -130,36 +131,9 @@ local function allowSDL() }) end -function commonRC.start(pHMIParams) - test:runSDL() - commonFunctions:waitForSDLStart(test) - :Do(function() - test:initHMI(test) - :Do(function() - commonFunctions:userPrint(35, "HMI initialized") - test:initHMI_onReady(pHMIParams) - :Do(function() - commonFunctions:userPrint(35, "HMI is ready") - test:connectMobile() - :Do(function() - commonFunctions:userPrint(35, "Mobile connected") - allowSDL() - end) - end) - end) - end) -end - -local function backupPreloadedPT() - local preloadedFile = commonFunctions:read_parameter_from_smart_device_link_ini("PreloadedPT") - commonPreconditions:BackupFile(preloadedFile) -end - local function updatePreloadedPT(pCountOfRCApps) if not pCountOfRCApps then pCountOfRCApps = 2 end - local preloadedFile = commonPreconditions:GetPathToSDL() - .. commonFunctions:read_parameter_from_smart_device_link_ini("PreloadedPT") - local preloadedTable = commonRC.jsonFileToTable(preloadedFile) + local preloadedTable = SDL.PreloadedPT.get() preloadedTable.policy_table.functional_groupings["DataConsent-2"].rpcs = json.null preloadedTable.policy_table.functional_groupings["RemoteControl"].rpcs.OnRCStatus = { hmi_levels = { "FULL", "BACKGROUND", "LIMITED", "NONE" } @@ -169,26 +143,21 @@ local function updatePreloadedPT(pCountOfRCApps) preloadedTable.policy_table.app_policies[appId] = commonRC.getRCAppConfig(preloadedTable) preloadedTable.policy_table.app_policies[appId].AppHMIType = nil end - commonRC.tableToJsonFile(preloadedTable, preloadedFile) + SDL.PreloadedPT.set(preloadedTable) end function commonRC.preconditions(isPreloadedUpdate, pCountOfRCApps) if isPreloadedUpdate == nil then isPreloadedUpdate = true end actions.preconditions() if isPreloadedUpdate == true then - backupPreloadedPT() + SDL.PreloadedPT.backup() updatePreloadedPT(pCountOfRCApps) end end -local function restorePreloadedPT() - local preloadedFile = commonFunctions:read_parameter_from_smart_device_link_ini("PreloadedPT") - commonPreconditions:RestoreFile(preloadedFile) -end - function commonRC.postconditions() actions.postconditions() - restorePreloadedPT() + SDL.PreloadedPT.restore() end function commonRC.unregisterApp(pAppId) @@ -801,13 +770,13 @@ function commonRC.isUnsubscribed(pModuleType, pAppId) commonRC.getHMIConnection():SendNotification(commonRC.getHMIEventName(rpc), commonRC.getHMIResponseParams(rpc, pModuleType)) commonRC.setActualInteriorVD(pModuleType, commonRC.getHMIResponseParams(rpc, pModuleType).moduleData) mobSession:ExpectNotification(commonRC.getAppEventName(rpc), {}):Times(0) - commonTestCases:DelayedExp(commonRC.timeout) + utils.wait(commonRC.timeout) end function commonRC.defineRAMode(pAllowed, pAccessMode) local rpc = "OnRemoteControlSettings" commonRC.getHMIConnection():SendNotification(commonRC.getHMIEventName(rpc), commonRC.getHMIResponseParams(rpc, pAllowed, pAccessMode)) - commonTestCases:DelayedExp(commonRC.minTimeout) -- workaround due to issue with SDL -> redundant OnHMIStatus notification is sent + utils.wait(commonRC.minTimeout) -- workaround due to issue with SDL -> redundant OnHMIStatus notification is sent end function commonRC.rpcDenied(pModuleType, pAppId, pRPC, pResultCode) @@ -815,7 +784,7 @@ function commonRC.rpcDenied(pModuleType, pAppId, pRPC, pResultCode) local cid = mobSession:SendRPC(commonRC.getAppEventName(pRPC), commonRC.getAppRequestParams(pRPC, pModuleType)) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC), {}):Times(0) mobSession:ExpectResponse(cid, { success = false, resultCode = pResultCode }) - commonTestCases:DelayedExp(commonRC.timeout) + utils.wait(commonRC.timeout) end function commonRC.rpcDeniedWithCustomParams(pParams, pAppId, pRPC, pResultCode) @@ -823,7 +792,7 @@ function commonRC.rpcDeniedWithCustomParams(pParams, pAppId, pRPC, pResultCode) local cid = mobSession:SendRPC(commonRC.getAppEventName(pRPC), pParams) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC), {}):Times(0) mobSession:ExpectResponse(cid, { success = false, resultCode = pResultCode }) - commonTestCases:DelayedExp(commonRC.timeout) + utils.wait(commonRC.timeout) end function commonRC.rpcAllowed(pModuleType, pAppId, pRPC) @@ -862,7 +831,7 @@ function commonRC.rpcRejectWithConsent(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) end) mobSession:ExpectResponse(cid, { success = false, resultCode = "REJECTED", info = info }) - commonTestCases:DelayedExp(commonRC.timeout) + utils.wait(commonRC.timeout) end function commonRC.rpcRejectWithoutConsent(pModuleType, pAppId, pRPC) @@ -871,7 +840,7 @@ function commonRC.rpcRejectWithoutConsent(pModuleType, pAppId, pRPC) EXPECT_HMICALL(commonRC.getHMIEventName("GetInteriorVehicleDataConsent")):Times(0) EXPECT_HMICALL(commonRC.getHMIEventName(pRPC)):Times(0) mobSession:ExpectResponse(cid, { success = false, resultCode = "REJECTED" }) - commonTestCases:DelayedExp(commonRC.timeout) + utils.wait(commonRC.timeout) end function commonRC.rpcButtonPress(pParams, pAppId) @@ -888,6 +857,8 @@ function commonRC.buildButtonCapability(name, shortPressAvailable, longPressAvai return hmi_values.createButtonCapability(name, shortPressAvailable, longPressAvailable, upDownAvailable) end +commonRC.getDefaultHMITable = hmi_values.getDefaultHMITable + function commonRC.buildHmiRcCapabilities(pCapabilities) local hmiParams = hmi_values.getDefaultHMITable() hmiParams.RC.IsReady.params.available = true @@ -905,13 +876,11 @@ function commonRC.buildHmiRcCapabilities(pCapabilities) end function commonRC.backupHMICapabilities() - local hmiCapabilitiesFile = commonFunctions:read_parameter_from_smart_device_link_ini("HMICapabilities") - commonPreconditions:BackupFile(hmiCapabilitiesFile) + SDL.HMICap.backup() end function commonRC.restoreHMICapabilities() - local hmiCapabilitiesFile = commonFunctions:read_parameter_from_smart_device_link_ini("HMICapabilities") - commonPreconditions:RestoreFile(hmiCapabilitiesFile) + SDL.HMICap.restore() end function commonRC.getButtonIdByName(pArray, pButtonName) @@ -946,16 +915,14 @@ function commonRC.activateApp(pAppId) end function commonRC.updateDefaultCapabilities(pDisabledModuleTypes) - local hmiCapabilitiesFile = commonPreconditions:GetPathToSDL() - .. commonFunctions:read_parameter_from_smart_device_link_ini("HMICapabilities") - local hmiCapTbl = commonRC.jsonFileToTable(hmiCapabilitiesFile) + local hmiCapTbl = SDL.HMICap.get() local rcCapTbl = hmiCapTbl.UI.systemCapabilities.remoteControlCapability for _, pDisabledModuleType in pairs(pDisabledModuleTypes) do local buttonId = commonRC.getButtonIdByName(rcCapTbl.buttonCapabilities, commonRC.getButtonNameByModule(pDisabledModuleType)) table.remove(rcCapTbl.buttonCapabilities, buttonId) rcCapTbl[string.lower(pDisabledModuleType) .. "ControlCapabilities"] = nil end - commonRC.tableToJsonFile(hmiCapTbl, hmiCapabilitiesFile) + SDL.HMICap.set(hmiCapTbl) end commonRC.getHMIAppIds = actions.getHMIAppIds @@ -991,7 +958,7 @@ function commonRC.setActualInteriorVD(pModuleType, pParams) commonRC.actualInteriorDataStateOnHMI[pModuleType][moduleParams][key] = value end else - if false == commonFunctions:is_table_equal(value, commonRC.actualInteriorDataStateOnHMI[pModuleType][moduleParams][key]) then + if false == utils.isTableEqual(value, commonRC.actualInteriorDataStateOnHMI[pModuleType][moduleParams][key]) then commonRC.actualInteriorDataStateOnHMI[pModuleType][moduleParams][key] = value end end diff --git a/user_modules/utils.lua b/user_modules/utils.lua index 2a3766ca93..7a5bfa5c9c 100644 --- a/user_modules/utils.lua +++ b/user_modules/utils.lua @@ -72,6 +72,68 @@ function m.cloneTable(pTbl) return copy end +--[[ @isTableEqual: check tables equality +--! @parameters: +--! table1 - first table +--! table2 - second table +--! @return: true if tables are equal +--]] +function m.isTableEqual(table1, table2) + + local function TableSize(T) + local count = 0 + for _ in pairs(T) do count = count + 1 end + return count + end + + -- compare value types + local type1 = type(table1) + local type2 = type(table2) + if type1 ~= type2 then return false end + if type1 ~= 'table' and type2 ~= 'table' then return table1 == table2 end + local size_tab1 = TableSize(table1) + local size_tab2 = TableSize(table2) + if size_tab1 ~= size_tab2 then return false end + + --compare arrays + if json.isArray(table1) and json.isArray(table2) then + local found_element + local copy_table2 = m.cloneTable(table2) + for i, _ in pairs(table1) do + found_element = false + for j, _ in pairs(copy_table2) do + if m.isTableEqual(table1[i], copy_table2[j]) then + copy_table2[j] = nil + found_element = true + break + end + end + if found_element == false then + break + end + end + if TableSize(copy_table2) == 0 then + return true + else + return false + end + end + + -- compare tables by elements + local already_compared = {} --optimization + for _,v1 in pairs(table1) do + for k2,v2 in pairs(table2) do + if not already_compared[k2] and m.isTableEqual(v1,v2) then + already_compared[k2] = true + end + end + end + if size_tab2 ~= TableSize(already_compared) then + return false + end + return true +end + --[[ @wait: delay test step for specific timeout --! @parameters: --! pTimeOut - time to wait in ms