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.

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

Script update for 2479 issue #2423

Merged
merged 3 commits into from
Nov 5, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- SDL does not respond NACK to second request
-- SDL does respond NACK to second start service request
--
-- Steps to reproduce:
-- 1) In case mobile side send two start VIDEO secure service requests
-- 1. In case mobile side send two start VIDEO secure service requests
-- Expected:
-- 1) Respond NACK to second request keep active VIDEO service that was already started
-- 1. Respond NACK to second request keep active VIDEO service that was already started
---------------------------------------------------------------------------------------------------
--[[ Required Shared libraries ]]
local common = require('test_scripts/Security/DTLS/common')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- SDL does not respond NACK to second request
-- SDL does respond NACK to second start service request
--
-- Steps to reproduce:
-- 1) In case mobile side send two start AUDIO secure service requests
-- 1. In case mobile side send two start AUDIO secure service requests
-- Expected:
-- 1) Respond NACK to second request keep active AUDIO service that was already started
-- 1. Respond NACK to second request keep active AUDIO service that was already started
---------------------------------------------------------------------------------------------------
--[[ Required Shared libraries ]]
local common = require('test_scripts/Security/DTLS/common')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- 1. SDL does not respond NACK on second service.
-- SDL does respond NACK on second start service request (Protected => Unprotected)
--
-- Steps to reproduce:
-- 1 First service started as Protected.
-- 1 Start video sreaming.
-- 1 Second service starting as NOT Protected.
-- 1. First service started as Protected.
-- 2. Start video sreaming.
-- 3. Second service starting as NOT Protected.
-- Expected:
-- 1. SDL respond NACK on second service.
---------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- 1. SDL does not respond NACK on second service.
-- SDL does respond NACK on second start service request (Protected => Unprotected)
--
-- Steps to reproduce:
-- 1 First service started as Protected.
-- 1 Start video sreaming.
-- 1 Second service starting as Protected.
-- 1. First service started as Protected.
-- 2. Start video sreaming.
-- 3. Second service starting as Protected.
-- Expected:
-- 1. SDL respond NACK on second service.
---------------------------------------------------------------------------------------------------
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- 1) SDL does not respond NACK on second service: if first service NOT Protected started, second service NOT Protected too.
-- SDL does respond NACK on second start service request (Unprotected => Unprotected)
--
-- Steps to reproduce:
-- 1. First service started as NOT Protected.
-- 2. Start video sreaming.
-- 3. Second service starting as NOT Protected.
-- Expected:
-- 1. SDL respond NACK on second service.
---------------------------------------------------------------------------------------------------
--[[ Required Shared libraries ]]
local common = require('test_scripts/Security/DTLS/common')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,15 @@
---------------------------------------------------------------------------------------------------
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2379
-- User story: https://github.com/smartdevicelink/sdl_core/issues/2479
--
-- Description:
-- 1) SDL does not respond ACK on second service.
-- SDL does respond ACK on second start service request (Unprotected => Protected)
--
-- Steps to reproduce:
-- 1) First service started as NOT Protected.
-- 2) Start video sreaming.
-- 3) Second service starting as Protected.
-- 1. First service started as NOT Protected.
-- 2. Start video sreaming.
-- 3. Second service starting as Protected.
-- Expected:
-- 1) SDL respond ACK on second service and will continuous stream through the encrypted channel.
-- 1. SDL respond ACK on second service and will continuous stream through the encrypted channel.
---------------------------------------------------------------------------------------------------
--[[ Required Shared libraries ]]
local common = require('test_scripts/Security/DTLS/common')
Expand Down Expand Up @@ -39,8 +40,31 @@ local function startServiceProtectedSecond(pServiceId)
frameInfo = common.frameInfo.START_SERVICE_ACK,
encryption = true
})

common.getHMIConnection():ExpectNotification("Navigation.OnVideoDataStreaming",
{ available = false }, { available = true })
:Times(2)

common.getHMIConnection():ExpectRequest("Navigation.StopStream", { appID = common.getHMIAppId() })
:Do(function(_, data)
common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {})
end)
common.getHMIConnection():ExpectRequest("Navigation.StartStream", { appID = common.getHMIAppId() })
:Do(function(_, data)
common.getHMIConnection():SendResponse(data.id, data.method, "SUCCESS", {})
end)

common.getHMIConnection():ExpectNotification("BasicCommunication.OnServiceUpdate",
{ appID = common.getHMIAppId(), serviceEvent = "REQUEST_RECEIVED", serviceType = "VIDEO" },
{ appID = common.getHMIAppId(), serviceEvent = "REQUEST_ACCEPTED", serviceType = "VIDEO" })
:Times(2)

common.getMobileSession():ExpectNotification("OnAppInterfaceUnregistered")
:Times(0)

common.getMobileSession():ExpectNotification("OnHMIStatus")
:Times(0)

utils.wait(10000)
end

Expand Down
2 changes: 1 addition & 1 deletion test_sets/Defects/Defects_releases_4_x_and_5_x.txt
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@
./test_scripts/Defects/5_0/2479_SDL_does_not_respond_NACK_to_second_request/2479_3_SDL_respond_NACK_from_protected_to_not_protected.lua
./test_scripts/Defects/5_0/2479_SDL_does_not_respond_NACK_to_second_request/2479_4_SDL_respond_NACK_from_protected_to_protected.lua
./test_scripts/Defects/5_0/2479_SDL_does_not_respond_NACK_to_second_request/2479_5_SDL_respond_NACK_from_not_protected_to_not_protected.lua
;./test_scripts/Defects/5_0/2479_SDL_does_not_respond_NACK_to_second_request/2479_6_SDL_respond_ACK_from_not_protected_to_protected.lua https://github.com/smartdevicelink/sdl_atf_test_scripts/issues/2366
./test_scripts/Defects/5_0/2479_SDL_does_not_respond_NACK_to_second_request/2479_6_SDL_respond_ACK_from_not_protected_to_protected.lua
;HeartBeat
;./test_scripts/Defects/4_5/1893_ATF_HeartBeat_App_does_not_send_HB_and_does_not_respond.lua https://github.com/smartdevicelink/sdl_atf_test_scripts/issues/2374
;./test_scripts/Defects/4_5/1892_HB_from_SDL_after_receiving_HB_from_mobile.lua https://github.com/smartdevicelink/sdl_core/issues/1892
Expand Down