diff --git a/tests/scripts/scripts/00-test-linking-non-default-device-node.lua b/tests/scripts/scripts/00-test-linking-non-default-device-node.lua index a14927b3..9a124165 100644 --- a/tests/scripts/scripts/00-test-linking-non-default-device-node.lua +++ b/tests/scripts/scripts/00-test-linking-non-default-device-node.lua @@ -25,7 +25,7 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then tu.createStreamNode ("playback") end end diff --git a/tests/scripts/scripts/01-test-linking-non-default-device-node-capture.lua b/tests/scripts/scripts/01-test-linking-non-default-device-node-capture.lua index 75bf9614..69926e1c 100644 --- a/tests/scripts/scripts/01-test-linking-non-default-device-node-capture.lua +++ b/tests/scripts/scripts/01-test-linking-non-default-device-node-capture.lua @@ -24,7 +24,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then tu.createStreamNode ("capture") end end diff --git a/tests/scripts/scripts/02-test-linking-default-device-node.lua b/tests/scripts/scripts/02-test-linking-default-device-node.lua index dc6a65a6..e657f089 100644 --- a/tests/scripts/scripts/02-test-linking-default-device-node.lua +++ b/tests/scripts/scripts/02-test-linking-default-device-node.lua @@ -26,7 +26,7 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then tu.createStreamNode ("playback") end end diff --git a/tests/scripts/scripts/03-test-linking-default-device-node-capture.lua b/tests/scripts/scripts/03-test-linking-default-device-node-capture.lua index 50ae7109..b334897a 100644 --- a/tests/scripts/scripts/03-test-linking-default-device-node-capture.lua +++ b/tests/scripts/scripts/03-test-linking-default-device-node-capture.lua @@ -26,7 +26,7 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then tu.createStreamNode ("capture") end end diff --git a/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua b/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua index 6d4c73b3..52b19fda 100644 --- a/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua +++ b/tests/scripts/scripts/04-test-linking-defined-device-node-target-object-string.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"] } diff --git a/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua b/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua index 6f3252ef..7d7a0042 100644 --- a/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua +++ b/tests/scripts/scripts/05-test-linking-defined-device-node-target-object-int.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]), } diff --git a/tests/scripts/scripts/06-test-linking-defined-device-node-target-object-name.lua b/tests/scripts/scripts/06-test-linking-defined-device-node-target-object-name.lua index f1446158..12d8aacf 100644 --- a/tests/scripts/scripts/06-test-linking-defined-device-node-target-object-name.lua +++ b/tests/scripts/scripts/06-test-linking-defined-device-node-target-object-name.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.name"] } diff --git a/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua b/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua index 88b132d9..c8ff812e 100644 --- a/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua +++ b/tests/scripts/scripts/07-test-linking-defined-device-node-target-object-string-capture.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.id"] } diff --git a/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua b/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua index fb766f77..8eaa7c1e 100644 --- a/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua +++ b/tests/scripts/scripts/08-test-linking-defined-device-node-target-object-int-capture.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tonumber (tu.lnkbls ["defined-device-node"].properties ["node.id"]), } diff --git a/tests/scripts/scripts/09-test-linking-defined-device-node-target-object-name-capture.lua b/tests/scripts/scripts/09-test-linking-defined-device-node-target-object-name-capture.lua index 749ccbbf..e2627420 100644 --- a/tests/scripts/scripts/09-test-linking-defined-device-node-target-object-name-capture.lua +++ b/tests/scripts/scripts/09-test-linking-defined-device-node-target-object-name-capture.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["target.object"] = tu.lnkbls ["defined-device-node"].properties ["node.name"] } diff --git a/tests/scripts/scripts/10-test-linking-defined-device-node-node-target.lua b/tests/scripts/scripts/10-test-linking-defined-device-node-node-target.lua index d146b10f..3ace38d2 100644 --- a/tests/scripts/scripts/10-test-linking-defined-device-node-node-target.lua +++ b/tests/scripts/scripts/10-test-linking-defined-device-node-node-target.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["node.target"] = tu.lnkbls ["defined-device-node"].properties ["node.id"] } diff --git a/tests/scripts/scripts/11-test-linking-defined-device-node-node-target-capture.lua b/tests/scripts/scripts/11-test-linking-defined-device-node-node-target-capture.lua index 7b0dc283..91037d4d 100644 --- a/tests/scripts/scripts/11-test-linking-defined-device-node-node-target-capture.lua +++ b/tests/scripts/scripts/11-test-linking-defined-device-node-node-target-capture.lua @@ -27,7 +27,7 @@ SimpleEventHook { execute = function (event) local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then local props = { ["node.target"] = tu.lnkbls ["defined-device-node"].properties ["node.id"] } diff --git a/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua b/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua index 8300f0d8..0249ad80 100644 --- a/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua +++ b/tests/scripts/scripts/12-test-linking-defined-device-node-target-node-metadata.lua @@ -28,12 +28,12 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node tu.createStreamNode ("playback") - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.node", "defined-device-node") + tu.setTargetInMetadata ("target.node", "defined-device-node") end end }:register () @@ -51,8 +51,8 @@ SimpleEventHook { }, }, execute = function (event) - if tu.linkables_ready () then - tu.set_target_in_metadata ("target.node", "defined-device-node") + if tu.linkablesReady () then + tu.setTargetInMetadata ("target.node", "defined-device-node") end end }:register () diff --git a/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua b/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua index d70bca19..5b7ce8a9 100644 --- a/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua +++ b/tests/scripts/scripts/13-test-linking-defined-device-node-target-node-metadata-capture.lua @@ -28,12 +28,12 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node tu.createStreamNode ("capture") - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.node", "defined-device-node") + tu.setTargetInMetadata ("target.node", "defined-device-node") end end }:register () diff --git a/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua b/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua index 4f03b3ff..7eb7b471 100644 --- a/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua +++ b/tests/scripts/scripts/14-test-linking-defined-device-node-target-object-metadata.lua @@ -28,12 +28,12 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node tu.createStreamNode ("playback") - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.object", "defined-device-node") + tu.setTargetInMetadata ("target.object", "defined-device-node") end end }:register () diff --git a/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua b/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua index e1ea9dee..ef445094 100644 --- a/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua +++ b/tests/scripts/scripts/15-test-linking-defined-device-node-target-object-metadata-capture.lua @@ -28,12 +28,12 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node tu.createStreamNode ("capture") - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.object", "defined-device-node") + tu.setTargetInMetadata ("target.object", "defined-device-node") end end }:register () diff --git a/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua b/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua index 73243023..61c4c950 100644 --- a/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua +++ b/tests/scripts/scripts/16-test-linking-defined-device-node-target-object-int-metadata.lua @@ -29,15 +29,15 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node local props = { ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"] } tu.createStreamNode ("playback", props) - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.object", "defined-device-node-in-metadata") + tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata") end end }:register () diff --git a/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua b/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua index 699fe01d..af34a642 100644 --- a/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua +++ b/tests/scripts/scripts/17-test-linking-defined-device-node-target-object-int-metadata-capture.lua @@ -29,15 +29,15 @@ SimpleEventHook { local lnkbl = event:get_subject () local name = lnkbl.properties ["node.name"] - if tu.linkables_ready () and name ~= "stream-node" then + if tu.linkablesReady () and name ~= "stream-node" then -- all linkables created execept stream-node local props = { ["target.object"] = tu.lnkbls ["defined-device-node-in-props"].properties ["node.id"] } tu.createStreamNode ("capture", props) - elseif tu.linkables_ready () and tu.lnkbls ["stream-node"] then + elseif tu.linkablesReady () and tu.lnkbls ["stream-node"] then -- when "stream-node" linkable is ready - tu.set_target_in_metadata ("target.object", "defined-device-node-in-metadata") + tu.setTargetInMetadata ("target.object", "defined-device-node-in-metadata") end end }:register () diff --git a/tests/scripts/scripts/lib/test-utils.lua b/tests/scripts/scripts/lib/test-utils.lua index cb9b4ec5..e89a3056 100644 --- a/tests/scripts/scripts/lib/test-utils.lua +++ b/tests/scripts/scripts/lib/test-utils.lua @@ -90,12 +90,12 @@ u.metadata = cu.default_metadata_om:lookup () assert (u.metadata ~= nil) -- update the defined target for stream session item in metadata. -function u.set_target_in_metadata (prop, target_node_name) +function u.setTargetInMetadata (prop, target_node_name) u.metadata:set (u.lnkbls ["stream-node"].properties ["node.id"], prop, "Spa:Id", u.lnkbls [target_node_name].properties ["node.id"]) end -function u.linkables_ready () +function u.linkablesReady () local count = 0 for k, v in pairs (u.lnkbls) do if v then