Make HeatingDevice inherit from Device

PyViCare/PyViCareElectricalEnergySystem.py

@@ -1,13 +1,9 @@
 from PyViCare.PyViCareDevice import Device
 from PyViCare.PyViCareUtils import handleNotSupported
-from PyViCare.PyViCareService import ViCareService
 
 
 class ElectricalEnergySystem(Device):
 
-    def __init__(self, service: ViCareService) -> None:
-        self.service = service
-
     @handleNotSupported
     def getPointOfCommonCouplingTransferPowerExchange(self):
         return self.service.getProperty("pcc.transfer.power.exchange")["properties"][

PyViCare/PyViCareHeatingDevice.py

@@ -1,9 +1,9 @@
 from contextlib import suppress
 from typing import Any, List, Optional
 
+from PyViCare.PyViCareDevice import Device
 from PyViCare.PyViCareHeatCurveCalculation import (
     heat_curve_formular_variant1, heat_curve_formular_variant2)
-from PyViCare.PyViCareService import ViCareService
 from PyViCare.PyViCareUtils import (VICARE_DAYS,
                                     PyViCareNotSupportedFeatureError,
                                     ViCareTimer, handleAPICommandErrors,
@@ -29,20 +29,13 @@
     return available_burners
 
 
-class HeatingDevice:
+class HeatingDevice(Device):
     """This is the base class for all heating devices.
     This class connects to the Viessmann ViCare API.
     The authentication is done through OAuth2.
     Note that currently, a new token is generated for each run.
     """
 
-    def __init__(self, service: ViCareService) -> None:
-        self.service = service
-
-    @handleNotSupported
-    def getSerial(self):
-        return self.service.getProperty("device.serial")["properties"]["value"]["value"]
-
     @property
     def circuits(self) -> List[Any]:
         return list([self.getCircuit(x) for x in self.getAvailableCircuits()])
@@ -487,7 +480,7 @@
 
 
 
     """ Activate a program
         NOTE
         DEVICE_COMMUNICATION_ERROR can just mean that the program is already on
     Parameters

tests/test_VitochargeVX3.py

@@ -9,101 +9,80 @@
         self.service = ViCareServiceMock('response/VitochargeVX3.json')
         self.device = ElectricalEnergySystem(self.service)
 
+    def test_getSerial(self):
+        self.assertEqual(self.device.getSerial(), '################')
+
     def test_getPointOfCommonCouplingTransferPowerExchange(self):
         self.assertEqual(self.device.getPointOfCommonCouplingTransferPowerExchange(), 0)
 
-
     def test_getPhotovoltaicProductionCumulatedUnit(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedUnit(), "wattHour")
 
     def test_getPhotovoltaicProductionCumulatedCurrentDay(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedCurrentDay(), 47440)
 
-
     def test_getPhotovoltaicProductionCumulatedCurrentWeek(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedCurrentWeek(), 208436)
 
-
     def test_getPhotovoltaicProductionCumulatedCurrentMonth(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedCurrentMonth(), 487670)
 
-
     def test_getPhotovoltaicProductionCumulatedCurrentYear(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedCurrentYear(), 487670)
 
-
     def test_getPhotovoltaicProductionCumulatedLifeCycle(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCumulatedLifeCycle(), 487670)
 
-
     def test_getPhotovoltaicStatus(self):
         self.assertEqual(self.device.getPhotovoltaicStatus(), "ready")
 
-
     def test_getPhotovoltaicProductionCurrent(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCurrent(), 0)
 
-
     def test_getPhotovoltaicProductionCurrentUnit(self):
         self.assertEqual(self.device.getPhotovoltaicProductionCurrentUnit(), "kilowatt")
 
-
     def test_getPointOfCommonCouplingTransferConsumptionTotal(self):
         self.assertEqual(self.device.getPointOfCommonCouplingTransferConsumptionTotal(),7700)
 
-
     def test_getPointOfCommonCouplingTransferConsumptionTotalUnit(self):
         self.assertEqual(self.device.getPointOfCommonCouplingTransferConsumptionTotalUnit(),"wattHour")
 
-
     def test_getPointOfCommonCouplingTransferFeedInTotal(self):
         self.assertEqual(self.device.getPointOfCommonCouplingTransferFeedInTotal(),298900)
 
-
     def test_getPointOfCommonCouplingTransferFeedInTotalUnit(self):
         self.assertEqual(self.device.getPointOfCommonCouplingTransferFeedInTotalUnit(),"wattHour")
 
-
     def test_getElectricalEnergySystemTransferDischargeCumulatedUnit(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedUnit(),"wattHour")
 
-
     def test_getElectricalEnergySystemTransferDischargeCumulatedCurrentDay(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedCurrentDay(),4751)
 
-
     def test_getElectricalEnergySystemTransferDischargeCumulatedCurrentWeek(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedCurrentWeek(),29820)
 
     def test_getElectricalEnergySystemTransferDischargeCumulatedCurrentMonth(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedCurrentMonth(),66926)
 
-
     def test_getElectricalEnergySystemTransferDischargeCumulatedCurrentYear(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedCurrentYear(),66926)
 
-
     def test_getElectricalEnergySystemTransferDischargeCumulatedLifeCycle(self):
         self.assertEqual(self.device.getElectricalEnergySystemTransferDischargeCumulatedLifeCycle(),66926)
 
-
     def test_getElectricalEnergySystemSOC(self):
         self.assertEqual(self.device.getElectricalEnergySystemSOC(),91)
 
-
     def test_getElectricalEnergySystemSOCUnit(self):
        self.assertEqual(self.device.getElectricalEnergySystemSOCUnit(),"percent")
 
-
     def test_getElectricalEnergySystemPower(self):
         self.assertEqual(self.device.getElectricalEnergySystemPower(),700)
 
-
     def test_getElectricalEnergySystemPowerUnit(self):
         self.assertEqual(self.device.getElectricalEnergySystemPowerUnit(),"watt")
 
     def test_getElectricalEnergySystemOperationState(self):
        self.assertEqual(self.device.getElectricalEnergySystemOperationState(),"discharge")
-
-
-