Skip to content

Adapt RC tests for Remote connection #11

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
aderiabin wants to merge 1 commit into
base: feature/remote_atf_connection
Choose a base branch
from
Open

Adapt RC tests for Remote connection #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions ...S/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions ...ts/RC/AUDIO_LIGHT_HMI_SETTINGS/GetInteriorVehicleData/017_Success_audio_source_values.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -44,7 +43,7 @@ local function subscribeToModule(pAudioSources)
end
return true
end)
utils.wait(500)
common.wait(500)
end

--[[ Scenario ]]
Expand Down
3 changes: 1 addition & 2 deletions ...INGS/GetSystemCapability/003_UNSUPPORTED_RESOURCE_in_case_RC_interface_is_unavailable.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...S/SetInteriorVehicleData/006_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions .../SetInteriorVehicleData/019_Light_more_values_READ_ONLY_in_case_statusAvailable_false.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...ehicleData/020_Light_more_values_UNSUPPORTED_RESOURCE_in_case_statusAvailable_omitted.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...riorVehicleData/022_Light_more_values_UNSUPPORTED_RESOURCE_in_case_light_name_omitted.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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,
Expand Down
3 changes: 1 addition & 2 deletions ..._scripts/RC/CLIMATE_RADIO/ButtonPress/007_button_press_allowed_if_moduleType_is_empty.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
Expand Down
4 changes: 1 addition & 3 deletions test_scripts/RC/CLIMATE_RADIO/ButtonPress/010_generic_error_if_no_response_from_hmi.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions ...s/RC/CLIMATE_RADIO/Capabilities/004_Resend_only_supported_parameter_and_reject_others.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions test_scripts/RC/CLIMATE_RADIO/Capabilities/005_Resend_only_supported_parameters.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
3 changes: 1 addition & 2 deletions ...TE_RADIO/Capabilities/007_Reject_GIVD_SIVD_BP_if_HMI_respond_to_RC_IsReady_with_false.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...es_if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ..._if_HMI_doesnt_respond_to_RC_IsReady_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...f_HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_RADIO.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 1 addition & 2 deletions ...HMI_responds_to_RC_IsReady_with_true_and_doesnt_respond_to_RC_GetCapabilities_CLIMATE.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
10 changes: 3 additions & 7 deletions test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleData/006_RPC_parameters_values.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand All @@ -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()
Expand All @@ -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)
Expand Down
4 changes: 1 addition & 3 deletions ...RC/CLIMATE_RADIO/GetInteriorVehicleData/007_GENERIC_ERROR_in_case_HMI_did_not_respond.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions ...O/GetInteriorVehicleData/009_Success_flow_in_case_moduleType_is_an_empty_array_in_LPT.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/005_TIMED_OUT_from_HMI_SIVD.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/006_TIMED_OUT_from_HMI_BP.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]]
Expand Down
3 changes: 1 addition & 2 deletions test_scripts/RC/CLIMATE_RADIO/GetInteriorVehicleDataConsent/007_HMI_no_response_SIVD.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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 ]]
Expand Down
Loading