Revert health check changes for non-ST drivers

Author: greens

drivers/Aqara/aqara-cube/src/init.lua

@@ -125,8 +125,7 @@ local aqara_cube_t1_pro_handler = {
   lifecycle_handlers = {
     init = device_init,
     added = device_added
-  },
-  health_check = false,
+  }
 }
 
 local aqara_cube_t1_pro_driver = ZigbeeDriver("aqara_cube_t1_pro", aqara_cube_t1_pro_handler)

drivers/Aqara/aqara-feeder/src/init.lua

@@ -184,7 +184,6 @@ local aqara_pet_feeder_handler = {
     infoChanged = device_info_changed,
     doConfigure = device_configure
   },
-  health_check = false,
   can_handle = function(opts, driver, device, ...)
     return device:get_model() == "aqara.feeder.acn001"
   end

drivers/Aqara/aqara-lock/src/init.lua

@@ -325,8 +325,7 @@ local aqara_locks_handler = {
   },
   secret_data_handlers = {
     [security.SECRET_KIND_AQARA] = my_secret_data_handler
-  },
-  health_check = false,
+  }
 }
 
 local aqara_locks_driver = ZigbeeDriver("aqara_locks_k100", aqara_locks_handler)

drivers/Unofficial/tuya-zigbee/src/init.lua

@@ -26,9 +26,7 @@ local unofficial_tuya_driver_template = {
     require("curtain"),
     require("motion-sensor"),
     require("smoke-detector"),
-    require("switch")
-  },
-  health_check = false,
+    require("switch")}
 }
 
 defaults.register_for_default_handlers(unofficial_tuya_driver_template, unofficial_tuya_driver_template.supported_capabilities)

drivers/Unofficial/tuya-zigbee/src/test/test_meian_button.lua

@@ -40,7 +40,9 @@ local mock_device_meian_button = test.mock_device.build_test_zigbee_device(
 
 zigbee_test_utils.prepare_zigbee_env_info()
 local function test_init()
-  test.mock_device.add_test_device(mock_device_meian_button)end
+  test.mock_device.add_test_device(mock_device_meian_button)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 
@@ -77,44 +79,44 @@ test.register_message_test(
     }
 )
 
--- test.register_coroutine_test(
---     "Health check should check all relevant attributes",
---     function()
---       test.socket.device_lifecycle:__queue_receive({ mock_device_meian_button.id, "added"})
---       test.socket.capability:__expect_send(
---         mock_device_meian_button:generate_test_message(
---           "main",
---           capabilities.button.supportedButtonValues({ "pushed" }, { visibility = { displayed = false } })
---         )
---       )
---       test.socket.capability:__expect_send(
---         mock_device_meian_button:generate_test_message(
---           "main",
---           capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
---         )
---       )
---       test.socket.capability:__expect_send({
---         mock_device_meian_button.id,
---         {
---           capability_id = "button", component_id = "main",
---           attribute_id = "button", state = { value = "pushed" }
---         }
---       })
---       test.socket.zigbee:__expect_send({ mock_device_meian_button.id, tuya_utils.build_tuya_magic_spell_message(mock_device_meian_button) })
---       test.socket.zigbee:__expect_send(
---           {
---             mock_device_meian_button.id,
---             PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device_meian_button)
---           }
---       )
---     end,
---     {
---       test_init = function()
---         test.mock_device.add_test_device(mock_device_meian_button)
---         test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "health_check")
---       end
---     }
--- )
+test.register_coroutine_test(
+    "Health check should check all relevant attributes",
+    function()
+      test.socket.device_lifecycle:__queue_receive({ mock_device_meian_button.id, "added"})
+      test.socket.capability:__expect_send(
+        mock_device_meian_button:generate_test_message(
+          "main",
+          capabilities.button.supportedButtonValues({ "pushed" }, { visibility = { displayed = false } })
+        )
+      )
+      test.socket.capability:__expect_send(
+        mock_device_meian_button:generate_test_message(
+          "main",
+          capabilities.button.numberOfButtons({ value = 1 }, { visibility = { displayed = false } })
+        )
+      )
+      test.socket.capability:__expect_send({
+        mock_device_meian_button.id,
+        {
+          capability_id = "button", component_id = "main",
+          attribute_id = "button", state = { value = "pushed" }
+        }
+      })
+      test.socket.zigbee:__expect_send({ mock_device_meian_button.id, tuya_utils.build_tuya_magic_spell_message(mock_device_meian_button) })
+      test.socket.zigbee:__expect_send(
+          {
+            mock_device_meian_button.id,
+            PowerConfiguration.attributes.BatteryPercentageRemaining:read(mock_device_meian_button)
+          }
+      )
+    end,
+    {
+      test_init = function()
+        test.mock_device.add_test_device(mock_device_meian_button)
+        test.timer.__create_and_queue_test_time_advance_timer(30, "interval", "health_check")
+      end
+    }
+)
 
 test.register_coroutine_test(
     "Refresh necessary attributes",

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_button.lua

@@ -40,7 +40,9 @@ local mock_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-    test.mock_device.add_test_device(mock_device)end
+    test.mock_device.add_test_device(mock_device)
+    zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_curtain.lua

@@ -39,7 +39,9 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)end
+  test.mock_device.add_test_device(mock_simple_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_motion_sensor.lua

@@ -39,7 +39,9 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)end
+  test.mock_device.add_test_device(mock_simple_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_smoke_detector.lua

@@ -39,7 +39,9 @@ local mock_simple_device = test.mock_device.build_test_zigbee_device(
 zigbee_test_utils.prepare_zigbee_env_info()
 
 local function test_init()
-  test.mock_device.add_test_device(mock_simple_device)end
+  test.mock_device.add_test_device(mock_simple_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)
 

drivers/Unofficial/tuya-zigbee/src/test/test_tuya_switch.lua

@@ -95,7 +95,9 @@ local function test_init()
   test.mock_device.add_test_device(second_mock_child_device)
   test.mock_device.add_test_device(third_mock_child_device)
   test.mock_device.add_test_device(fourth_mock_child_device)
-  test.mock_device.add_test_device(fifth_mock_child_device)end
+  test.mock_device.add_test_device(fifth_mock_child_device)
+  zigbee_test_utils.init_noop_health_check_timer()
+end
 
 test.set_test_init_function(test_init)