Merge pull request #2194 from smartdevicelink/feature/app_service_med…

…ia_image mediaImage Parameter Tests
smartdevicelink · Jun 7, 2019 · f53434a · f53434a
2 parents d4e56c4 + 8d157f3
commit f53434a
Show file tree

Hide file tree

Showing 3 changed files with 282 additions and 0 deletions.
diff --git a/test_scripts/AppServices/GetAppServiceData/017_H2M_MediaImage_success.lua b/test_scripts/AppServices/GetAppServiceData/017_H2M_MediaImage_success.lua
@@ -0,0 +1,146 @@
+---------------------------------------------------------------------------------------------------
+--  Precondition: 
+--  1) Application with <appID> is registered on SDL.
+--  2) Specific permissions are assigned for <appID> with GetAppServiceData
+--  3) Application has published a MEDIA service
+--  4) Application does a putfile with an image
+--
+--  Steps:
+--  1) HMI sends a AppService.GetAppServiceData RPC request with serviceType MEDIA
+--
+--  Expected:
+--  1) SDL forwards the GetAppServiceData request to Application as GetAppServiceData
+--  2) Application sends a GetAppServiceData response (SUCCESS) to Core with its own serviceData
+--  3) SDL forwards the response to HMI as AppService.GetAppServiceData. The mediaImage value is the full file path of the image.
+---------------------------------------------------------------------------------------------------
+
+--[[ Required Shared libraries ]]
+local runner = require('user_modules/script_runner')
+local common = require('test_scripts/AppServices/commonAppServices')
+local SDLConfig = require('user_modules/shared_testcases/SmartDeviceLinkConfigurations')
+local utils = require("user_modules/utils")
+
+--[[ Test Configuration ]]
+runner.testSettings.isSelfIncluded = false
+
+--[[ Local Variables ]]
+local deviceMAC = utils.getDeviceMAC()
+local storagePath = config.pathToSDL .. "/" .. SDLConfig:GetValue("AppStorageFolder") .. "/" .. tostring(config.application1.registerAppInterfaceParams.fullAppID .. "_" .. deviceMAC .. "/")
+
+
+local manifest = {
+  serviceName = config.application1.registerAppInterfaceParams.appName,
+  serviceType = "MEDIA",
+  allowAppConsumers = true,
+  rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
+  navigationServiceManifest = {
+    acceptsWayPoints = true
+  }
+}
+
+local appServiceData = {
+  serviceType = manifest.serviceType,
+  mediaServiceData = {
+    mediaType = "MUSIC",
+    mediaTitle = "Song name",
+    mediaArtist = "Band name",
+    mediaAlbum = "Album name",
+    playlistName = "Good music",
+    isExplicit = false,
+    trackPlaybackProgress = 200,
+    trackPlaybackDuration = 300,
+    queuePlaybackProgress = 2200,
+    queuePlaybackDuration = 4000,
+    queueCurrentTrackNumber = 12,
+    queueTotalTrackCount = 20,
+    mediaImage = {
+      value = "icon_png.png",
+      imageType = "DYNAMIC"
+    }
+  },
+  success = true,
+  resultCode = "SUCCESS"
+}
+
+local hmiServiceData = {
+  serviceType = manifest.serviceType,
+  mediaServiceData = {
+    mediaType = "MUSIC",
+    mediaTitle = "Song name",
+    mediaArtist = "Band name",
+    mediaAlbum = "Album name",
+    playlistName = "Good music",
+    isExplicit = false,
+    trackPlaybackProgress = 200,
+    trackPlaybackDuration = 300,
+    queuePlaybackProgress = 2200,
+    queuePlaybackDuration = 4000,
+    queueCurrentTrackNumber = 12,
+    queueTotalTrackCount = 20,
+    mediaImage = {
+      value = storagePath .. "icon_png.png",
+      imageType = "DYNAMIC"
+    }
+  },
+  success = true,
+  resultCode = "SUCCESS"
+}
+
+local rpc = {
+  name = "GetAppServiceData",
+  hmiName = "AppService.GetAppServiceData",
+  params = {
+    serviceType = manifest.serviceType
+  }
+}
+
+local expectedResponse = {
+  serviceData = appServiceData,
+  success = true,
+  resultCode = "SUCCESS"
+}
+
+local putFileParams = {
+  syncFileName = "icon_png.png",
+  fileType ="GRAPHIC_PNG",
+}
+
+local function PTUfunc(tbl)
+  tbl.policy_table.app_policies[common.getConfigAppParams(1).fullAppID] = common.getAppServiceProducerConfig(1, manifest.serviceType);
+end
+
+--[[ Local Functions ]]
+local function processRPCSuccess(self)
+  local mobileSession = common.getMobileSession()
+  local cid = common.getHMIConnection():SendRequest(rpc.hmiName, rpc.params)
+  local service_id = common.getAppServiceID()
+  local responseParams = expectedResponse
+  responseParams.serviceData.serviceID = service_id
+  mobileSession:ExpectRequest(rpc.name, rpc.params):Do(function(_, data) 
+      mobileSession:SendResponse(rpc.name, data.rpcCorrelationId, responseParams)
+    end)
+
+  EXPECT_HMIRESPONSE(cid, {
+    result = {
+      serviceData = hmiServiceData,
+      code = 0, 
+      method = rpc.hmiName
+    }
+  })
+end
+
+--[[ Scenario ]]
+runner.Title("Preconditions")
+runner.Step("Clean environment", common.preconditions)
+runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
+runner.Step("RAI", common.registerApp)
+runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
+runner.Step("Activate App", common.activateApp)
+runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
+runner.Step("Putfile", common.putFileInStorage, {1, putFileParams, result})
+
+runner.Title("Test")
+runner.Step("RPC " .. rpc.name .. "_resultCode_SUCCESS", processRPCSuccess)
+
+runner.Title("Postconditions")
+runner.Step("Stop SDL", common.postconditions)
diff --git a/test_scripts/AppServices/OnAppServiceData/012_H2M_media_image_success.lua b/test_scripts/AppServices/OnAppServiceData/012_H2M_media_image_success.lua
@@ -0,0 +1,134 @@
+---------------------------------------------------------------------------------------------------
+--  Precondition: 
+--  1) Application with <appID> is registered on SDL.
+--  2) Specific permissions are assigned for <appID> with OnAppServiceData
+--  3) App sends putfile with an image
+--  4) Application has published a MEDIA service
+--  5) HMI is subscribed to OnAppServiceData
+--
+--  Steps:
+--  1) Application sends a OnAppServiceData RPC notification with serviceType MEDIA including a mediaImage
+--
+--  Expected:
+--  1) SDL forwards the OnAppServiceData notification to HMI with full media image path
+---------------------------------------------------------------------------------------------------
+
+--[[ Required Shared libraries ]]
+local runner = require('user_modules/script_runner')
+local common = require('test_scripts/AppServices/commonAppServices')
+local SDLConfig = require('user_modules/shared_testcases/SmartDeviceLinkConfigurations')
+local utils = require("user_modules/utils")
+
+--[[ Test Configuration ]]
+runner.testSettings.isSelfIncluded = false
+
+--[[ Local Variables ]]
+local deviceMAC = utils.getDeviceMAC()
+local storagePath = config.pathToSDL .. "/" .. SDLConfig:GetValue("AppStorageFolder") .. "/" .. tostring(config.application1.registerAppInterfaceParams.fullAppID .. "_" .. deviceMAC .. "/")
+
+
+local putFileParams = {
+  syncFileName = "icon_png.png",
+  fileType ="GRAPHIC_PNG",
+}
+
+local result = { success = true, resultCode = "SUCCESS"}
+
+local manifest = {
+  serviceName = config.application1.registerAppInterfaceParams.appName,
+  serviceType = "MEDIA",
+  allowAppConsumers = true,
+  rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
+  mediaServiceManifest = {}
+}
+
+local appServiceData = {
+  serviceType = manifest.serviceType,
+  mediaServiceData = {
+    mediaType = "MUSIC",
+    mediaTitle = "Song name",
+    mediaArtist = "Band name",
+    mediaAlbum = "Album name",
+    playlistName = "Good music",
+    isExplicit = false,
+    trackPlaybackProgress = 200,
+    trackPlaybackDuration = 300,
+    queuePlaybackProgress = 2200,
+    queuePlaybackDuration = 4000,
+    queueCurrentTrackNumber = 12,
+    queueTotalTrackCount = 20,
+    mediaImage = {
+      value = "icon_png.png",
+      imageType = "DYNAMIC"
+    }
+  }
+}
+
+local hmiServiceData = {
+  serviceType = manifest.serviceType,
+  mediaServiceData = {
+    mediaType = "MUSIC",
+    mediaTitle = "Song name",
+    mediaArtist = "Band name",
+    mediaAlbum = "Album name",
+    playlistName = "Good music",
+    isExplicit = false,
+    trackPlaybackProgress = 200,
+    trackPlaybackDuration = 300,
+    queuePlaybackProgress = 2200,
+    queuePlaybackDuration = 4000,
+    queueCurrentTrackNumber = 12,
+    queueTotalTrackCount = 20,
+    mediaImage = {
+      value = storagePath .. "icon_png.png",
+      imageType = "DYNAMIC"
+    }
+  }
+}
+
+local rpc = {
+  name = "OnAppServiceData",
+  hmiName = "AppService.OnAppServiceData"
+}
+
+local expectedNotification = {
+  serviceData = appServiceData
+}
+
+local hmiNotification = {
+  serviceData = hmiServiceData
+}
+
+local function PTUfunc(tbl)
+  tbl.policy_table.app_policies[common.getConfigAppParams(1).fullAppID] = common.getAppServiceProducerConfig(1);
+end
+
+--[[ Local Functions ]]
+local function processRPCSuccess(self)
+  local mobileSession = common.getMobileSession()
+  local service_id = common.getAppServiceID(1)
+  local notificationParams = expectedNotification
+  local hmiNotificationParams = hmiNotification
+  notificationParams.serviceData.serviceID = service_id
+  hmiNotificationParams.serviceData.serviceID = service_id
+
+  mobileSession:SendNotification(rpc.name, notificationParams)
+
+  EXPECT_HMINOTIFICATION(rpc.hmiName, hmiNotificationParams)
+end
+
+--[[ Scenario ]]
+runner.Title("Preconditions")
+runner.Step("Clean environment", common.preconditions)
+runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
+runner.Step("RAI", common.registerApp)
+runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
+runner.Step("Activate App", common.activateApp)
+runner.Step("Putfile Image", common.putFileInStorage, {1, putFileParams, result})
+runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
+
+runner.Title("Test")
+runner.Step("RPC " .. rpc.name .. "_resultCode_SUCCESS", processRPCSuccess)
+
+runner.Title("Postconditions")
+runner.Step("Stop SDL", common.postconditions)
diff --git a/test_sets/app_services.txt b/test_sets/app_services.txt
@@ -18,6 +18,7 @@
 ./test_scripts/AppServices/GetAppServiceData/014_M2M_Unknown_ServiceType.lua
 ./test_scripts/AppServices/GetAppServiceData/015_M2H_Unknown_ServiceType.lua
 ./test_scripts/AppServices/GetAppServiceData/016_H2M_Unknown_ServiceType.lua
+./test_scripts/AppServices/GetAppServiceData/017_H2M_MediaImage_success.lua
 ./test_scripts/AppServices/GetAppServiceRecords/001_GetAppServiceRecords_MOBILE.lua
 ./test_scripts/AppServices/GetAppServiceRecords/002_GetAppServiceRecords_HMI.lua
 ./test_scripts/AppServices/GetAppServiceRecords/003_GetAppServiceRecords_Multiple.lua
@@ -37,6 +38,7 @@
 ./test_scripts/AppServices/OnAppServiceData/009_M2M_service_not_published_flow.lua
 ./test_scripts/AppServices/OnAppServiceData/010_M2M_invalid_service_id_flow.lua
 ./test_scripts/AppServices/OnAppServiceData/011_M2M_service_type_mismatch_flow.lua
+./test_scripts/AppServices/OnAppServiceData/012_H2M_media_image_success.lua
 ./test_scripts/AppServices/PerformAppServiceInteraction/001_M2M_success_flow.lua
 ./test_scripts/AppServices/PerformAppServiceInteraction/002_M2H_success_flow.lua
 ./test_scripts/AppServices/PerformAppServiceInteraction/003_H2M_success_flow.lua