fixup! update test and fix syntax bug

Author: hcarter-775

drivers/SmartThings/matter-switch/src/init.lua

@@ -1412,8 +1412,8 @@ local function device_added(driver, device)
       local switch_eps = device:get_endpoints(clusters.OnOff.ID)
       table.sort(switch_eps)
       local electrical_tags = ""
-      if electrical_sensor_eps[1].power then electrical_tags = electrical_tags + "-power" end
-      if electrical_sensor_eps[1].energy then electrical_tags = electrical_tags + "-energy-powerConsumption" end
+      if electrical_sensor_eps[1].power then electrical_tags = electrical_tags .. "-power" end
+      if electrical_sensor_eps[1].energy then electrical_tags = electrical_tags .. "-energy-powerConsumption" end
       device:set_field(profiling_data.ELECTRICAL_TOPOLOGY, {topology = clusters.PowerTopology.types.Feature.NODE_TOPOLOGY, tags_on_ep = {[switch_eps[1]] = electrical_tags}})
       device:set_field(ELECTRICAL_SENSOR_EPS, nil)
     end

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

@@ -39,7 +39,7 @@ local aqara_mock_device = test.mock_device.build_test_matter_device({
         {cluster_id = clusters.Basic.ID, cluster_type = "SERVER"},
         {cluster_id = clusters.ElectricalPowerMeasurement.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 2 },
         {cluster_id = clusters.ElectricalEnergyMeasurement.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 5 },
-        {cluster_id = clusters.PowerTopology.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 2 } -- NODE_TOPOLOGY
+        {cluster_id = clusters.PowerTopology.ID, cluster_type = "SERVER", cluster_revision = 1, feature_map = 1 } -- NODE_TOPOLOGY
       },
       device_types = {
         {device_type_id = 0x0016, device_type_revision = 1}, -- RootNode
@@ -178,11 +178,12 @@ local function test_init()
     end
   end
   test.socket.matter:__expect_send({aqara_mock_device.id, subscribe_request})
-  aqara_mock_device:set_field("__ELECTRICAL_TOPOLOGY", {topology = clusters.PowerTopology.types.Feature.NODE_TOPOLOGY, tags_on_ep = {[1] = "-power-energy-powerConsumption"}}, {persist = false}) -- since we're assuming this would have happened during device_added in this case.
+
+  -- Test added -> doConfigure logic
+  test.socket.device_lifecycle:__queue_receive({ aqara_mock_device.id, "added" })
+  test.socket.matter:__expect_send({aqara_mock_device.id, subscribe_request})
   test.socket.device_lifecycle:__queue_receive({ aqara_mock_device.id, "doConfigure" })
-  test.mock_devices_api._expected_device_updates[aqara_mock_device.device_id] = "00000000-1111-2222-3333-000000000001"
-  test.mock_devices_api._expected_device_updates[1] = {device_id = "00000000-1111-2222-3333-000000000001"}
-  test.mock_devices_api._expected_device_updates[1].metadata = {deviceId="00000000-1111-2222-3333-000000000001", profileReference="4-button"}
+  aqara_mock_device:expect_metadata_update({ profile = "4-button" })
   aqara_mock_device:expect_metadata_update({ provisioning_state = "PROVISIONED" })
   test.mock_device.add_test_device(aqara_mock_device)
   -- to test powerConsumptionReport