Fix three broken test cases

Author: nickolas-deboom

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

@@ -133,8 +133,10 @@ local function subscribe_on_init_presence_sensor(dev)
 end
 
 local function test_init_presence_sensor()
-  test.socket.matter:__expect_send({mock_device_presence_sensor.id, subscribe_on_init_presence_sensor(mock_device_presence_sensor)})
+  test.disable_startup_messages()
   test.mock_device.add_test_device(mock_device_presence_sensor)
+  test.socket.device_lifecycle:__queue_receive({ mock_device_presence_sensor.id, "init" })
+  test.socket.matter:__expect_send({mock_device_presence_sensor.id, subscribe_on_init_presence_sensor(mock_device_presence_sensor)})
   test.socket.device_lifecycle:__queue_receive({ mock_device_presence_sensor.id, "doConfigure" })
   local read_attribute_list = clusters.PowerSource.attributes.AttributeList:read()
   test.socket.matter:__expect_send({mock_device_presence_sensor.id, read_attribute_list})

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

@@ -14,9 +14,8 @@
 
 local test = require "integration_test"
 local capabilities = require "st.capabilities"
-local t_utils = require "integration_test.utils"
-local uint32 = require "st.matter.data_types.Uint32"
 local clusters = require "st.matter.clusters"
+local t_utils = require "integration_test.utils"
 local version = require "version"
 
 if version.api < 11 then
@@ -57,29 +56,9 @@ local mock_device = test.mock_device.build_test_matter_device({
         {cluster_id = clusters.LevelControl.ID, cluster_type = "SERVER", feature_map = 2}
       },
       device_types = {
-        { device_type_id = 0x010B, device_type_revision = 1 }, -- OnOff Dimmable Plug
-      }
-    },
-    {
-      endpoint_id = 3,
-      clusters = {
-        { cluster_id = clusters.ElectricalEnergyMeasurement.ID, cluster_type = "SERVER", feature_map = 14, },
-        { cluster_id = clusters.PowerTopology.ID, cluster_type = "SERVER", feature_map = 4, }, -- SET_TOPOLOGY
-      },
-      device_types = {
-        { device_type_id = 0x0510, device_type_revision = 1 }, -- Electrical Sensor
+        { device_type_id = 0x010A, device_type_revision = 1 } -- OnOff Plug
       }
-    },
-    {
-      endpoint_id = 4,
-      clusters = {
-        { cluster_id = clusters.OnOff.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 0, },
-        { cluster_id = clusters.LevelControl.ID, cluster_type = "SERVER", feature_map = 2},
-      },
-      device_types = {
-        { device_type_id = 0x010B, device_type_revision = 1 }, -- OnOff Dimmable Plug
-      }
-    },
+    }
   },
 })
 

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

@@ -617,7 +617,6 @@ local function test_init_light_level_motion()
   test.socket.matter:__expect_send({mock_device_light_level_motion.id, subscribe_request})
 
   test.socket.device_lifecycle:__queue_receive({ mock_device_light_level_motion.id, "doConfigure" })
-  mock_device_light_level_motion:expect_metadata_update({ profile = "light-level-motion" })
   mock_device_light_level_motion:expect_metadata_update({ provisioning_state = "PROVISIONED" })
 end