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

…ance_bodyInformation_vehicle_data
smartdevicelink · Dec 28, 2020 · 5f79f42 · 5f79f42
2 parents 3e2f589 + 4fc18f6
commit 5f79f42
Show file tree

Hide file tree

Showing 49 changed files with 1,980 additions and 65 deletions.
diff --git a/test_scripts/AppServices/AppServiceActivation/003_two_apps_activate_success.lua b/test_scripts/AppServices/AppServiceActivation/003_two_apps_activate_success.lua
@@ -60,7 +60,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCSuccess(self)
+local function processRPCSuccess()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local service_id = common.getAppServiceID(2)
@@ -89,6 +89,7 @@ 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 2", common.activateApp, { 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 })

diff --git a/test_scripts/AppServices/AppServiceActivation/004_two_apps_default_disconnect_reconnect.lua b/test_scripts/AppServices/AppServiceActivation/004_two_apps_default_disconnect_reconnect.lua
@@ -69,7 +69,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCSuccess(self)
+local function processRPCSuccess()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local service_id = common.getAppServiceID(2)
@@ -91,7 +91,7 @@ local function processRPCSuccess(self)
   mobileSession2:ExpectNotification("OnSystemCapabilityUpdated", combinedParams):Times(AtLeast(1))
 end
 
-local function disconnectDefaultService(self)
+local function disconnectDefaultService()
   local mobileSession = common.getMobileSession(2)
   local cid = mobileSession:SendRPC("UnregisterAppInterface", {})
   mobileSession:ExpectResponse(cid, { success = true, resultCode = "SUCCESS" })
@@ -107,7 +107,7 @@ local function disconnectDefaultService(self)
 
 end
 
-local function republishDefaultApp(self)
+local function republishDefaultApp()
   local mobileSession = common.getMobileSession(2)
   local cid = mobileSession:SendRPC("PublishAppService", {
     appServiceManifest = manifest2
@@ -145,6 +145,7 @@ 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 2", common.activateApp, { 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 })
@@ -158,8 +159,9 @@ runner.Step("Stop SDL", common.postconditions)
 runner.Step("Clean environment", commonFunctions.SDLForceStop)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
 runner.Step("RAI w/o PTU", common.registerAppWOPTU, { 1 })
+runner.Step("RAI w/o PTU App 2", common.registerAppWOPTU, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 runner.Step("Activate App", common.activateApp)
-runner.Step("RAI w/o PTU", common.registerAppWOPTU, { 2 })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
 runner.Step("Reconnect Default Service App", republishDefaultApp)
 

diff --git a/test_scripts/AppServices/GetFile/003_GetFile_Mobile_ASP.lua b/test_scripts/AppServices/GetFile/003_GetFile_Mobile_ASP.lua
@@ -53,10 +53,11 @@ runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
 runner.Step("RAI App 1", common.registerApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
-runner.Step("Putfile", common.putFileInStorage, {1, putFileParams, result})
+runner.Step("Activate App 1", common.activateApp)
+runner.Step("PutFile", common.putFileInStorage, {1, putFileParams, result})
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 
 runner.Title("Test")
 runner.Step("Getfile", common.getFileFromService, {2, 1, getFileParams, result})

diff --git a/test_scripts/AppServices/OnAppServiceData/008_M2M_service_not_active_flow.lua b/test_scripts/AppServices/OnAppServiceData/008_M2M_service_not_active_flow.lua
@@ -69,7 +69,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCFailure(self)
+local function processRPCFailure()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local service_id = common.getAppServiceID()
@@ -86,7 +86,9 @@ 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 1", common.activateApp)
 runner.Step("RAI w/o PTU", common.registerAppWOPTU, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 runner.Step("Publish Embedded Service", common.publishEmbeddedAppService, { hmiManifest })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
 runner.Step("Subscribe App Service Data", common.mobileSubscribeAppServiceData, { 0, manifest.serviceType, 2 })

diff --git a/test_scripts/AppServices/OnAppServiceData/010_M2M_invalid_service_id_flow.lua b/test_scripts/AppServices/OnAppServiceData/010_M2M_invalid_service_id_flow.lua
@@ -61,7 +61,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCFailure(self)
+local function processRPCFailure()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local notificationParams = expectedNotification
@@ -77,6 +77,7 @@ 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("RAI w/o PTU", common.registerAppWOPTU, { 2 })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
 runner.Step("Subscribe App Service Data", common.mobileSubscribeAppServiceData, { 1, manifest.serviceType, 2 })

diff --git a/test_scripts/AppServices/OnAppServiceData/011_M2M_service_type_mismatch_flow.lua b/test_scripts/AppServices/OnAppServiceData/011_M2M_service_type_mismatch_flow.lua
@@ -69,7 +69,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCFailure(self)
+local function processRPCFailure()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local notificationParams = expectedNotification
@@ -87,6 +87,7 @@ 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 Embedded Service", common.publishEmbeddedAppService, { hmiManifest })
 runner.Step("Subscribe App Service Data", common.mobileSubscribeAppServiceData, { 0, hmiManifest.serviceType, 2 })

diff --git a/.../PerformAppServiceInteraction/005_Mobile_requestServiceActive_background_success_flow.lua b/.../PerformAppServiceInteraction/005_Mobile_requestServiceActive_background_success_flow.lua
@@ -64,7 +64,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCSuccess(self)
+local function processRPCSuccess()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local service_id = common.getAppServiceID()
@@ -79,10 +79,10 @@ local function processRPCSuccess(self)
         })
     end)
   local serviceParams = common.appServiceCapability("ACTIVATED", manifest)
-  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.payload)
     end)
-  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.params)
     end)
 
@@ -101,6 +101,9 @@ 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 2", common.activateApp, { 2 })
+runner.Step("Activate App 1", common.activateApp)
+runner.Step("Dectivate App to Background", common.deactivateAppToBackground)
 runner.Step("Publish Embedded Service", common.publishEmbeddedAppService, { hmiManifest })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
 

diff --git a/.../PerformAppServiceInteraction/006_Mobile_requestServiceActive_foreground_success_flow.lua b/.../PerformAppServiceInteraction/006_Mobile_requestServiceActive_foreground_success_flow.lua
@@ -64,7 +64,7 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCSuccess(self)
+local function processRPCSuccess()
   local mobileSession = common.getMobileSession(1)
   local mobileSession2 = common.getMobileSession(2)
   local service_id = common.getAppServiceID()
@@ -75,10 +75,10 @@ local function processRPCSuccess(self)
   -- Should not prompt user if app is in foreground
   EXPECT_HMICALL("AppService.GetActiveServiceConsent", { serviceID = service_id }):Times(0)
   local serviceParams = common.appServiceCapability("ACTIVATED", manifest)
-  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.payload)
     end)
-  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.params)
     end)
 
@@ -96,8 +96,9 @@ 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 1", common.activateApp)
 runner.Step("RAI w/o PTU", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 runner.Step("Publish Embedded Service", common.publishEmbeddedAppService, { hmiManifest })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
 

diff --git a/...ts/AppServices/PerformAppServiceInteraction/007_HMI_requestServiceActive_success_flow.lua b/...ts/AppServices/PerformAppServiceInteraction/007_HMI_requestServiceActive_success_flow.lua
@@ -61,17 +61,17 @@ local function PTUfunc(tbl)
 end
 
 --[[ Local Functions ]]
-local function processRPCSuccess(self)
+local function processRPCSuccess()
   local mobileSession = common.getMobileSession()
   local service_id = common.getAppServiceID()
   local requestParams = rpc.params
   requestParams.serviceID = service_id
   local cid = common.getHMIConnection():SendRequest(rpc.hmiName, requestParams)
   local serviceParams = common.appServiceCapability("ACTIVATED", manifest)
-  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  mobileSession:ExpectNotification("OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.payload)
     end)
-  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(self, data)
+  EXPECT_HMINOTIFICATION("BasicCommunication.OnSystemCapabilityUpdated"):ValidIf(function(_, data)
       return common.findCapabilityUpdate(serviceParams, data.params)
     end)
   local passedRequestParams = requestParams
@@ -97,6 +97,8 @@ runner.Step("Clean environment", common.preconditions)
 runner.Step("Set HMI Origin ID", common.setSDLIniParameter, { "HMIOriginID", hmiOriginID })
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
 runner.Step("RAI", common.registerApp)
+runner.Step("Activate App", common.activateApp)
+runner.Step("Dectivate App to Background", common.deactivateAppToBackground)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("Publish Embedded Service", common.publishEmbeddedAppService, { hmiManifest })
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })

diff --git a/test_scripts/AppServices/PublishAppService/009_Mobile_duplicate_name_rejected.lua b/test_scripts/AppServices/PublishAppService/009_Mobile_duplicate_name_rejected.lua
@@ -63,7 +63,7 @@ end
 
 --[[ Local Functions ]]
 
-local function processRPCRejected(self)
+local function processRPCRejected()
   local mobileSession = common.getMobileSession(2)
   local cid = mobileSession:SendRPC(rpc.name, rpc.params)
 
@@ -79,9 +79,10 @@ 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("Activate App 1", common.activateApp)
 runner.Step("Publish App Service", common.publishMobileAppService, { manifest })
+runner.Step("RAI w/o PTU", common.registerAppWOPTU, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 
 runner.Title("Test")
 runner.Step("RPC " .. rpc.name .. "_resultCode_REJECTED", processRPCRejected)

diff --git a/test_scripts/AppServices/RPCPassThrough/001_SendLocation_Handled_Request.lua b/test_scripts/AppServices/RPCPassThrough/001_SendLocation_Handled_Request.lua
@@ -27,7 +27,7 @@ local manifest = {
   handledRPCs = {39},    
   allowAppConsumers = true,
   rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
-  navigationServiceManifest = {}
+  navigationServiceManifest = {acceptsWayPoints = true}
 }
 
 local successResponse = {
@@ -88,10 +88,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)    
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_SUCCESS", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/002_SendLocation_Unsupported_Request.lua b/test_scripts/AppServices/RPCPassThrough/002_SendLocation_Unsupported_Request.lua
@@ -27,7 +27,7 @@ local manifest = {
   handledRPCs = {39},    
   allowAppConsumers = true,
   rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
-  navigationServiceManifest = {}
+  navigationServiceManifest = {acceptsWayPoints = true}
 }
 
 local unsupportedResponse = {
@@ -96,10 +96,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_UNSUPPORTED", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/003_SendLocation_Request_Timeout.lua b/test_scripts/AppServices/RPCPassThrough/003_SendLocation_Request_Timeout.lua
@@ -27,7 +27,7 @@ local manifest = {
   handledRPCs = { 39 },    
   allowAppConsumers = true,
   rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
-  navigationServiceManifest = {}
+  navigationServiceManifest = {acceptsWayPoints = true}
 }
 
 local successResponse = {
@@ -97,10 +97,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) 
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_TIMEOUT", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/004_SendLocation_MultipleAS.lua b/test_scripts/AppServices/RPCPassThrough/004_SendLocation_MultipleAS.lua
@@ -31,7 +31,7 @@ local manifest = {
   handledRPCs = { 39 },    
   allowAppConsumers = true,
   rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
-  navigationServiceManifest = {}
+  navigationServiceManifest = {acceptsWayPoints = true}
 }
 
 local manifest2 = {
@@ -127,12 +127,14 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start) 
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("Publish NAVIGATION AppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
+runner.Step("Activate App 2", common.activateApp, { 2 })
 runner.Step("Publish MEDIA AppService", common.publishMobileAppService, { manifest2, 2 })
 runner.Step("RAI App 3", common.registerAppWOPTU, { 3 })
-runner.Step("Activate App", common.activateApp, { 3 })   
+runner.Step("Activate App 3", common.activateApp, { 3 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_MultipleAS", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/005_SendLocation_Invalid_Permissions.lua b/test_scripts/AppServices/RPCPassThrough/005_SendLocation_Invalid_Permissions.lua
@@ -25,7 +25,7 @@ local manifest = {
   handledRPCs = {39},    
   allowAppConsumers = true,
   rpcSpecVersion = config.application1.registerAppInterfaceParams.syncMsgVersion,
-  navigationServiceManifest = {}
+  navigationServiceManifest = {acceptsWayPoints = true}
 }
 
 local disallowedResponse = {
@@ -76,10 +76,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)    
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_DISALLOWED", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/006_ButtonPress_Handled_Request.lua b/test_scripts/AppServices/RPCPassThrough/006_ButtonPress_Handled_Request.lua
@@ -88,10 +88,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)    
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_SUCCESS", RPCPassThruTest)   

diff --git a/test_scripts/AppServices/RPCPassThrough/007_ButtonPress_Invalid_Permissions.lua b/test_scripts/AppServices/RPCPassThrough/007_ButtonPress_Invalid_Permissions.lua
@@ -81,10 +81,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)    
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_DISALLOWED", RPCPassThruTest)   

diff --git a/...es/RPCPassThrough/009_UnknownRPC_Consumer_UNSUPPORTED_REQUEST_policy_allow_flag_false.lua b/...es/RPCPassThrough/009_UnknownRPC_Consumer_UNSUPPORTED_REQUEST_policy_allow_flag_false.lua
@@ -88,10 +88,11 @@ runner.Title("Preconditions")
 runner.Step("Clean environment", common.preconditions)
 runner.Step("Start SDL, HMI, connect Mobile, start Session", common.start)    
 runner.Step("RAI App 1", common.registerApp)
+runner.Step("Activate App 1", common.activateApp)
 runner.Step("PTU", common.policyTableUpdate, { PTUfunc })
 runner.Step("PublishAppService", common.publishMobileAppService, { manifest, 1 })
 runner.Step("RAI App 2", common.registerAppWOPTU, { 2 })
-runner.Step("Activate App", common.activateApp, { 2 })   
+runner.Step("Activate App 2", common.activateApp, { 2 })   
 
 runner.Title("Test")    
 runner.Step("RPCPassThroughTest_UNSUPPORTED", RPCPassThruTest)