From 56fdca4b8a2b24bd23ae4438bb97942b264a1fc2 Mon Sep 17 00:00:00 2001 From: Steven Green Date: Tue, 7 Oct 2025 10:40:59 -0700 Subject: [PATCH] Remove dkjson usages --- .../src/test/test_matter_multi_button.lua | 4 +-- ...test_matter_air_quality_sensor_modular.lua | 4 +-- .../test/test_aqara_climate_sensor_w100.lua | 4 +-- .../src/test/test_aqara_light_switch_h2.lua | 4 +-- .../src/test/test_matter_button.lua | 4 +-- .../src/test/test_matter_multi_button.lua | 4 +-- .../test_matter_multi_button_switch_mcd.lua | 6 ++-- .../src/test/test_third_reality_mk1.lua | 4 +-- .../zigbee-lock/src/test/test_zigbee_lock.lua | 2 +- .../zigbee-lock/src/test/test_zigbee_yale.lua | 2 +- .../src/test/test_zigbee_sensor.lua | 4 +-- .../src/test/test_bad_device_kind.lua | 4 +-- .../src/test/test_sinope_switch.lua | 8 ++--- .../zwave-lock/src/samsung-lock/init.lua | 2 +- .../zwave-lock/src/schlage-lock/init.lua | 2 +- .../zwave-lock/src/test/test_samsung_lock.lua | 2 +- .../zwave-lock/src/test/test_schlage_lock.lua | 2 +- .../zwave-lock/src/test/test_zwave_lock.lua | 2 +- .../test/test_zwave_lock_code_migration.lua | 2 +- .../src/zwave-alarm-v1-lock/init.lua | 2 +- .../test/test_inovelli_dimmer_preferences.lua | 12 +++---- .../test_qubino_din_dimmer_preferences.lua | 4 +-- ..._qubino_flush_dimmer_0_10V_preferences.lua | 6 ++-- .../src/test/test_fibaro_roller_shutter.lua | 32 +++++++++---------- .../src/test/test_qubino_flush_shutter.lua | 14 ++++---- 25 files changed, 68 insertions(+), 68 deletions(-) diff --git a/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua b/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua index 2ecf083ba7..513c957afe 100644 --- a/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua +++ b/drivers/SmartThings/matter-button/src/test/test_matter_multi_button.lua @@ -2,7 +2,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local clusters = require "st.matter.generated.zap_clusters" local button_attr = capabilities.button.button @@ -99,7 +99,7 @@ local function test_init() -- simulate the profile change update taking affect and the device info changing local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.profile.id = "4-buttons-battery" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.capability:__expect_send(mock_device:generate_test_message("main", capabilities.button.supportedButtonValues({"pushed"}, {visibility = {displayed = false}}))) test.socket.capability:__expect_send(mock_device:generate_test_message("main", button_attr.pushed({state_change = false}))) diff --git a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua index d799c31b64..50d97eedec 100644 --- a/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua +++ b/drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua @@ -16,7 +16,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local clusters = require "st.matter.clusters" @@ -246,7 +246,7 @@ local function test_aqs_device_type_update_modular_profile(generic_mock_device, generic_mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" }) local device_info_copy = utils.deep_copy(generic_mock_device.raw_st_data) device_info_copy.profile.id = "aqs-modular" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ generic_mock_device.id, "infoChanged", device_info_json }) test.socket.matter:__expect_send({generic_mock_device.id, subscribe_request}) end diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua index d2e99b2331..e8e49b810b 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_climate_sensor_w100.lua @@ -16,7 +16,7 @@ local test = require "integration_test" local t_utils = require "integration_test.utils" local capabilities = require "st.capabilities" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local uint32 = require "st.matter.data_types.Uint32" local clusters = require "st.matter.generated.zap_clusters" local button_attr = capabilities.button.button @@ -155,7 +155,7 @@ local function test_init() local device_info_copy = utils.deep_copy(aqara_mock_device.raw_st_data) device_info_copy.profile.id = "3-button-battery-temperature-humidity" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ aqara_mock_device.id, "infoChanged", device_info_json }) test.socket.matter:__expect_send({aqara_mock_device.id, subscribe_request}) configure_buttons() diff --git a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua index 27fe47f11a..e25c40a155 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_aqara_light_switch_h2.lua @@ -16,7 +16,7 @@ local test = require "integration_test" local t_utils = require "integration_test.utils" local capabilities = require "st.capabilities" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local clusters = require "st.matter.clusters" local button_attr = capabilities.button.button @@ -209,7 +209,7 @@ local function test_init() local device_info_copy = utils.deep_copy(aqara_mock_device.raw_st_data) device_info_copy.profile.id = "4-button" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ aqara_mock_device.id, "infoChanged", device_info_json }) configure_buttons() test.socket.matter:__expect_send({aqara_mock_device.id, subscribe_request}) diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua index 23023b3d02..4202da8d4e 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_matter_button.lua @@ -5,7 +5,7 @@ local t_utils = require "integration_test.utils" local clusters = require "st.matter.clusters" local button_attr = capabilities.button.button local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local uint32 = require "st.matter.data_types.Uint32" --mock the actual device @@ -78,7 +78,7 @@ local function test_init() local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.profile.id = "buttons-battery" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) configure_buttons() test.socket.matter:__expect_send({mock_device.id, subscribe_request}) diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua index d8b0116101..5892c9d046 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button.lua @@ -2,7 +2,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local clusters = require "st.matter.generated.zap_clusters" local button_attr = capabilities.button.button @@ -144,7 +144,7 @@ local function test_init() -- simulate the profile change update taking affect and the device info changing local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.profile.id = "5-buttons-battery" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.matter:__expect_send({mock_device.id, subscribe_request}) expect_configure_buttons() diff --git a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua index af7511100e..820b127c11 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_matter_multi_button_switch_mcd.lua @@ -2,7 +2,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require "dkjson" +local json = require "st.json" local clusters = require "st.matter.generated.zap_clusters" @@ -228,7 +228,7 @@ local function test_init() -- simulate the profile change update taking affect and the device info changing local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.profile.id = "5-buttons-battery" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.matter:__expect_send({mock_device.id, subscribe_request}) expect_configure_buttons() @@ -442,7 +442,7 @@ test.register_coroutine_test( -- simulate the profile change update taking affect and the device info changing local device_info_copy = utils.deep_copy(mock_device_mcd_unsupported_switch_device_type.raw_st_data) device_info_copy.profile.id = "5-buttons-battery" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device_mcd_unsupported_switch_device_type.id, "infoChanged", device_info_json }) test.socket.matter:__expect_send({mock_device_mcd_unsupported_switch_device_type.id, subscribe_request}) end, diff --git a/drivers/SmartThings/matter-switch/src/test/test_third_reality_mk1.lua b/drivers/SmartThings/matter-switch/src/test/test_third_reality_mk1.lua index 31f99f537d..edc43dddbd 100644 --- a/drivers/SmartThings/matter-switch/src/test/test_third_reality_mk1.lua +++ b/drivers/SmartThings/matter-switch/src/test/test_third_reality_mk1.lua @@ -14,7 +14,7 @@ local capabilities = require "st.capabilities" local clusters = require "st.matter.clusters" -local dkjson = require "dkjson" +local json = require "st.json" local t_utils = require "integration_test.utils" local test = require "integration_test" local utils = require "st.utils" @@ -223,7 +223,7 @@ local function test_init() local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.profile.id = "12-buttons-keyboard" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) configure_buttons() test.socket.matter:__expect_send({mock_device.id, subscribe_request}) diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock.lua index 80d10d092e..fc10eebb6d 100644 --- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock.lua +++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_lock.lua @@ -29,7 +29,7 @@ local DoorLockUserStatus = DoorLock.types.DrlkUserStatus local DoorLockUserType = DoorLock.types.DrlkUserType local ProgrammingEventCode = DoorLock.types.ProgramEventCode -local json = require "dkjson" +local json = require "st.json" local mock_device = test.mock_device.build_test_zigbee_device( { profile = t_utils.get_profile_definition("base-lock.yml") } diff --git a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale.lua b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale.lua index 34b6881028..fe950c86c1 100644 --- a/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale.lua +++ b/drivers/SmartThings/zigbee-lock/src/test/test_zigbee_yale.lua @@ -19,7 +19,7 @@ local zigbee_test_utils = require "integration_test.zigbee_test_utils" local clusters = require "st.zigbee.zcl.clusters" local capabilities = require "st.capabilities" -local json = require "dkjson" +local json = require "st.json" local PowerConfiguration = clusters.PowerConfiguration local Alarm = clusters.Alarms diff --git a/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua b/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua index a87f7a0550..b3c26ced1f 100644 --- a/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua +++ b/drivers/SmartThings/zigbee-sensor/src/test/test_zigbee_sensor.lua @@ -17,7 +17,7 @@ local zigbee_test_utils = require "integration_test.zigbee_test_utils" local clusters = require "st.zigbee.zcl.clusters" local capabilities = require "st.capabilities" local t_utils = require "integration_test.utils" -local dkjson = require 'dkjson' +local json = require "st.json" local utils = require "st.utils" local IasEnrollResponseCode = require "st.zigbee.generated.zcl_clusters.IASZone.types.EnrollResponseCode" @@ -661,7 +661,7 @@ test.register_coroutine_test( }) local device_info_copy = utils.deep_copy(mock_device_contact_sensor.raw_st_data) device_info_copy.profile.id = "generic-contact-sensor" - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.wait_for_events() test.socket.zigbee:__set_channel_ordering("relaxed") diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua b/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua index 3f66d675c9..fa4837ad90 100644 --- a/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua +++ b/drivers/SmartThings/zigbee-switch/src/test/test_bad_device_kind.lua @@ -14,7 +14,7 @@ local test = require "integration_test" local t_utils = require "integration_test.utils" -local dkjson = require 'dkjson' +local json = require "st.json" -- This test attempts to add a zwave device to this zigbee switch driver -- Once the monkey-patch is removed with hubcore 59 is released with: @@ -40,7 +40,7 @@ test.register_coroutine_test("zwave_device_handled", function() test.socket.device_lifecycle:__queue_receive({ mock_device.id, "doConfigure" }) mock_device:expect_metadata_update({provisioning_state = "PROVISIONED"}) test.wait_for_events() - test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", dkjson.encode(mock_device.raw_st_data) }) + test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", json.encode(mock_device.raw_st_data) }) test.wait_for_events() end, nil diff --git a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua index 35242deb6c..d8f1b1f753 100755 --- a/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua +++ b/drivers/SmartThings/zigbee-switch/src/test/test_sinope_switch.lua @@ -16,7 +16,7 @@ local base64 = require "st.base64" local cluster_base = require "st.zigbee.cluster_base" local data_types = require "st.zigbee.data_types" -local dkjson = require 'dkjson' +local json = require "st.json" local test = require "integration_test" local t_utils = require "integration_test.utils" local utils = require "st.utils" @@ -53,7 +53,7 @@ test.register_coroutine_test( local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.preferences.ledIntensity = 10 - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.wait_for_events() test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.zigbee:__expect_send({mock_device.id, cluster_base.write_attribute(mock_device, @@ -76,7 +76,7 @@ test.register_coroutine_test( local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.preferences.ledIntensity = 0 - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.wait_for_events() test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.zigbee:__expect_send({mock_device.id, cluster_base.write_attribute(mock_device, @@ -99,7 +99,7 @@ test.register_coroutine_test( local device_info_copy = utils.deep_copy(mock_device.raw_st_data) device_info_copy.preferences.ledIntensity = 70 - local device_info_json = dkjson.encode(device_info_copy) + local device_info_json = json.encode(device_info_copy) test.wait_for_events() test.socket.device_lifecycle:__queue_receive({ mock_device.id, "infoChanged", device_info_json }) test.socket.zigbee:__expect_send({mock_device.id, cluster_base.write_attribute(mock_device, diff --git a/drivers/SmartThings/zwave-lock/src/samsung-lock/init.lua b/drivers/SmartThings/zwave-lock/src/samsung-lock/init.lua index 813c6217b4..00d8cd3e2d 100644 --- a/drivers/SmartThings/zwave-lock/src/samsung-lock/init.lua +++ b/drivers/SmartThings/zwave-lock/src/samsung-lock/init.lua @@ -19,7 +19,7 @@ local Notification = (require "st.zwave.CommandClass.Notification")({version=3}) local UserCode = (require "st.zwave.CommandClass.UserCode")({version=1}) local access_control_event = Notification.event.access_control -local json = require "dkjson" +local json = require "st.json" local constants = require "st.zwave.constants" local LockDefaults = require "st.zwave.defaults.lock" diff --git a/drivers/SmartThings/zwave-lock/src/schlage-lock/init.lua b/drivers/SmartThings/zwave-lock/src/schlage-lock/init.lua index 67e649d869..9d9f05cb05 100644 --- a/drivers/SmartThings/zwave-lock/src/schlage-lock/init.lua +++ b/drivers/SmartThings/zwave-lock/src/schlage-lock/init.lua @@ -15,7 +15,7 @@ local capabilities = require "st.capabilities" local cc = require "st.zwave.CommandClass" local constants = require "st.zwave.constants" -local json = require "dkjson" +local json = require "st.json" local UserCode = (require "st.zwave.CommandClass.UserCode")({version=1}) local user_id_status = UserCode.user_id_status diff --git a/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock.lua b/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock.lua index 7707b8a850..52835f7a71 100644 --- a/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock.lua +++ b/drivers/SmartThings/zwave-lock/src/test/test_samsung_lock.lua @@ -14,7 +14,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" -local json = require "dkjson" +local json = require "st.json" local zw_test_utils = require "integration_test.zwave_test_utils" local t_utils = require "integration_test.utils" local UserCode = (require "st.zwave.CommandClass.UserCode")({version=1}) diff --git a/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock.lua b/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock.lua index b1a5964502..079383bbd0 100644 --- a/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock.lua +++ b/drivers/SmartThings/zwave-lock/src/test/test_schlage_lock.lua @@ -15,7 +15,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local zw = require "st.zwave" -local json = require "dkjson" +local json = require "st.json" local zw_test_utils = require "integration_test.zwave_test_utils" local t_utils = require "integration_test.utils" diff --git a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock.lua b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock.lua index 52144295b3..80aaa7e667 100644 --- a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock.lua +++ b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock.lua @@ -15,7 +15,7 @@ local test = require "integration_test" local capabilities = require "st.capabilities" local zw = require "st.zwave" -local json = require "dkjson" +local json = require "st.json" --- @type st.zwave.constants local constants = require "st.zwave.constants" --- @type st.zwave.CommandClass.DoorLock diff --git a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_code_migration.lua b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_code_migration.lua index e4a9b50758..fb9c590bdb 100644 --- a/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_code_migration.lua +++ b/drivers/SmartThings/zwave-lock/src/test/test_zwave_lock_code_migration.lua @@ -28,7 +28,7 @@ local utils = require "st.utils" local mock_datastore = require "integration_test.mock_env_datastore" -local json = require "dkjson" +local json = require "st.json" local zwave_lock_endpoints = { { diff --git a/drivers/SmartThings/zwave-lock/src/zwave-alarm-v1-lock/init.lua b/drivers/SmartThings/zwave-lock/src/zwave-alarm-v1-lock/init.lua index 44d978999b..b79c7e4d29 100644 --- a/drivers/SmartThings/zwave-lock/src/zwave-alarm-v1-lock/init.lua +++ b/drivers/SmartThings/zwave-lock/src/zwave-alarm-v1-lock/init.lua @@ -21,7 +21,7 @@ local Alarm = (require "st.zwave.CommandClass.Alarm")({ version = 1 }) local Battery = (require "st.zwave.CommandClass.Battery")({ version = 1 }) --- @type st.zwave.defaults.lockCodes local lock_code_defaults = require "st.zwave.defaults.lockCodes" -local json = require "dkjson" +local json = require "st.json" local METHOD = { KEYPAD = "keypad", diff --git a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua index 6b4e978981..84967e9f9d 100644 --- a/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua +++ b/drivers/SmartThings/zwave-switch/src/test/test_inovelli_dimmer_preferences.lua @@ -18,7 +18,7 @@ local zw_test_utils = require "integration_test.zwave_test_utils" local utils = require "st.utils" local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 }) local t_utils = require "integration_test.utils" -local dkjson = require 'dkjson' +local json = require "st.json" local INOVELLI_MANUFACTURER_ID = 0x031E local INOVELLI_LZW31_PRODUCT_TYPE = 0x0003 @@ -52,7 +52,7 @@ do function() local device_data = utils.deep_copy(mock_inovelli_dimmer.raw_st_data) device_data.preferences["dimmingSpeed"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_inovelli_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( @@ -76,7 +76,7 @@ do function() local device_data = utils.deep_copy(mock_inovelli_dimmer.raw_st_data) device_data.preferences["powerOnState"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_inovelli_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( @@ -100,7 +100,7 @@ do function() local device_data = utils.deep_copy(mock_inovelli_dimmer.raw_st_data) device_data.preferences["acPowerType"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_inovelli_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( @@ -124,7 +124,7 @@ do function() local device_data = utils.deep_copy(mock_inovelli_dimmer.raw_st_data) device_data.preferences["autoOffTimer"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_inovelli_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( @@ -149,7 +149,7 @@ do function() local device_data = utils.deep_copy(mock_inovelli_dimmer.raw_st_data) device_data.preferences["invertSwitch"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_inovelli_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua index 21e7fbba3f..c009268504 100644 --- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua +++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_din_dimmer_preferences.lua @@ -15,7 +15,7 @@ local test = require "integration_test" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require 'dkjson' +local json = require "st.json" local zw = require "st.zwave" local zw_test_utils = require "integration_test.zwave_test_utils" local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 }) @@ -53,7 +53,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_din_dimmer.raw_st_data) device_data.preferences["input1SwitchType"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_din_dimmer.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( diff --git a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua index 48fa00fa38..ff87acc7fe 100644 --- a/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua +++ b/drivers/SmartThings/zwave-switch/src/test/test_qubino_flush_dimmer_0_10V_preferences.lua @@ -15,7 +15,7 @@ local test = require "integration_test" local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require 'dkjson' +local json = require "st.json" local zw = require "st.zwave" local zw_test_utils = require "integration_test.zwave_test_utils" local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=4 }) @@ -153,7 +153,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_dimmer_0_10V.raw_st_data) device_data.preferences["dimmingTimeKeyPressed"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_dimmer_0_10V.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -176,7 +176,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_dimmer_0_10V.raw_st_data) device_data.preferences["dimmingDuration"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_dimmer_0_10V.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua index 9c879806f6..3d25a9b32c 100644 --- a/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua +++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_fibaro_roller_shutter.lua @@ -22,7 +22,7 @@ local SwitchMultilevel = (require "st.zwave.CommandClass.SwitchMultilevel")({ ve local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=1 }) local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require 'dkjson' +local json = require "st.json" -- supported comand classes: SWITCH_MULTILEVEL local fibaro_roller_shutter_endpoints = { @@ -413,7 +413,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["ledFrameWhenMoving"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -436,7 +436,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["ledFrameWhenNotMoving"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -459,7 +459,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["ledFrameBrightness"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -482,7 +482,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["calibration"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -505,7 +505,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["operatingMode"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -528,7 +528,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["delayAtEndSwitch"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -551,7 +551,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["motorEndMoveDetection"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -574,7 +574,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["buttonsOrientation"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -597,7 +597,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["outputsOrientation"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -620,7 +620,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["powerWithSelfConsumption"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -643,7 +643,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["powerReportsOnChange"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -666,7 +666,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["powerReportsPeriodic"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -689,7 +689,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["energyReportsOnChange"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -712,7 +712,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter.raw_st_data) device_data.preferences["energyReportsPeriodic"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -735,7 +735,7 @@ do function() local device_data = utils.deep_copy(mock_fibaro_roller_shutter_venetian.raw_st_data) device_data.preferences["venetianBlindTurnTime"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_fibaro_roller_shutter_venetian.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( diff --git a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua index 5431ed1e70..73333ef919 100644 --- a/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua +++ b/drivers/SmartThings/zwave-window-treatment/src/test/test_qubino_flush_shutter.lua @@ -23,7 +23,7 @@ local SwitchMultilevel = (require "st.zwave.CommandClass.SwitchMultilevel")({ ve local Configuration = (require "st.zwave.CommandClass.Configuration")({ version=1 }) local t_utils = require "integration_test.utils" local utils = require "st.utils" -local dkjson = require 'dkjson' +local json = require "st.json" -- supported comand classes: SWITCH_MULTILEVEL local fibaro_roller_shutter_endpoints = { @@ -349,7 +349,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["operatingModes"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -372,7 +372,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["slatsTurnTime"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -395,7 +395,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["slatsPosition"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -418,7 +418,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["motorUpDownTime"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -441,7 +441,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["motorOperationDetection"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command( @@ -464,7 +464,7 @@ do function() local device_data = utils.deep_copy(mock_qubino_flush_shutter.raw_st_data) device_data.preferences["forcedCalibration"] = new_param_value - local device_data_json = dkjson.encode(device_data) + local device_data_json = json.encode(device_data) test.socket.device_lifecycle:__queue_receive({ mock_qubino_flush_shutter.id, "infoChanged", device_data_json }) test.socket.zwave:__expect_send( zw_test_utils.zwave_test_build_send_command(