Merge branch 'beta' into main

Author: ctowns

drivers/SmartThings/matter-sensor/src/sub_drivers/air_quality_sensor/air_quality_sensor_utils/utils.lua

@@ -121,5 +121,10 @@ function AirQualitySensorUtils.deep_equals(a, b, opts, seen)
   return AirQualitySensorUtils.deep_equals(mt_a, mt_b, opts, seen)
 end
 
+  -- Compare metatables
+  local mt_a = getmetatable(a)
+  local mt_b = getmetatable(b)
+  return AirQualitySensorUtils.deep_equals(mt_a, mt_b, opts, seen)
+end
 
 return AirQualitySensorUtils

drivers/SmartThings/matter-sensor/src/test/test_matter_air_quality_sensor_modular.lua

@@ -456,5 +456,40 @@ test.register_coroutine_test(
   { test_init = test_init_modular_fingerprint }
 )
 
+test.register_coroutine_test(
+  "Component-capability update without profile ID update should cause re-subscribe in infoChanged handler",
+  function()
+    local expected_metadata_modular_disabled = {
+      optional_component_capabilities={
+        {
+          "main",
+          {
+            "tvocMeasurement",
+          },
+        },
+      },
+      profile="aqs-modular",
+    }
+    local subscribe_request_tvoc = get_subscribe_request_tvoc()
+    local updated_device_profile = t_utils.get_profile_definition("aqs-modular.yml",
+      {enabled_optional_capabilities = expected_metadata_modular_disabled.optional_component_capabilities}
+    )
+    updated_device_profile.id = "00000000-1111-2222-3333-000000000006"
+    test.socket.device_lifecycle:__queue_receive(mock_device_modular_fingerprint:generate_info_changed({ profile = updated_device_profile }))
+    test.socket.capability:__expect_send(mock_device_modular_fingerprint:generate_test_message("main", capabilities.airQualityHealthConcern.supportedAirQualityValues({"unknown", "good", "unhealthy", "moderate", "slightlyUnhealthy"}, {visibility={displayed=false}})))
+    test.socket.matter:__expect_send({mock_device_modular_fingerprint.id, subscribe_request_tvoc})
+  end,
+  { test_init = test_init_modular_fingerprint }
+)
+
+test.register_coroutine_test(
+  "No component-capability update and no profile ID update should not cause a re-subscribe in infoChanged handler",
+  function()
+    -- simulate no actual change
+    test.socket.device_lifecycle:__queue_receive(mock_device_modular_fingerprint:generate_info_changed({}))
+  end,
+  { test_init = test_init_modular_fingerprint }
+)
+
 -- run tests
 test.run_registered_tests()

drivers/SmartThings/matter-thermostat/src/test/test_matter_thermostat_modular.lua

@@ -198,6 +198,79 @@ local function initialize_subscribe_request(mock_device, subscribed_attributes)
 end
 
 
+local function test_init_modular_fingerprint()
+  test.mock_device.add_test_device(mock_device_modular)
+  test.socket.device_lifecycle:__queue_receive({ mock_device_modular.id, "init" })
+  local subscribe_request = initialize_subscribe_request(mock_device_modular, {
+    [clusters.Thermostat.ID] = {
+      clusters.Thermostat.attributes.LocalTemperature,
+      clusters.Thermostat.attributes.SystemMode,
+      clusters.Thermostat.attributes.ControlSequenceOfOperation,
+    },
+    [clusters.TemperatureMeasurement.ID] = {
+      clusters.TemperatureMeasurement.attributes.MaxMeasuredValue,
+      clusters.TemperatureMeasurement.attributes.MeasuredValue,
+      clusters.TemperatureMeasurement.attributes.MinMeasuredValue,
+    },
+  })
+  test.socket.matter:__expect_send({mock_device_modular.id, subscribe_request})
+end
+
+test.register_coroutine_test(
+"Component-capability update without profile ID update should cause re-subscribe in infoChanged handler", function()
+    local subscribe_request = initialize_subscribe_request(mock_device_modular, {
+      [clusters.Thermostat.ID] = {
+        clusters.Thermostat.attributes.LocalTemperature,
+        clusters.Thermostat.attributes.SystemMode,
+        clusters.Thermostat.attributes.ControlSequenceOfOperation,
+      },
+      [clusters.TemperatureMeasurement.ID] = {
+        clusters.TemperatureMeasurement.attributes.MaxMeasuredValue,
+        clusters.TemperatureMeasurement.attributes.MeasuredValue,
+        clusters.TemperatureMeasurement.attributes.MinMeasuredValue,
+      },
+      [clusters.FanControl.ID] = {
+        clusters.FanControl.attributes.FanMode,
+        clusters.FanControl.attributes.FanModeSequence,
+      },
+    })
+    local expected_metadata_modular = {
+      optional_component_capabilities={{"main", {"fanMode"}}},
+      profile="thermostat-modular",
+    }
+    local updated_device_profile = t_utils.get_profile_definition("thermostat-modular.yml",
+      {enabled_optional_capabilities = expected_metadata_modular.optional_component_capabilities}
+    )
+    updated_device_profile.id = "00000000-1111-2222-3333-000000000003"
+    test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({ profile = updated_device_profile }))
+    test.socket.matter:__expect_send({mock_device_modular.id, subscribe_request})
+  end,
+  { test_init = test_init_modular_fingerprint }
+)
+
+test.register_coroutine_test(
+  "No component-capability update and no profile ID update should not cause a re-subscribe in infoChanged handler", function()
+    -- simulate no actual change
+    test.socket.device_lifecycle:__queue_receive(mock_device_modular:generate_info_changed({}))
+  end,
+  { test_init = function() test.mock_device.add_test_device(mock_device_modular) end }
+)
+
+local function initialize_subscribe_request(mock_device, subscribed_attributes)
+  local subscribe_request = nil
+  for _, attributes in pairs(subscribed_attributes) do
+    for _, attribute in pairs(attributes) do
+      if subscribe_request == nil then
+        subscribe_request = attribute:subscribe(mock_device)
+      else
+        subscribe_request:merge(attribute:subscribe(mock_device))
+      end
+    end
+  end
+  return subscribe_request
+end
+
+
 local function test_init_modular_fingerprint()
   test.mock_device.add_test_device(mock_device_modular)
   test.socket.device_lifecycle:__queue_receive({ mock_device_modular.id, "init" })