CHAD-15951 & 15777: Native handler registration fixes for Matter Powermeter and Z-wave Temperaturemeasurement

aleclorimer · aleclorimer · commit 8db0b18ddf6d · 2025-08-14T12:25:53.000-05:00
- Fixed tests and other tests where we are now registering for switch native handlers
diff --git a/drivers/SmartThings/matter-switch/src/init.lua b/drivers/SmartThings/matter-switch/src/init.lua
@@ -1206,6 +1206,9 @@ local function active_power_handler(driver, device, ib, response)
     local watt_value = ib.data.value / CONVERSION_CONST_MILLIWATT_TO_WATT
     if ib.endpoint_id ~= 0 then
       device:emit_event_for_endpoint(ib.endpoint_id, capabilities.powerMeter.power({ value = watt_value, unit = "W"}))
+      if type(device.register_native_capability_attr_handler) == "function" then
+        device:register_native_capability_attr_handler("powerMeter","power")
+      end
     else
       -- when energy management is defined in the root endpoint(0), replace it with the first switch endpoint and process it.
       device:emit_event_for_endpoint(device:get_field(ENERGY_MANAGEMENT_ENDPOINT), capabilities.powerMeter.power({ value = watt_value, unit = "W"}))
diff --git a/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor.lua b/drivers/SmartThings/matter-switch/src/test/test_electrical_sensor.lua
@@ -238,6 +238,14 @@ test.register_message_test(
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.powerMeter.power({value = 17.0, unit="W"}))
     },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "powerMeter", capability_attr_id = "power" }
+      }
+    }
   }
 )
 
diff --git a/drivers/SmartThings/matter-thermostat/src/init.lua b/drivers/SmartThings/matter-thermostat/src/init.lua
@@ -1964,6 +1964,9 @@ local function active_power_handler(driver, device, ib, response)
   if ib.data.value then
     local watt_value = ib.data.value / 1000
     device:emit_event_for_endpoint(ib.endpoint_id, capabilities.powerMeter.power({ value = watt_value, unit = "W" }))
+    if type(device.register_native_capability_attr_handler) == "function" then
+      device:register_native_capability_attr_handler("powerMeter","power")
+    end
   end
 end
 
diff --git a/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua b/drivers/SmartThings/matter-thermostat/src/test/test_matter_water_heater.lua
@@ -268,6 +268,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.powerMeter.power({ value = 15.0, unit = "W" }))
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "powerMeter", capability_attr_id = "power" }
+      }
     }
   }
 )
diff --git a/drivers/SmartThings/zwave-sensor/src/init.lua b/drivers/SmartThings/zwave-sensor/src/init.lua
@@ -170,7 +170,9 @@ local driver_template = {
   },
 }
 
-defaults.register_for_default_handlers(driver_template, driver_template.supported_capabilities)
+defaults.register_for_default_handlers(driver_template,
+  driver_template.supported_capabilities,
+  {native_capability_attrs_enabled = true})
 --- @type st.zwave.Driver
 local sensor = ZwaveDriver("zwave_sensor", driver_template)
 sensor:run()
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_door_window_sensor_1.lua
@@ -255,6 +255,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_fibaro_door_window_sensor1:generate_test_message("main", capabilities.contactSensor.contact.open())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_fibaro_door_window_sensor1.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
@@ -271,6 +279,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_fibaro_door_window_sensor1:generate_test_message("main", capabilities.contactSensor.contact.closed())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_fibaro_door_window_sensor1.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_fibaro_motion_sensor.lua
@@ -126,6 +126,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
@@ -276,6 +284,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_generic_sensor.lua
@@ -362,12 +362,12 @@ test.register_message_test(
     {
       channel = "capability",
       direction = "send",
-      message = mock_device:generate_test_message("main", capabilities.contactSensor.contact.closed())
+      message = mock_device:generate_test_message("main", capabilities.waterSensor.water.dry())
     },
     {
       channel = "capability",
       direction = "send",
-      message = mock_device:generate_test_message("main", capabilities.waterSensor.water.dry())
+      message = mock_device:generate_test_message("main", capabilities.contactSensor.contact.closed())
     },
     {
       channel = "capability",
@@ -378,9 +378,16 @@ test.register_message_test(
       channel = "zwave",
       direction = "send",
       message = zw_test_utils.zwave_test_build_send_command(mock_device, Meter:Get({ scale = 2 }))
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
-  },
-  { inner_block_ordering = "relaxed" }
+  }
 )
 
 test.register_message_test(
@@ -396,12 +403,12 @@ test.register_message_test(
     {
       channel = "capability",
       direction = "send",
-      message = mock_device:generate_test_message("main", capabilities.contactSensor.contact.open())
+      message = mock_device:generate_test_message("main", capabilities.waterSensor.water.wet())
     },
     {
       channel = "capability",
       direction = "send",
-      message = mock_device:generate_test_message("main", capabilities.waterSensor.water.wet())
+      message = mock_device:generate_test_message("main", capabilities.contactSensor.contact.open())
     },
     {
       channel = "capability",
@@ -412,9 +419,16 @@ test.register_message_test(
       channel = "zwave",
       direction = "send",
       message = zw_test_utils.zwave_test_build_send_command(mock_device, Meter:Get({ scale = 2 }))
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
-  },
-  { inner_block_ordering = "relaxed" }
+  }
 )
 
 test.register_message_test(
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_light_sensor.lua
@@ -82,6 +82,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
@@ -212,6 +220,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_motion_temp_light_sensor.lua
@@ -78,6 +78,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
@@ -189,6 +197,14 @@ test.register_message_test(
       channel = "capability",
       direction = "send",
       message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+    },
+    {
+      channel = "devices",
+      direction = "send",
+      message = {
+        "register_native_capability_attr_handler",
+        { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+      }
     }
   }
 )
diff --git a/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua b/drivers/SmartThings/zwave-sensor/src/test/test_zwave_sensor.lua
@@ -267,6 +267,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
@@ -609,6 +617,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_motion_device:generate_test_message("main", capabilities.motionSensor.motion.active())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_motion_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
@@ -625,6 +641,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_water_device:generate_test_message("main", capabilities.waterSensor.water.wet())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_water_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
@@ -641,6 +665,14 @@ test.register_message_test(
         channel = "capability",
         direction = "send",
         message = mock_contact_device:generate_test_message("main", capabilities.contactSensor.contact.open())
+      },
+      {
+        channel = "devices",
+        direction = "send",
+        message = {
+          "register_native_capability_attr_handler",
+          { device_uuid = mock_contact_device.id, capability_id = "switch", capability_attr_id = "switch" }
+        }
       }
     }
 )
diff --git a/drivers/SmartThings/zwave-thermostat/src/init.lua b/drivers/SmartThings/zwave-thermostat/src/init.lua
@@ -127,7 +127,7 @@ local driver_template = {
   }
 }
 
-defaults.register_for_default_handlers(driver_template, driver_template.supported_capabilities)
+defaults.register_for_default_handlers(driver_template, driver_template.supported_capabilities, {native_capability_attrs_enabled = true})
 --- @type st.zwave.Driver
 local thermostat = ZwaveDriver("zwave_thermostat", driver_template)
 thermostat:run()

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,14 @@ test.register_message_test(`
`238`	`238`	`direction = "send",`
`239`	`239`	`message = mock_device:generate_test_message("main", capabilities.powerMeter.power({value = 17.0, unit="W"}))`
`240`	`240`	`},`
	`241`	`+ {`
	`242`	`+ channel = "devices",`
	`243`	`+ direction = "send",`
	`244`	`+ message = {`
	`245`	`+ "register_native_capability_attr_handler",`
	`246`	`+ { device_uuid = mock_device.id, capability_id = "powerMeter", capability_attr_id = "power" }`
	`247`	`+ }`
	`248`	`+ }`
`241`	`249`	`}`
`242`	`250`	`)`
`243`	`251`
Original file line number	Diff line number	Diff line change
`@@ -268,6 +268,14 @@ test.register_message_test(`
`268`	`268`	`channel = "capability",`
`269`	`269`	`direction = "send",`
`270`	`270`	`message = mock_device:generate_test_message("main", capabilities.powerMeter.power({ value = 15.0, unit = "W" }))`
	`271`	`+ },`
	`272`	`+ {`
	`273`	`+ channel = "devices",`
	`274`	`+ direction = "send",`
	`275`	`+ message = {`
	`276`	`+ "register_native_capability_attr_handler",`
	`277`	`+ { device_uuid = mock_device.id, capability_id = "powerMeter", capability_attr_id = "power" }`
	`278`	`+ }`
`271`	`279`	`}`
`272`	`280`	`}`
`273`	`281`	`)`
Original file line number	Diff line number	Diff line change
`@@ -255,6 +255,14 @@ test.register_message_test(`
`255`	`255`	`channel = "capability",`
`256`	`256`	`direction = "send",`
`257`	`257`	`message = mock_fibaro_door_window_sensor1:generate_test_message("main", capabilities.contactSensor.contact.open())`
	`258`	`+ },`
	`259`	`+ {`
	`260`	`+ channel = "devices",`
	`261`	`+ direction = "send",`
	`262`	`+ message = {`
	`263`	`+ "register_native_capability_attr_handler",`
	`264`	`+ { device_uuid = mock_fibaro_door_window_sensor1.id, capability_id = "switch", capability_attr_id = "switch" }`
	`265`	`+ }`
`258`	`266`	`}`
`259`	`267`	`}`
`260`	`268`	`)`
`@@ -271,6 +279,14 @@ test.register_message_test(`
`271`	`279`	`channel = "capability",`
`272`	`280`	`direction = "send",`
`273`	`281`	`message = mock_fibaro_door_window_sensor1:generate_test_message("main", capabilities.contactSensor.contact.closed())`
	`282`	`+ },`
	`283`	`+ {`
	`284`	`+ channel = "devices",`
	`285`	`+ direction = "send",`
	`286`	`+ message = {`
	`287`	`+ "register_native_capability_attr_handler",`
	`288`	`+ { device_uuid = mock_fibaro_door_window_sensor1.id, capability_id = "switch", capability_attr_id = "switch" }`
	`289`	`+ }`
`274`	`290`	`}`
`275`	`291`	`}`
`276`	`292`	`)`
Original file line number	Diff line number	Diff line change
`@@ -126,6 +126,14 @@ test.register_message_test(`
`126`	`126`	`channel = "capability",`
`127`	`127`	`direction = "send",`
`128`	`128`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`129`	`+ },`
	`130`	`+ {`
	`131`	`+ channel = "devices",`
	`132`	`+ direction = "send",`
	`133`	`+ message = {`
	`134`	`+ "register_native_capability_attr_handler",`
	`135`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`136`	`+ }`
`129`	`137`	`}`
`130`	`138`	`}`
`131`	`139`	`)`
`@@ -276,6 +284,14 @@ test.register_message_test(`
`276`	`284`	`channel = "capability",`
`277`	`285`	`direction = "send",`
`278`	`286`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`287`	`+ },`
	`288`	`+ {`
	`289`	`+ channel = "devices",`
	`290`	`+ direction = "send",`
	`291`	`+ message = {`
	`292`	`+ "register_native_capability_attr_handler",`
	`293`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`294`	`+ }`
`279`	`295`	`}`
`280`	`296`	`}`
`281`	`297`	`)`
Original file line number	Diff line number	Diff line change
`@@ -82,6 +82,14 @@ test.register_message_test(`
`82`	`82`	`channel = "capability",`
`83`	`83`	`direction = "send",`
`84`	`84`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`85`	`+ },`
	`86`	`+ {`
	`87`	`+ channel = "devices",`
	`88`	`+ direction = "send",`
	`89`	`+ message = {`
	`90`	`+ "register_native_capability_attr_handler",`
	`91`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`92`	`+ }`
`85`	`93`	`}`
`86`	`94`	`}`
`87`	`95`	`)`
`@@ -212,6 +220,14 @@ test.register_message_test(`
`212`	`220`	`channel = "capability",`
`213`	`221`	`direction = "send",`
`214`	`222`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`223`	`+ },`
	`224`	`+ {`
	`225`	`+ channel = "devices",`
	`226`	`+ direction = "send",`
	`227`	`+ message = {`
	`228`	`+ "register_native_capability_attr_handler",`
	`229`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`230`	`+ }`
`215`	`231`	`}`
`216`	`232`	`}`
`217`	`233`	`)`
Original file line number	Diff line number	Diff line change
`@@ -78,6 +78,14 @@ test.register_message_test(`
`78`	`78`	`channel = "capability",`
`79`	`79`	`direction = "send",`
`80`	`80`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`81`	`+ },`
	`82`	`+ {`
	`83`	`+ channel = "devices",`
	`84`	`+ direction = "send",`
	`85`	`+ message = {`
	`86`	`+ "register_native_capability_attr_handler",`
	`87`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`88`	`+ }`
`81`	`89`	`}`
`82`	`90`	`}`
`83`	`91`	`)`
`@@ -189,6 +197,14 @@ test.register_message_test(`
`189`	`197`	`channel = "capability",`
`190`	`198`	`direction = "send",`
`191`	`199`	`message = mock_device:generate_test_message("main", capabilities.motionSensor.motion.active())`
	`200`	`+ },`
	`201`	`+ {`
	`202`	`+ channel = "devices",`
	`203`	`+ direction = "send",`
	`204`	`+ message = {`
	`205`	`+ "register_native_capability_attr_handler",`
	`206`	`+ { device_uuid = mock_device.id, capability_id = "switch", capability_attr_id = "switch" }`
	`207`	`+ }`
`192`	`208`	`}`
`193`	`209`	`}`
`194`	`210`	`)`