Skip to content
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

Jump to bottom

[SDL 0262] Feature/New vehicle data SeatOccupancy #2490

Merged
merged 14 commits into from
Feb 2, 2021
Merged

[SDL 0262] Feature/New vehicle data SeatOccupancy #2490

Show file tree
Hide file tree
Changes from 11 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
19f79c2
Add new functions into utils module
dboltovskyi Nov 25, 2020
4d83c71
Add new API common modules
dboltovskyi Nov 25, 2020
f38ed32
Update VD common module
dboltovskyi Nov 25, 2020
ede9f29
Update existing scripts
dboltovskyi Nov 25, 2020
f783052
Add new scripts
dboltovskyi Nov 25, 2020
bbd8000
Remove old scripts
dboltovskyi Nov 25, 2020
e9d5c9b
Update VD test set
dboltovskyi Nov 25, 2020
9de3ed1
Add seatOccupancy to existed scripts for vehicle data
VjKlepikov Nov 11, 2020
8423b70
Add seatOccupancy to existed scripts for GNSD
VjKlepikov Nov 11, 2020
27af7bf
Add posibility to run tests only for specified VD parameter
dboltovskyi Dec 1, 2020
c219e94
Merge branch 'feature/extended_vd_coverage' into feature/sdl_0262_new…
dboltovskyi Dec 2, 2020
4fc18f6
Merge remote-tracking branch 'smart/develop' into feature/extended_vd…
dboltovskyi Dec 28, 2020
1b08fde
Merge branch 'feature/extended_vd_coverage' into feature/sdl_0262_new…
dboltovskyi Dec 28, 2020
28208a0
Merge remote-tracking branch 'smart/develop' into feature/sdl_0262_ne…
dboltovskyi Jan 25, 2021
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
80 changes: 0 additions & 80 deletions test_scripts/API/VehicleData/AudioSource/001_Success_deviceStatus_primaryAudioSource.lua
View file
Open in desktop

This file was deleted.

97 changes: 0 additions & 97 deletions ..._scripts/API/VehicleData/AudioSource/002_Success_flow_deviceStatus_primaryAudioSource.lua
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions .../API/VehicleData/GearStatus/001_GetVehicleData_with_one_param_in_gearStatus_structure.lua
View file
Open in desktop

This file was deleted.

75 changes: 0 additions & 75 deletions .../VehicleData/GearStatus/002_OnVehicleData_with_only_one_param_in_gearStatus_structure.lua
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions test_scripts/API/VehicleData/GenericNetworkSignalData/commonGenericNetSignalData.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,14 @@ local function VehicleDataItemsWithDataTableCreation()
local myKeyParams = common.VehicleDataItemsWithData.myKey.params
myKeyParams.e911Override.value = "ON"
common.VehicleDataItemsWithData.myKey.APItype = "VEHICLEDATA_MYKEY"
local seatOccupancyParams = common.VehicleDataItemsWithData.seatOccupancy.params
seatOccupancyParams.seatsOccupied.value = {
{ seatLocation = { grid = { col = 53, row = 53, level = 53, colspan = 53, rowspan = 53, levelspan = 53 }},
conditionActive = true }}
seatOccupancyParams.seatsBelted.value = {
{ seatLocation = { grid = { col = 54, row = 54, level = 54, colspan = 54, rowspan = 54, levelspan = 54 }},
conditionActive = false }}
common.VehicleDataItemsWithData.seatOccupancy.APItype = "VEHICLEDATA_SEATOCCUPANCY"
else
utils.cprint(31, "VehicleDataItemsWithData are missed in preloaded file")
end
Expand Down
13 changes: 9 additions & 4 deletions test_scripts/API/VehicleData/GetVehicleData/001_GetVD_Success_flow.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
---------------------------------------------------------------------------------------------------
-- Description: Check that SDL processes GetVehicleData RPC with <vd_param> parameter
-- Positive cases for all VD parameters and sub-parameters
--
-- Preconditions:
-- 1) SDL and HMI are started
Expand All @@ -18,17 +19,21 @@
--[[ Required Shared libraries ]]
local common = require('test_scripts/API/VehicleData/common')

--[[ Local Constants ]]
local testTypes = {
common.testType.VALID_RANDOM_ALL,
common.testType.VALID_RANDOM_SUB
}

--[[ Scenario ]]
common.Title("Preconditions")
common.Step("Clean environment and update preloaded_pt file", common.preconditions)
common.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
common.Step("Register App", common.registerApp)
common.Step("Activate App", common.activateApp)

common.Title("Test")
for param in common.spairs(common.getVDParams()) do
common.Title("VD parameter: " .. param)
common.Step("RPC " .. common.rpc.get, common.getVehicleData, { param })
end
common.getTestsForGetVD(testTypes)

common.Title("Postconditions")
common.Step("Stop SDL", common.postconditions)
1 change: 1 addition & 0 deletions test_scripts/API/VehicleData/GetVehicleData/003_GetVD_disallowed_after_PTU.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ local function getVDGroup(pDisallowedParam)
for param in pairs(common.getVDParams()) do
if param ~= pDisallowedParam then table.insert(params, param) end
end
if #params == 0 then params = common.json.EMPTY_ARRAY end
return {
rpcs = {
[common.rpc.get] = {
Expand Down
Loading