Remove redundant test, check cluster differently in can_handle

Author: samadDotDev

drivers/SmartThings/matter-switch/src/sub_drivers/eve_energy/can_handle.lua

@@ -5,13 +5,24 @@ local device_lib = require "st.device"
 local fields = require "switch_utils.fields"
 local switch_utils = require "switch_utils.utils"
 
+local function has_cluster(device, cluster_id)
+  for _, ep in ipairs(device.endpoints) do
+    for _, cluster in ipairs(ep.clusters or {}) do
+      if cluster.cluster_id == cluster_id then
+        return true
+      end
+    end
+  end
+  return false
+end
+
 return function(opts, driver, device)
   local EVE_PRIVATE_CLUSTER_ID = 0x130AFC01
   -- this sub driver loads for devices that:
   -- 1. Contain the Eve Private Cluster (0x130AFC01)
   -- 2. Do NOT have the Standard Electrical Sensor device type
   if device.network_type == device_lib.NETWORK_TYPE_MATTER and
-    #device:get_endpoints(EVE_PRIVATE_CLUSTER_ID) > 0 and
+    has_cluster(device, EVE_PRIVATE_CLUSTER_ID) and
     #switch_utils.get_endpoints_by_device_type(device, fields.DEVICE_TYPE_ID.ELECTRICAL_SENSOR) == 0 then
     return true, require("sub_drivers.eve_energy")
   end

drivers/SmartThings/matter-switch/src/test/test_eve_energy.lua

@@ -15,28 +15,6 @@ local PRIVATE_ATTR_ID_WATT = 0x130A000A
 local PRIVATE_ATTR_ID_WATT_ACCUMULATED = 0x130A000B
 local PRIVATE_ATTR_ID_ACCUMULATED_CONTROL_POINT = 0x130A000E
 
--- Helper function to add get_endpoints method to mock devices for can_handle testing
-local function add_get_endpoints_to_mock(device)
-  device.get_endpoints = function(self, cluster_id, opts)
-    opts = opts or {}
-    local eps = {}
-    for _, ep in ipairs(self.endpoints) do
-      for _, cluster in ipairs(ep.clusters or {}) do
-        if cluster.cluster_id == cluster_id then
-          -- Check feature_bitmap if specified
-          if opts.feature_bitmap == nil or
-             (cluster.feature_map and (cluster.feature_map & opts.feature_bitmap) == opts.feature_bitmap) then
-            table.insert(eps, ep.endpoint_id)
-            break
-          end
-        end
-      end
-    end
-    return eps
-  end
-  return device
-end
-
 local mock_device = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("power-energy-powerConsumption.yml"),
   manufacturer_info = {
@@ -75,7 +53,6 @@ local mock_device = test.mock_device.build_test_matter_device({
     }
   }
 })
-add_get_endpoints_to_mock(mock_device)
 
 local mock_eve_device_using_electrical_sensor = test.mock_device.build_test_matter_device({
   profile = t_utils.get_profile_definition("plug-energy-powerConsumption.yml"),
@@ -135,7 +112,6 @@ local mock_eve_device_using_electrical_sensor = test.mock_device.build_test_matt
     }
   }
 })
-add_get_endpoints_to_mock(mock_eve_device_using_electrical_sensor)
 
 -- Mock device without Eve Private Cluster (should not match eve_energy sub-driver)
 local mock_device_without_private_cluster = test.mock_device.build_test_matter_device({
@@ -170,7 +146,6 @@ local mock_device_without_private_cluster = test.mock_device.build_test_matter_d
     }
   }
 })
-add_get_endpoints_to_mock(mock_device_without_private_cluster)
 
 local function test_init()
   local cluster_subscribe_list = {
@@ -188,7 +163,6 @@ local function test_init()
 end
 test.set_test_init_function(test_init)
 
--- Test can_handle logic
 test.register_coroutine_test(
   "Eve Energy sub-driver can_handle should return true for devices with Eve Private Cluster and no Electrical Sensor",
   function()
@@ -202,18 +176,6 @@ test.register_coroutine_test(
   }
 )
 
-test.register_coroutine_test(
-  "Eve Energy sub-driver can_handle should return false for devices with Electrical Sensor device type",
-  function()
-    local eve_energy_can_handle = require("sub_drivers.eve_energy.can_handle")
-    local result = eve_energy_can_handle(nil, nil, mock_eve_device_using_electrical_sensor)
-    assert(result == false, "can_handle should return false for Eve device with electrical sensor")
-  end,
-  {
-    min_api_version = 17
-  }
-)
-
 test.register_coroutine_test(
   "Eve Energy sub-driver can_handle should return false for devices without Eve Private Cluster",
   function()