refactor(instance): convert heating to true property

IATkachenko · IATkachenko · commit 6d162a86ddc1 · 2022-07-08T21:12:45.000+03:00
diff --git a/tests/unit/tion.py b/tests/unit/tion.py
@@ -1,37 +1,23 @@
-import sys
-import unittest
-import unittest.mock as mock
-from unittest.mock import MagicMock
-sys.modules['bluepy'] = MagicMock()
-sys.modules['bluepy.btle'] = MagicMock()
-import tion_btle.tion  # noqa: E402
+import pytest
 
+from tion_btle.tion import tion as Tion
 
-class TionTests(unittest.TestCase):
-    def setUp(self):
-        self.patch = mock.patch('tion_btle.tion.tion.__init__', return_value=None)
-        self.patch.start()
-        self._tion = tion_btle.tion.tion("")
 
-    def tearDown(self):
-        self.patch.stop()
+@pytest.mark.parametrize(
+    "heater, heater_temp, in_temp, out_temp, result",
+    [
+        ["on",  20, -2, 21, "on"],
+        ["on",  20, 15, 21, "on"],
+        ["on",  16, 15, 21, "off"],
+        ["off", 20, 15, 21, "off"],
+    ])
+def test__detect_heating_state(heater, in_temp, out_temp, heater_temp, result):
+    """Test heating detection"""
 
-    def test___detect_heating_state(self):
-        # state, in, out, target, heater
-        _variants = [
-            ["on",  -2, 21, 20, "on"],
-            ["on",  15, 21, 20, "on"],
-            ["off", 15, 21, 16, "on"],
-            ["off", 15, 21, 20, "off"],
-        ]
+    tion = Tion(mac="")
+    tion.heater = heater
+    tion._in_temp = in_temp
+    tion._out_temp = out_temp
+    tion._heater_temp = heater_temp
 
-        for expect, in_temp, out_temp, heater_temp, heater in _variants:
-            with self.subTest(expect=expect,
-                              in_temp=in_temp, out_temp=out_temp, heater_temp=heater_temp, heater=heater):
-                # call private __detect_heating_state from tion class
-                self._tion._tion__detect_heating_state(in_temp, out_temp, heater_temp, heater)
-                self.assertEqual(self._tion.heating, expect)
-
-
-if __name__ == '__main__':
-    unittest.main()
+    assert tion.heating == result
diff --git a/tion_btle/tion.py b/tion_btle/tion.py
@@ -131,7 +131,6 @@ def __init__(self, mac: str):
         self._state: bool = False
         self._heater: bool = False
         self._sound: bool = False
-        self._heating: bool = False
         self._filter_remain: float = 0.0
         self._error_code: int = 0
         self.__failed_connects: int = 0
@@ -209,35 +208,16 @@ def __generate_common_json(self) -> dict:
             "model": self.model,
         }
 
-    def __detect_heating_state(self,
-                               in_temp: int = None,
-                               out_temp: int = None,
-                               heater_temp: int = None,
-                               heater: str = None) -> None:
-        """
-        Tries to guess is heater working right now
-        :param in_temp: air intake temperature
-        :param out_temp: ait outtake temperature
-        :param heater_temp: target temperature for heater
-        :param heater: heater state
-        :return: None
-        """
-        if in_temp is None:
-            in_temp = self.in_temp
-        if out_temp is None:
-            out_temp = self.out_temp
-        if heater_temp is None:
-            heater_temp = self.heater_temp
-        if heater is None:
-            heater = self.heater
-
-        if heater == "off":
-            self.heating = "off"
-        else:
-            if heater_temp - in_temp > 3 and out_temp > in_temp:
-                self.heating = "on"
-            else:
-                self.heating = "off"
+    @property
+    def heating(self) -> str:
+        """Tries to guess is heater working right now."""
+        if self.heater == "off":
+            return "off"
+
+        if self.heater_temp - self.in_temp > 3 and self.out_temp > self.in_temp:
+            return "on"
+
+        return "off"
 
     def get_state_from_breezer(self, keep_connection: bool = False) -> None:
         """
@@ -257,7 +237,6 @@ def get_state_from_breezer(self, keep_connection: bool = False) -> None:
                 self.__connections_count -= 1
 
         self._decode_response(response)
-        self.__detect_heating_state()
 
     def get(self, keep_connection: bool = False, skip_update: bool = False) -> dict:
         """
@@ -509,14 +488,6 @@ def sound(self, new_state: str):
     def filter_remain(self) -> float:
         return self._filter_remain
 
-    @property
-    def heating(self) -> str:
-        return self._decode_state(self._heating)
-
-    @heating.setter
-    def heating(self, new_state: str):
-        self._heating = self._encode_state(new_state)
-
     @property
     def mode(self):
         return self._process_mode(self._mode)
