-
Notifications
You must be signed in to change notification settings - Fork 60
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #2184 from smartdevicelink/release/5.1.0
Release/5.1.0
- Loading branch information
Showing
108 changed files
with
9,032 additions
and
39 deletions.
There are no files selected for viewing
83 changes: 83 additions & 0 deletions
83
test_scripts/AppServices/AppServiceActivation/001_mobile_deactivate_success.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,83 @@ | ||
| --------------------------------------------------------------------------------------------------- | ||
| -- Precondition: | ||
| -- 1) Application 1 with <appID> is registered on SDL. | ||
| -- 2) AppServiceProvider permissions are assigned for <appID> with PublishAppService | ||
| -- 3) Application 1 sends a PublishAppService RPC request with serviceType MEDIA | ||
| -- | ||
| -- Steps: | ||
|
|
||
| -- 2) HMI sends AppService.AppServiceActivation activate = false | ||
| -- | ||
| -- Expected: | ||
| -- 1) HMI receives a successful response with activate = false | ||
| -- 2) Mobile app and HMI receive OnSystemCapabilityUpdated notification with updateReason = DEACTIVATED | ||
| --------------------------------------------------------------------------------------------------- | ||
|
|
||
| --[[ Required Shared libraries ]] | ||
| local runner = require('user_modules/script_runner') | ||
| local common = require('test_scripts/AppServices/commonAppServices') | ||
|
|
||
| --[[ Test Configuration ]] | ||
| runner.testSettings.isSelfIncluded = false | ||
|
|
||
| --[[ Local Variables ]] | ||
| local manifest = { | ||
| serviceName = config.application1.registerAppInterfaceParams.appName, | ||
| serviceType = "MEDIA", | ||
| allowAppConsumers = true, | ||
| rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion, | ||
| mediaServiceManifest = {} | ||
| } | ||
|
|
||
| local rpc = { | ||
| name = "AppService.AppServiceActivation", | ||
| params = { | ||
| activate = false | ||
| } | ||
| } | ||
|
|
||
| local expectedResponse = { | ||
| result = { | ||
| activate = false | ||
| }, | ||
| code = 0, | ||
| method = "AppService.AppServiceActivation" | ||
| } | ||
|
|
||
| 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(1) | ||
| local service_id = common.getAppServiceID() | ||
| local requestParams = rpc.params | ||
| requestParams.serviceID = service_id | ||
|
|
||
| local cid = common.getHMIConnection():SendRequest(rpc.name, requestParams) | ||
|
|
||
| EXPECT_HMIRESPONSE(cid, expectedResponse):Times(1) | ||
|
|
||
| EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated", | ||
| common.appServiceCapabilityUpdateParams("DEACTIVATED", manifest)):Times(AtLeast(1)) | ||
|
|
||
| mobileSession:ExpectNotification("OnSystemCapabilityUpdated", | ||
| common.appServiceCapabilityUpdateParams("DEACTIVATED", manifest)):Times(AtLeast(1)) | ||
| 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.Title("Test") | ||
| runner.Step("RPC " .. rpc.name .. "_resultCode_SUCCESS", processRPCSuccess) | ||
|
|
||
| runner.Title("Postconditions") | ||
| runner.Step("Stop SDL", common.postconditions) | ||
|
|
85 changes: 85 additions & 0 deletions
85
test_scripts/AppServices/AppServiceActivation/002_hmi_deactivate_success.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,85 @@ | ||
| --------------------------------------------------------------------------------------------------- | ||
| -- Precondition: | ||
| -- 1) Application 1 with <appID> is registered on SDL. | ||
| -- 2) AppServiceProvider permissions are assigned for <appID> with GetSystemCapability | ||
| -- 3) Application 1 sends a GetSystemCapability RPC request with subscribe = true | ||
| -- 4) HMI sends a PublishAppService RPC request with serviceType MEDIA | ||
| -- | ||
| -- Steps: | ||
|
|
||
| -- 1) HMI sends AppService.AppServiceActivation activate = false | ||
| -- | ||
| -- Expected: | ||
| -- 1) HMI receives a successful response with activate = false | ||
| -- 2) Mobile app and HMI receive OnSystemCapabilityUpdated notification with updateReason = DEACTIVATED | ||
| --------------------------------------------------------------------------------------------------- | ||
|
|
||
| --[[ Required Shared libraries ]] | ||
| local runner = require('user_modules/script_runner') | ||
| local common = require('test_scripts/AppServices/commonAppServices') | ||
|
|
||
| --[[ Test Configuration ]] | ||
| runner.testSettings.isSelfIncluded = false | ||
|
|
||
| --[[ Local Variables ]] | ||
| local manifest = { | ||
| serviceName = config.application1.registerAppInterfaceParams.appName, | ||
| serviceType = "MEDIA", | ||
| allowAppConsumers = true, | ||
| rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion, | ||
| mediaServiceManifest = {} | ||
| } | ||
|
|
||
| local rpc = { | ||
| name = "AppService.AppServiceActivation", | ||
| params = { | ||
| activate = false | ||
| } | ||
| } | ||
|
|
||
| local expectedResponse = { | ||
| result = { | ||
| activate = false | ||
| }, | ||
| code = 0, | ||
| method = "AppService.AppServiceActivation" | ||
| } | ||
|
|
||
| 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(1) | ||
| local service_id = common.getAppServiceID(0) | ||
| local requestParams = rpc.params | ||
| requestParams.serviceID = service_id | ||
|
|
||
| local cid = common.getHMIConnection():SendRequest(rpc.name, requestParams) | ||
|
|
||
| EXPECT_HMIRESPONSE(cid, expectedResponse):Times(1) | ||
|
|
||
| EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated", | ||
| common.appServiceCapabilityUpdateParams("DEACTIVATED", manifest)):Times(AtLeast(1)) | ||
|
|
||
| mobileSession:ExpectNotification("OnSystemCapabilityUpdated", | ||
| common.appServiceCapabilityUpdateParams("DEACTIVATED", manifest)):Times(AtLeast(1)) | ||
| 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.publishEmbeddedAppService, { manifest }) | ||
| runner.Step("GetSystemCapability and subscribe", common.GetAppServiceSystemCapability, { manifest, true, 1}) | ||
|
|
||
| runner.Title("Test") | ||
| runner.Step("RPC " .. rpc.name .. "_resultCode_SUCCESS", processRPCSuccess) | ||
|
|
||
| runner.Title("Postconditions") | ||
| runner.Step("Stop SDL", common.postconditions) | ||
|
|
101 changes: 101 additions & 0 deletions
101
test_scripts/AppServices/AppServiceActivation/003_two_apps_activate_success.lua
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,101 @@ | ||
| --------------------------------------------------------------------------------------------------- | ||
| -- Precondition: | ||
| -- 1) Application 1 with <appID> is registered on SDL. | ||
| -- 2) Application 2 with <appID> is registered on SDL. | ||
| -- 3) AppServiceProvider permissions for App 1 are assigned for <appID> with PublishAppService | ||
| -- 4) AppServiceProvider permissions for App 2 are assigned for <appID> with PublishAppService | ||
| -- 5) Application 1 sends a PublishAppService RPC request with serviceType MEDIA | ||
| -- 6) Application 2 sends a PublishAppService RPC request with serviceType MEDIA | ||
| -- | ||
| -- Steps: | ||
| -- 1) HMI sends AppService.AppServiceActivation activate = true and App 2's serviceID | ||
| -- | ||
| -- Expected: | ||
| -- 1) HMI receives a successful response with activate = true | ||
| -- 2) Both mobile apps and the HMI receieve an OnSystemCapabilityUpdated notification. App 1 is DEACTIVATED. App 2 is ACTIVATED. | ||
| --------------------------------------------------------------------------------------------------- | ||
|
|
||
| --[[ Required Shared libraries ]] | ||
| local runner = require('user_modules/script_runner') | ||
| local common = require('test_scripts/AppServices/commonAppServices') | ||
|
|
||
| --[[ Test Configuration ]] | ||
| runner.testSettings.isSelfIncluded = false | ||
|
|
||
| --[[ Local Variables ]] | ||
| local manifest = { | ||
| serviceName = config.application1.registerAppInterfaceParams.appName, | ||
| serviceType = "MEDIA", | ||
| allowAppConsumers = true, | ||
| rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion, | ||
| mediaServiceManifest = {} | ||
| } | ||
|
|
||
| local manifest2 = { | ||
| serviceName = config.application2.registerAppInterfaceParams.appName, | ||
| serviceType = "MEDIA", | ||
| allowAppConsumers = true, | ||
| rpcSpecVersion = config.application2.registerAppInterfaceParams.syncMsgVersion, | ||
| mediaServiceManifest = {} | ||
| } | ||
|
|
||
| local rpc = { | ||
| name = "AppService.AppServiceActivation", | ||
| params = { | ||
| activate = true | ||
| } | ||
| } | ||
|
|
||
| local expectedResponse = { | ||
| result = { | ||
| activate = true | ||
| }, | ||
| code = 0, | ||
| method = "AppService.AppServiceActivation" | ||
| } | ||
|
|
||
| local function PTUfunc(tbl) | ||
| tbl.policy_table.app_policies[common.getConfigAppParams(1).fullAppID] = common.getAppServiceProducerConfig(1); | ||
| tbl.policy_table.app_policies[common.getConfigAppParams(2).fullAppID] = common.getAppServiceProducerConfig(2); | ||
| end | ||
|
|
||
| --[[ Local Functions ]] | ||
| local function processRPCSuccess(self) | ||
| local mobileSession = common.getMobileSession(1) | ||
| local mobileSession2 = common.getMobileSession(2) | ||
| local service_id = common.getAppServiceID(2) | ||
| local requestParams = rpc.params | ||
| requestParams.serviceID = service_id | ||
|
|
||
| local cid = common.getHMIConnection():SendRequest(rpc.name, requestParams) | ||
|
|
||
| EXPECT_HMIRESPONSE(cid, expectedResponse):Times(1) | ||
|
|
||
| local onSystemCapabilityParams1 = common.appServiceCapabilityUpdateParams("DEACTIVATED", manifest) | ||
| local onSystemCapabilityParams2 = common.appServiceCapabilityUpdateParams("ACTIVATED", manifest2) | ||
|
|
||
| local combinedParams = onSystemCapabilityParams1 | ||
| combinedParams.systemCapability.appServicesCapabilities.appServices[2] = onSystemCapabilityParams2.systemCapability.appServicesCapabilities.appServices[1] | ||
|
|
||
| EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated", combinedParams):Times(AtLeast(1)) | ||
| mobileSession:ExpectNotification("OnSystemCapabilityUpdated", combinedParams):Times(AtLeast(1)) | ||
| mobileSession2:ExpectNotification("OnSystemCapabilityUpdated", combinedParams):Times(AtLeast(1)) | ||
| 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("RAI w/o PTU", common.registerAppWOPTU, { 2 }) | ||
| runner.Step("Activate App", common.activateApp) | ||
| runner.Step("Publish App Service", common.publishMobileAppService, { manifest }) | ||
| runner.Step("Publish App Service 2", common.publishSecondMobileAppService, { manifest, manifest2, 2 }) | ||
|
|
||
| runner.Title("Test") | ||
| runner.Step("RPC " .. rpc.name .. "_resultCode_SUCCESS", processRPCSuccess) | ||
|
|
||
| runner.Title("Postconditions") | ||
| runner.Step("Stop SDL", common.postconditions) | ||
|
|
Oops, something went wrong.