Improve test-methods, correct test-assert

Author: bouwew

tests/test_adam.py

@@ -329,7 +329,7 @@ async def test_connect_adam_plus_anna_new(self):
         await self.tinker_regulation_mode(smile)
 
         tinkered = await self.tinker_max_boiler_temp(smile)
-        assert tinkered
+        assert not tinkered
 
         # Now change some data and change directory reading xml from
         # emulating reading newer dataset after an update_interval

tests/test_init.py

@@ -669,9 +669,9 @@ async def tinker_switch(
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + locked, not switched as expected")
                 return False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
-                    tinker_switch_passed = True  # test is pass!
+                    return True  # test is pass!
                     _LOGGER.info("  + failed as expected")
                 else:  # pragma: no cover
                     _LOGGER.info("  - failed unexpectedly")
@@ -697,10 +697,10 @@ async def tinker_thermostat_temp(
         except pw_exceptions.ConnectionFailedError:
             if unhappy:
                 _LOGGER.info("  + tinker_thermostat_temp failed as expected")
-                tinker_temp_passed = True
+                return True
             else:  # pragma: no cover
                 _LOGGER.info("  - tinker_thermostat_temp failed unexpectedly")
-                tinker_temp_passed = False
+                return False
 
         return tinker_temp_passed
 
@@ -721,10 +721,10 @@ async def tinker_thermostat_preset(self, smile, loc_id, unhappy=False):
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + found invalid preset, as expected")
                 tinker_preset_passed = True
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
-                    tinker_preset_passed = True
                     _LOGGER.info("  + tinker_thermostat_preset failed as expected")
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - tinker_thermostat_preset failed unexpectedly")
                     return False
@@ -755,11 +755,11 @@ async def tinker_thermostat_schedule(
                 except pw_exceptions.PlugwiseError:
                     _LOGGER.info("  + failed as expected")
                     tinker_schedule_passed = True
-                except pw_exceptions.ConnectionFailedError:
+                except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                     tinker_schedule_passed = False
                     if unhappy:
                         _LOGGER.info("  + failed as expected before intended failure")
-                        tinker_schedule_passed = True
+                        return True
                     else:  # pragma: no cover
                         _LOGGER.info("  - succeeded unexpectedly for some reason")
                         return False
@@ -783,11 +783,11 @@ async def tinker_legacy_thermostat_schedule(self, smile, unhappy=False):
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + failed as expected")
                 tinker_schedule_passed = True
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 tinker_schedule_passed = False
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    tinker_schedule_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
                     return False
@@ -865,14 +865,14 @@ async def tinker_dhw_mode(smile, unhappy=False):
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + tinker_dhw_mode found invalid mode, as expected")
                 tinker_dhw_mode_passed = False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    ttinker_dhw_mode_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
-                    tinker_dhw_mode_passed = False
-        
+                    return False
+
         return tinker_dhw_mode_passed
 
     @staticmethod
@@ -894,13 +894,13 @@ async def tinker_regulation_mode(smile, unhappy=False):
                     "  + tinker_regulation_mode found invalid mode, as expected"
                 )
                 tinker_reg_mode_passed = False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    tinker_reg_mode_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
-                    tinker_reg_mode_passed = False
+                    return False
 
         return tinker_reg_mode_passed
 
@@ -919,13 +919,13 @@ async def tinker_max_boiler_temp(smile, unhappy=False):
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + tinker_max_boiler_temp failed as intended")
                 tinker_max_boiler_temp_passed = False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    tinker_max_boiler_temp_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
-                    tinker_max_boiler_temp_passed = False
+                    return False
 
         return tinker_max_boiler_temp_passed
 
@@ -966,13 +966,13 @@ async def tinker_gateway_mode(smile, unhappy=False):
             except pw_exceptions.PlugwiseError:
                 _LOGGER.info("  + found invalid mode, as expected")
                 tinker_gateway_mode_passed = False
-            except pw_exceptions.ConnectionFailedError:
+            except pw_exceptions.ConnectionFailedError:  # leave for-loop at connect-error
                 if unhappy:
                     _LOGGER.info("  + failed as expected before intended failure")
-                    tinker_gateway_mode_passed = True
+                    return True
                 else:  # pragma: no cover
                     _LOGGER.info("  - succeeded unexpectedly for some reason")
-                    tinker_gateway_mode_passed = False
+                    return False
 
         return tinker_gateway_mode_passed