chore(testdata): add Vitocal 222S sample data (#646)

* add testdata for vitocal222s

* update missing properties

Author: CFenner

…nse/Vitocal-200S-with-Vitovent-300W.json …ponse/Vitocal200S-with-Vitovent300W.jsontests/response/Vitocal-200S-with-Vitovent-300W.json renamed to tests/response/Vitocal200S-with-Vitovent300W.json tests/response/Vitocal-200S-with-Vitovent-300W.json renamed to tests/response/Vitocal200S-with-Vitovent300W.json

@@ -28,9 +28,6 @@ def test_missingProperties(self):
             'device.productIdentification',
             'device.productMatrix',
             'device.time.daylightSaving',
-            'device.identification',
-            'device.zigbee.parent.rx',
-            'device.zigbee.parent.tx',
             'device.heatingCircuitId',
             'device.configuration.houseLocation',
             'device.lock.malfunction',
@@ -41,15 +38,6 @@ def test_missingProperties(self):
             'device.timeseries.water.pressure.peaks',
             'device.information',
             'device.configuration.measurementWeight',
-            'device.configuration.houseLocation',
-            'device.lock.malfunction',
-            'device.timeseries.burner.stops',
-            'device.timeseries.dhw.burner.stops',
-            'device.timeseries.ignitionTimeSteps',
-            'device.timeseries.monitoringIonization',
-            'device.timeseries.water.pressure.peaks',
-            'device.zigbee.active',
-            'device.zigbee.status',
             'device.actorSensorTest',
             'device.brand',
             'device.lock.external',
@@ -105,7 +93,6 @@ def test_missingProperties(self):
             'heating.configuration.centralHeatingCylinderSize',
             'heating.configuration.dhwCylinderPump',
             'heating.configuration.dhwCylinderSize',
-            'device.messages.info.raw',
             'heating.configuration.gasType',
             'heating.configuration.houseHeatingLoad',
             'heating.configuration.houseLocation',
@@ -116,7 +103,7 @@ def test_missingProperties(self):
             'heating.heat.production.summary.dhw',
             'heating.heat.production.summary.heating',
 
-            # heating ignored for now
+            # heating - not yet used
             'heating.operating.programs.holidayAtHome',
             'heating.operating.programs.holiday',
             'heating.device.time.offset',
@@ -125,34 +112,27 @@ def test_missingProperties(self):
             'heating.boiler.airflaps.1.position.current',
             'heating.boiler.pumps.internal',
             'heating.boiler.pumps.internal.target',
-
             'heating.circuits.0.dhw.pumps.circulation.schedule',
             'heating.circuits.0.dhw.schedule',
             'heating.power.consumption.dhw',
             'heating.power.consumption',
-
             'heating.circuits.0.temperature.levels',  # hint: command
             'heating.dhw.hygiene',
             'heating.dhw.temperature',
             'heating.burners',
-
+            'heating.sensors.temperature.allengra',
             'heating.dhw.hygiene.trigger',
-            'heating.dhw.operating.modes.off',
             'heating.dhw.temperature.hygiene',
-            'heating.sensors.temperature.allengra',
-
+            'heating.dhw.operating.modes.off',
             'heating.dhw.operating.modes.active',
             'heating.dhw.operating.modes.comfort',
             'heating.dhw.operating.modes.eco',
-
             'heating.circuits.0.heating.roomInfluenceFactor',
             'heating.circuits.0.temperature',  # TODO: to analyse, from Vitodens 100W
             'heating.circuits.0.operating.programs.noDemand.hmiState',  # TODO: to analyse, from Vitodens 100W
             'heating.circuits.0.name',  # TODO: to analyse, from Vitodens 100W
             'heating.circuits.0.zone.mode',  # TODO: to analyse, from Vitocal 250A
-
             'heating.configuration.dhw.temperature.dhwCylinder.max',  # TODO: to analyse, from Vitocal 333G
-
             'heating.buffer.sensors.temperature.main',  # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated
             'heating.buffer.sensors.temperature.top',  # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated
             'heating.dhw.sensors.temperature.hotWaterStorage',  # deprecated, removed 2024-09-15 FIXME: remove once data point is removed and test data is updated
@@ -166,7 +146,16 @@ def test_missingProperties(self):
 
             # gateway
 
+            # zigbee
+            'device.zigbee.lqi',
+            'device.zigbee.parent.rx',
+            'device.zigbee.parent.tx',
+            'device.zigbee.active',
+            'device.zigbee.status',
+
             # heat pump
+            'heating.circuits.0.cooling.hysteresis.switch',
+            'heating.circuits.0.heating.hysteresis.switch',
             'heating.circuits.0.operating.programs.screedDrying.heatpump',
             'heating.compressors.0.heat.production.cooling.week',
             'heating.compressors.0.heat.production.dhw.week',
@@ -198,6 +187,13 @@ def test_missingProperties(self):
             'heating.sensors.temperature.hotGas',
             'heating.sensors.temperature.liquidGas',
             'heating.sensors.temperature.suctionGas',
+            'heating.heatingRod.power.consumption.summary.dhw',
+            'heating.heatingRod.power.consumption.summary.heating',
+            'heating.heatingRod.status',
+            'heating.scop.dhw', # deprecated
+            'heating.scop.heating', # deprecated
+            'heating.scop.total', # deprecated
+            'heating.dhw.comfort', # deprecated
 
             # ventilation - not yet used
             'ventilation.control.filterChange',
@@ -218,14 +214,6 @@ def test_missingProperties(self):
             'ventilation.quickmodes.comfort',
             'ventilation.quickmodes.eco',
             'ventilation.quickmodes.holiday',
-            'heating.heatingRod.power.consumption.summary.dhw',
-            'heating.heatingRod.power.consumption.summary.heating',
-            'heating.heatingRod.status',
-            'heating.power.consumption.current',
-            'heating.scop.dhw', # deprecated
-            'heating.scop.heating', # deprecated
-            'heating.scop.total', # deprecated
-            'heating.dhw.comfort', # deprecated
 
             # energy system - not yet used
             'device.etn',
@@ -245,18 +233,13 @@ def test_missingProperties(self):
             'photovoltaic.string.current',
             'photovoltaic.string.voltage',
 
-            # TRVs
-            'device.zigbee.lqi',
-            'device.zigbee.parent.id',
-            'trv.childLock',
-            'trv.mountingMode',
-            'trv.valve.position',
-
-            # FHT
+            # FHT - not yet used
             'fht.configuration.floorCoolingCondensationShutdownMargin',
             'fht.configuration.floorCoolingCondensationThreshold',
             'fht.configuration.floorHeatingDamageProtectionThreshold',
             'fht.valve',
+
+            # DEPRECATED
         ]
 
         all_features = self.read_all_features()

tests/response/Vitocal222S-with-Vitovent.json

@@ -4,9 +4,9 @@
 from tests.ViCareServiceMock import ViCareServiceMock
 
 
-class Vitocal_200S_with_Vitovent_300W(unittest.TestCase):
+class Vitocal200S_with_Vitovent300W(unittest.TestCase):
     def setUp(self):
-        self.service = ViCareServiceMock('response/Vitocal-200S-with-Vitovent-300W.json')
+        self.service = ViCareServiceMock('response/Vitocal200S-with-Vitovent300W.json')
         self.device = HeatPump(self.service)
 
     def test_isDomesticHotWaterDevice(self):
@@ -44,15 +44,3 @@ def test_ventilationQuickmodes(self):
             "eco",
             "holiday",
         ])
-
-class Vitocal_333G_with_Vitovent_300F(unittest.TestCase):
-    def setUp(self):
-        self.service = ViCareServiceMock('response/Vitocal-333G-with-Vitovent-300F.json')
-        self.device = HeatPump(self.service)
-
-    def test_getHeatExchangerFrostProtectionActive(self):
-        self.assertFalse(self.device.getHeatExchangerFrostProtectionActive())
-
-    def test_getVolumeFlow(self):
-        self.assertEqual(self.device.getSupplyVolumeFlow(), 257)
-        self.assertEqual(self.device.getExhaustVolumeFlow(), 257)

tests/response/Vitocal222S.json

@@ -6,9 +6,9 @@
 from tests.ViCareServiceMock import ViCareServiceMock
 
 
-class Vitocal222S(unittest.TestCase):
+class Vitocal222S_with_Vitovent(unittest.TestCase):
     def setUp(self):
-        self.service = ViCareServiceMock('response/Vitocal222S.json')
+        self.service = ViCareServiceMock('response/Vitocal222S-with-Vitovent.json')
         self.device = HeatPump(self.service)
 
     def test_getDomesticHotWaterActiveMode_10_10_time(self):

…nse/Vitocal-333G-with-Vitovent-300F.json …ponse/Vitocal333G-with-Vitovent300F.jsontests/response/Vitocal-333G-with-Vitovent-300F.json renamed to tests/response/Vitocal333G-with-Vitovent300F.json tests/response/Vitocal-333G-with-Vitovent-300F.json renamed to tests/response/Vitocal333G-with-Vitovent300F.json

@@ -0,0 +1,17 @@
+import unittest
+
+from PyViCare.PyViCareHeatPump import HeatPump
+from tests.ViCareServiceMock import ViCareServiceMock
+
+
+class Vitocal333G_with_Vitovent300F(unittest.TestCase):
+    def setUp(self):
+        self.service = ViCareServiceMock('response/Vitocal333G-with-Vitovent300F.json')
+        self.device = HeatPump(self.service)
+
+    def test_getHeatExchangerFrostProtectionActive(self):
+        self.assertFalse(self.device.getHeatExchangerFrostProtectionActive())
+
+    def test_getVolumeFlow(self):
+        self.assertEqual(self.device.getSupplyVolumeFlow(), 257)
+        self.assertEqual(self.device.getExhaustVolumeFlow(), 257)

tests/response/VitochargeVX3.json tests/response/Vitocharge03.jsontests/response/VitochargeVX3.json renamed to tests/response/Vitocharge03.json

@@ -6,7 +6,7 @@
 
 class VitochargeVX3(unittest.TestCase):
     def setUp(self):
-        self.service = ViCareServiceMock('response/VitochargeVX3.json')
+        self.service = ViCareServiceMock('response/Vitocharge03.json')
         self.device = ElectricalEnergySystem(self.service)
 
     def test_isDomesticHotWaterDevice(self):