add more programs to getPrograms (#339)

* add more programs * Remove 'active' from getPrograms 'active' is not program but it shows the current active operating program on the device * Update test_getPrograms add all programs for this device * update getPrograms correct alphabetical order of programs in getPrograms * Update test_getPrograms for Vitocal200.py remove 'active' from expected programs * Update test_getPrograms for Vitocal300G.py Remove 'active' from expected programs * Update test_getPrograms for Vitocaldens222F.py Remove 'active' from expected programs * Update test_getPrograms for Vitodens200W.py Remove 'active' from expected programs * Update test_getPrograms for Vitodens200W_2.py Remove 'active' from expected programs * Update test_getPrograms for Vitodens222W.py Remove 'active' from expected programs * Update test_getPrograms for Vitodens300W.py Remove 'active' from expected programs * Update test_getPrograms for Vitodens333F.py Remove 'active' from expected programs
openviess · Nov 25, 2023 · da1ef0f · da1ef0f
1 parent e988a38
commit da1ef0f
Show file tree

Hide file tree

Showing 10 changed files with 15 additions and 19 deletions.
diff --git a/PyViCare/PyViCareHeatingDevice.py b/PyViCare/PyViCareHeatingDevice.py
@@ -593,8 +593,11 @@ def getActiveProgram(self):
     @handleNotSupported
     def getPrograms(self):
         available_programs = []
-        for program in ['active', 'comfort', 'forcedLastFromSchedule', 'eco', 'external', 'fixed', 'holiday',
-                        'normal', 'reduced', 'standby']:
+        for program in ['comfort', 'comfortCooling', 'comfortCoolingEnergySaving', 'comfortEnergySaving', 
+                        'comfortHeating', 'dhwPrecedence', 'eco', 'external', 'fixed', 'forcedLastFromSchedule', 
+                        'frostprotection', 'holiday', 'holidayAtHome', 'manual', 'normal', 'normalCooling', 
+                        'normalCoolingEnergySaving', 'normalEnergySaving', 'normalHeating', 'reduced', 'reducedCooling',
+                        'reducedCoolingEnergySaving', 'reducedEnergySaving', 'reducedHeating', 'standby', 'summerEco']:
             with suppress(PyViCareNotSupportedFeatureError):
                 if self.service.getProperty(
                         f"heating.circuits.{self.circuit}.operating.programs.{program}") is not None:

diff --git a/tests/test_Vitocal200.py b/tests/test_Vitocal200.py
@@ -69,8 +69,7 @@ def test_getSupplyTemperaturePrimaryCircuit(self):
             self.device.getSupplyTemperaturePrimaryCircuit(), 11.6)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'eco',
-                             'fixed', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'fixed', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.getCircuit(0).getPrograms(), expected_programs)
 
@@ -113,4 +112,4 @@ def test_getNormalProgramMaxTemperature(self):
         self.assertEqual(self.device.getCircuit(0).getProgramMaxTemperature("normal"), 30)
 
     def test_getNormalProgramStepping(self):
-        self.assertEqual(self.device.getCircuit(0).getProgramStepping("normal"), 1)
+        self.assertEqual(self.device.getCircuit(0).getProgramStepping("normal"), 1)
diff --git a/tests/test_Vitocal250A.py b/tests/test_Vitocal250A.py
@@ -36,7 +36,7 @@ def test_getSupplyTemperaturePrimaryCircuit(self):
             self.device.getSupplyTemperaturePrimaryCircuit(), 5.9)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'forcedLastFromSchedule', 'fixed', 'standby']
+        expected_programs = ['comfortCooling', 'comfortCoolingEnergySaving', 'comfortEnergySaving', 'comfortHeating', 'fixed', 'forcedLastFromSchedule', 'frostprotection', 'normalCooling', 'normalCoolingEnergySaving', 'normalEnergySaving', 'normalHeating', 'reducedCooling', 'reducedCoolingEnergySaving', 'reducedEnergySaving', 'reducedHeating', 'standby', 'summerEco']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitocal300G.py b/tests/test_Vitocal300G.py
@@ -59,8 +59,7 @@ def test_getSupplyTemperaturePrimaryCircuit(self):
             self.device.getSupplyTemperaturePrimaryCircuit(), 18.2)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'eco',
-                             'fixed', 'holiday', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'fixed', 'holiday', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitocaldens222F.py b/tests/test_Vitocaldens222F.py
@@ -42,8 +42,7 @@ def test_getCompressorHours(self):
         self.assertEqual(self.device.getCompressor(0).getHours(), 1.4)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'eco', 'fixed',
-                             'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'fixed', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.getCircuit(1).getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitodens200W.py b/tests/test_Vitodens200W.py
@@ -32,8 +32,7 @@ def test_getBurnerModulation(self):
         self.assertEqual(self.device.burners[0].getModulation(), 0)
 
     def test_getPrograms(self):
-        expected_programs = [
-            'active', 'comfort', 'forcedLastFromSchedule', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'forcedLastFromSchedule', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitodens200W_2.py b/tests/test_Vitodens200W_2.py
@@ -29,8 +29,7 @@ def test_getBurnerModulation(self):
         self.assertEqual(self.device.burners[0].getModulation(), 0)
 
     def test_getPrograms(self):
-        expected_programs = [
-            'active', 'comfort', 'eco', 'external', 'holiday', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'external', 'holiday', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitodens222W.py b/tests/test_Vitodens222W.py
@@ -23,7 +23,7 @@ def test_getBurnerModulation(self):
         self.assertEqual(self.device.burners[0].getModulation(), 15.8)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'forcedLastFromSchedule', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'forcedLastFromSchedule', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitodens300W.py b/tests/test_Vitodens300W.py
@@ -26,8 +26,7 @@ def test_getBurnerModulation(self):
         self.assertEqual(self.device.burners[0].getModulation(), 0)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'eco',
-                             'external', 'holiday', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'external', 'holiday', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)
 

diff --git a/tests/test_Vitodens333F.py b/tests/test_Vitodens333F.py
@@ -24,8 +24,7 @@ def test_getBurnerModulation(self):
         self.assertEqual(self.device.burners[0].getModulation(), 0)
 
     def test_getPrograms(self):
-        expected_programs = ['active', 'comfort', 'eco',
-                             'external', 'holiday', 'normal', 'reduced', 'standby']
+        expected_programs = ['comfort', 'eco', 'external', 'holiday', 'normal', 'reduced', 'standby']
         self.assertListEqual(
             self.device.circuits[0].getPrograms(), expected_programs)