Merge branch 'feature/extended_vd_coverage' into feature/sdl_0255_enh…

…ance_bodyInformation_vehicle_data
smartdevicelink · Dec 2, 2020 · 3e2f589 · 3e2f589
2 parents 153ceb9 + 27af7bf
commit 3e2f589
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 5 deletions.
diff --git a/test_scripts/API/VehicleData/GetVehicleData/003_GetVD_disallowed_after_PTU.lua b/test_scripts/API/VehicleData/GetVehicleData/003_GetVD_disallowed_after_PTU.lua
@@ -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] = {

diff --git a/test_scripts/API/VehicleData/OnVehicleData/003_OnVD_disallowed_after_PTU.lua b/test_scripts/API/VehicleData/OnVehicleData/003_OnVD_disallowed_after_PTU.lua
@@ -27,6 +27,8 @@ local function getVDGroup(pDisallowedParam)
     if param ~= pDisallowedParam then table.insert(params, param) end
     table.insert(all_params, param)
   end
+  if #all_params == 0 then all_params = common.json.EMPTY_ARRAY end
+  if #params == 0 then params = common.json.EMPTY_ARRAY end
   return {
     rpcs = {
       [common.rpc.sub] = {

diff --git a/test_scripts/API/VehicleData/SubscribeVehicleData/003_SubscribeVD_disallowed_after_PTU.lua b/test_scripts/API/VehicleData/SubscribeVehicleData/003_SubscribeVD_disallowed_after_PTU.lua
@@ -33,6 +33,7 @@ local function getVDGroup(pDisallowedParam)
   for param in pairs(common.getVDParams(true)) 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.sub] = {

diff --git a/...scripts/API/VehicleData/UnsubscribeVehicleData/003_UnsubscribeVD_disallowed_after_PTU.lua b/...scripts/API/VehicleData/UnsubscribeVehicleData/003_UnsubscribeVD_disallowed_after_PTU.lua
@@ -36,6 +36,8 @@ local function getVDGroup(pDisallowedParam)
     if param ~= pDisallowedParam then table.insert(params, param) end
     table.insert(all_params, param)
   end
+  if #all_params == 0 then all_params = common.json.EMPTY_ARRAY end
+  if #params == 0 then params = common.json.EMPTY_ARRAY end
   return {
     rpcs = {
       [common.rpc.sub] = {

diff --git a/test_scripts/API/VehicleData/common.lua b/test_scripts/API/VehicleData/common.lua
@@ -168,9 +168,47 @@ local boundValueTypeMap = {
   [m.testType.UPPER_OUT_OF_BOUND] = tdg.valueType.UPPER_OUT_OF_BOUND,
   [m.testType.LOWER_OUT_OF_BOUND] = tdg.valueType.LOWER_OUT_OF_BOUND
 }
+local isRestricted = false
 
 --[[ Common Functions ]]
 
+--[[ @restrictAvailableVDParams: Restrict VD parameters for test by only ones defined in 'VD_PARAMS' environment variable
+--! @parameters: none
+--! @return: none
+--]]
+local function restrictAvailableVDParams()
+  local extVDParams = os.getenv("VD_PARAMS")
+  local checkedExtVDParams = {}
+  if extVDParams ~= nil then
+    m.cprint(color.magenta, "Environment variable 'VD_PARAMS': " .. extVDParams)
+    for _, p in pairs(utils.splitString(extVDParams, ",")) do
+      if m.vd[p] ~= nil then
+        isRestricted = true
+        table.insert(checkedExtVDParams, p)
+      else
+        m.cprint(color.magenta, "Unknown VD parameter:", p)
+      end
+    end
+  end
+  if #checkedExtVDParams > 0 then
+    for k in pairs(m.vd) do
+      if not utils.isTableContains(checkedExtVDParams, k) then
+        m.vd[k] = nil
+      end
+    end
+    local checkedExtVDParamsToPrint = ""
+    for id, p in pairs(checkedExtVDParams) do
+      checkedExtVDParamsToPrint = checkedExtVDParamsToPrint .. p
+      if id ~= #checkedExtVDParams then checkedExtVDParamsToPrint = checkedExtVDParamsToPrint .. ", " end
+    end
+    m.cprint(color.magenta, "Testing VD parameters restricted to: " .. checkedExtVDParamsToPrint)
+  else
+    m.cprint(color.magenta, "Testing VD parameters are not restricted")
+  end
+end
+
+restrictAvailableVDParams()
+
 --[[ @getAvailableVDParams: Return VD parameters available for processing
 --! @parameters: none
 --! @return: table with VD parameters
@@ -191,7 +229,7 @@ local function getAvailableVDParams()
   for k in pairs(vdParams) do
     if m.vd[k] == nil then
       vdParams[k] = nil
-      m.cprint(color.magenta, "Disabled VD parameter:", k)
+      if not isRestricted then m.cprint(color.magenta, "Disabled VD parameter:", k) end
     end
   end
   return vdParams
@@ -223,6 +261,9 @@ local function updatePreloadedPTFile(pGroup)
       }
     end
   end
+  for _, data in pairs(pGroup.rpcs) do
+    if #data.parameters == 0 then data.parameters = json.EMPTY_ARRAY end
+  end
   pt.policy_table.functional_groupings["VDGroup"] = pGroup
   pt.policy_table.app_policies["default"].groups = { "Base-4", "VDGroup" }
   pt.policy_table.functional_groupings["DataConsent-2"].rpcs = json.null
@@ -946,10 +987,13 @@ local function getVersionTests()
   local tcs = createTestCases(ah.apiType.MOBILE, ah.eventType.REQUEST, rpc,
     m.isMandatory.ALL, m.isArray.ALL, m.isVersion.YES, {})
   for _, tc in pairs(tcs) do
-    table.insert(tests, {
-        param = tc.graph[tc.paramId].name,
-        version = tc.graph[tc.paramId].since
-      })
+    local name = tc.graph[tc.paramId].name
+    if vdParams[name] then
+      table.insert(tests, {
+          param = tc.graph[tc.paramId].name,
+          version = tc.graph[tc.paramId].since
+        })
+    end
   end
   return tests
 end