Skip to content

Commit 98ac1a8

Browse files
CoMPaTechCoMPaTech
committed
Sonarcloud smell resolves for the others (and defaulting)
1 parent 6a170d0 commit 98ac1a8

File tree

6 files changed

+151
-167
lines changed

6 files changed

+151
-167
lines changed

‎tests/test_adam.py‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,7 @@ async def test_connect_adam_zone_per_device(self):
2828
self.validate_test_basics(
2929
_LOGGER,
3030
smile,
31-
smile_type="thermostat",
3231
smile_version="3.0.15",
33-
smile_legacy=False,
3432
)
3533

3634
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
@@ -79,11 +77,11 @@ async def test_connect_adam_zone_per_device(self):
7977

8078
try:
8179
await smile.delete_notification()
82-
NotificationDeletion = False # pragma: no cover
80+
notification_deletion = False # pragma: no cover
8381
except pw_exceptions.ResponseError:
84-
NotificationDeletion = True
82+
notification_deletion = True
8583

86-
assert NotificationDeletion
84+
assert notification_deletion
8785

8886
await smile.close_connection()
8987
await self.disconnect(server, client)
@@ -100,9 +98,7 @@ async def test_connect_adam_multiple_devices_per_zone(self):
10098
self.validate_test_basics(
10199
_LOGGER,
102100
smile,
103-
smile_type="thermostat",
104101
smile_version="3.0.15",
105-
smile_legacy=False,
106102
)
107103

108104
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
@@ -166,7 +162,6 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
166162
self.validate_test_basics(
167163
_LOGGER,
168164
smile,
169-
smile_type="thermostat",
170165
smile_version=None,
171166
smile_legacy=None,
172167
)

‎tests/test_anna.py‎

Lines changed: 76 additions & 83 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,12 @@ async def test_connect_legacy_anna(self):
1919
server, smile, client = await self.connect_wrapper()
2020
assert smile.smile_hostname == "smile000000"
2121

22-
_LOGGER.info("Basics:")
23-
_LOGGER.info(" # Assert type = thermostat")
24-
assert smile.smile_type == "thermostat"
25-
_LOGGER.info(" # Assert version")
26-
assert smile.smile_version[0] == "1.8.22"
27-
_LOGGER.info(" # Assert legacy")
28-
assert smile._smile_legacy
22+
self.validate_test_basics(
23+
_LOGGER,
24+
smile,
25+
smile_version="1.8.22",
26+
smile_legacy=True,
27+
)
2928

3029
await self.device_test(smile, "2020-03-22 00:00:01", testdata)
3130
assert smile.gateway_id == "0000aaaa0000aaaa0000aaaa0000aa00"
@@ -72,13 +71,12 @@ async def test_connect_legacy_anna_2(self):
7271
server, smile, client = await self.connect_wrapper()
7372
assert smile.smile_hostname == "smile000000"
7473

75-
_LOGGER.info("Basics:")
76-
_LOGGER.info(" # Assert type = thermostat")
77-
assert smile.smile_type == "thermostat"
78-
_LOGGER.info(" # Assert version")
79-
assert smile.smile_version[0] == "1.8.22"
80-
_LOGGER.info(" # Assert legacy")
81-
assert smile._smile_legacy
74+
self.validate_test_basics(
75+
_LOGGER,
76+
smile,
77+
smile_version="1.8.22",
78+
smile_legacy=True,
79+
)
8280

8381
await self.device_test(smile, "2020-05-03 00:00:01", testdata)
8482

@@ -130,13 +128,11 @@ async def test_connect_anna_v4(self):
130128
server, smile, client = await self.connect_wrapper()
131129
assert smile.smile_hostname == "smile000000"
132130

133-
_LOGGER.info("Basics:")
134-
_LOGGER.info(" # Assert type = thermostat")
135-
assert smile.smile_type == "thermostat"
136-
_LOGGER.info(" # Assert version")
137-
assert smile.smile_version[0] == "4.0.15"
138-
_LOGGER.info(" # Assert no legacy")
139-
assert not smile._smile_legacy
131+
self.validate_test_basics(
132+
_LOGGER,
133+
smile,
134+
smile_version="4.0.15",
135+
)
140136

141137
await self.device_test(smile, "2020-04-05 00:00:01", testdata)
142138
assert smile.gateway_id == "0466eae8520144c78afb29628384edeb"
@@ -202,13 +198,11 @@ async def test_connect_anna_v4_dhw(self):
202198
server, smile, client = await self.connect_wrapper()
203199
assert smile.smile_hostname == "smile000000"
204200

205-
_LOGGER.info("Basics:")
206-
_LOGGER.info(" # Assert type = thermostat")
207-
assert smile.smile_type == "thermostat"
208-
_LOGGER.info(" # Assert version")
209-
assert smile.smile_version[0] == "4.0.15"
210-
_LOGGER.info(" # Assert no legacy")
211-
assert not smile._smile_legacy
201+
self.validate_test_basics(
202+
_LOGGER,
203+
smile,
204+
smile_version="4.0.15",
205+
)
212206

213207
await self.device_test(smile, "2020-04-05 00:00:01", testdata)
214208
assert smile._last_active["eb5309212bf5407bb143e5bfa3b18aee"] == "Standaard"
@@ -238,13 +232,11 @@ async def test_connect_anna_v4_no_tag(self):
238232
server, smile, client = await self.connect_wrapper()
239233
assert smile.smile_hostname == "smile000000"
240234

241-
_LOGGER.info("Basics:")
242-
_LOGGER.info(" # Assert type = thermostat")
243-
assert smile.smile_type == "thermostat"
244-
_LOGGER.info(" # Assert version")
245-
assert smile.smile_version[0] == "4.0.15"
246-
_LOGGER.info(" # Assert no legacy")
247-
assert not smile._smile_legacy
235+
self.validate_test_basics(
236+
_LOGGER,
237+
smile,
238+
smile_version="4.0.15",
239+
)
248240

249241
await self.device_test(smile, "2020-04-05 00:00:01", testdata)
250242
assert smile.device_items == 56
@@ -268,13 +260,11 @@ async def test_connect_anna_without_boiler_fw441(self):
268260
server, smile, client = await self.connect_wrapper()
269261
assert smile.smile_hostname == "smile000000"
270262

271-
_LOGGER.info("Basics:")
272-
_LOGGER.info(" # Assert type = thermostat")
273-
assert smile.smile_type == "thermostat"
274-
_LOGGER.info(" # Assert version")
275-
assert smile.smile_version[0] == "4.4.1"
276-
_LOGGER.info(" # Assert no legacy")
277-
assert not smile._smile_legacy
263+
self.validate_test_basics(
264+
_LOGGER,
265+
smile,
266+
smile_version="4.4.1",
267+
)
278268

279269
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
280270
assert smile._last_active["c34c6864216446528e95d88985e714cc"] == "Normaal"
@@ -298,13 +288,11 @@ async def test_connect_anna_heatpump_heating(self):
298288
server, smile, client = await self.connect_wrapper()
299289
assert smile.smile_hostname == "smile000000"
300290

301-
_LOGGER.info("Basics:")
302-
_LOGGER.info(" # Assert type = thermostat")
303-
assert smile.smile_type == "thermostat"
304-
_LOGGER.info(" # Assert version")
305-
assert smile.smile_version[0] == "4.0.15"
306-
_LOGGER.info(" # Assert no legacy")
307-
assert not smile._smile_legacy
291+
self.validate_test_basics(
292+
_LOGGER,
293+
smile,
294+
smile_version="4.0.15",
295+
)
308296

309297
await self.device_test(smile, "2020-04-12 00:00:01", testdata)
310298
assert smile.gateway_id == "015ae9ea3f964e668e490fa39da3870b"
@@ -354,13 +342,11 @@ async def test_connect_anna_heatpump_cooling(self):
354342
server, smile, client = await self.connect_wrapper()
355343
assert smile.smile_hostname == "smile000000"
356344

357-
_LOGGER.info("Basics:")
358-
_LOGGER.info(" # Assert type = thermostat")
359-
assert smile.smile_type == "thermostat"
360-
_LOGGER.info(" # Assert version")
361-
assert smile.smile_version[0] == "4.0.15"
362-
_LOGGER.info(" # Assert no legacy")
363-
assert not smile._smile_legacy
345+
self.validate_test_basics(
346+
_LOGGER,
347+
smile,
348+
smile_version="4.0.15",
349+
)
364350

365351
await self.device_test(smile, "2020-04-19 00:00:01", testdata)
366352
assert smile._last_active["c784ee9fdab44e1395b8dee7d7a497d5"] == "standaard"
@@ -400,11 +386,12 @@ async def test_connect_anna_heatpump_cooling_fake_firmware(self):
400386
server, smile, client = await self.connect_wrapper()
401387
assert smile.smile_hostname == "smile000000"
402388

403-
_LOGGER.info("Basics:")
404-
_LOGGER.info(" # Assert type = thermostat")
405-
assert smile.smile_type == "thermostat"
406-
_LOGGER.info(" # Assert version")
407-
assert smile.smile_version[0] == "4.10.10"
389+
self.validate_test_basics(
390+
_LOGGER,
391+
smile,
392+
smile_version="4.10.10",
393+
smile_legacy=None,
394+
)
408395

409396
await self.device_test(smile, "2020-04-19 00:00:01", testdata)
410397
assert smile.device_items == 63
@@ -424,13 +411,11 @@ async def test_connect_anna_elga_2(self):
424411
server, smile, client = await self.connect_wrapper()
425412
assert smile.smile_hostname == "smile000000"
426413

427-
_LOGGER.info("Basics:")
428-
_LOGGER.info(" # Assert type = thermostat")
429-
assert smile.smile_type == "thermostat"
430-
_LOGGER.info(" # Assert version")
431-
assert smile.smile_version[0] == "4.2.1"
432-
_LOGGER.info(" # Assert no legacy")
433-
assert not smile._smile_legacy
414+
self.validate_test_basics(
415+
_LOGGER,
416+
smile,
417+
smile_version="4.2.1",
418+
)
434419

435420
await self.device_test(smile, "2022-03-13 00:00:01", testdata)
436421
assert (
@@ -480,12 +465,11 @@ async def test_connect_anna_elga_2_cooling(self):
480465
server, smile, client = await self.connect_wrapper()
481466
assert smile.smile_hostname == "smile000000"
482467

483-
_LOGGER.info("Basics:")
484-
_LOGGER.info(" # Assert type = thermostat")
485-
assert smile.smile_type == "thermostat"
486-
_LOGGER.info(" # Assert version")
487-
assert smile.smile_version[0] == "4.2.1"
488-
_LOGGER.info(" # Assert no legacy")
468+
self.validate_test_basics(
469+
_LOGGER,
470+
smile,
471+
smile_version="4.2.1",
472+
)
489473
assert not smile._smile_legacy
490474

491475
await self.device_test(smile, "2022-03-10 00:00:01", testdata)
@@ -512,9 +496,12 @@ async def test_connect_anna_loria_heating_idle(self):
512496
server, smile, client = await self.connect_wrapper()
513497
assert smile.smile_hostname == "smile000000"
514498

515-
_LOGGER.info("Basics:")
516-
_LOGGER.info(" # Assert type = thermostat")
517-
assert smile.smile_type == "thermostat"
499+
self.validate_test_basics(
500+
_LOGGER,
501+
smile,
502+
smile_version=None,
503+
smile_legacy=None,
504+
)
518505

519506
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
520507
assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
@@ -561,9 +548,12 @@ async def test_connect_anna_loria_cooling_active(self):
561548
server, smile, client = await self.connect_wrapper()
562549
assert smile.smile_hostname == "smile000000"
563550

564-
_LOGGER.info("Basics:")
565-
_LOGGER.info(" # Assert type = thermostat")
566-
assert smile.smile_type == "thermostat"
551+
self.validate_test_basics(
552+
_LOGGER,
553+
smile,
554+
smile_version=None,
555+
smile_legacy=None,
556+
)
567557

568558
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
569559
assert smile._last_active["15da035090b847e7a21f93e08c015ebc"] == "Winter"
@@ -583,9 +573,12 @@ async def test_connect_anna_loria_driessens(self):
583573
server, smile, client = await self.connect_wrapper()
584574
assert smile.smile_hostname == "smile000000"
585575

586-
_LOGGER.info("Basics:")
587-
_LOGGER.info(" # Assert type = thermostat")
588-
assert smile.smile_type == "thermostat"
576+
self.validate_test_basics(
577+
_LOGGER,
578+
smile,
579+
smile_version=None,
580+
smile_legacy=None,
581+
)
589582

590583
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
591584
assert smile.device_items == 63

‎tests/test_combined.py‎

Lines changed: 16 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ async def test_connect_adam_plus_anna(self):
2121
server, smile, client = await self.connect_wrapper()
2222
assert smile.smile_hostname == "smile000000"
2323

24-
_LOGGER.info("Basics:")
25-
_LOGGER.info(" # Assert type = thermostat")
26-
assert smile.smile_type == "thermostat"
27-
_LOGGER.info(" # Assert version")
28-
assert smile.smile_version[0] == "3.0.15"
29-
_LOGGER.info(" # Assert legacy")
30-
assert not smile._smile_legacy
24+
self.validate_test_basics(
25+
_LOGGER,
26+
smile,
27+
smile_version="3.0.15",
28+
)
3129

3230
await self.device_test(smile, "2020-03-22 00:00:01", testdata)
3331
assert smile.gateway_id == "b128b4bbbd1f47e9bf4d756e8fb5ee94"
@@ -76,13 +74,11 @@ async def test_connect_adam_plus_anna_copy_with_error_domain_added(self):
7674
server, smile, client = await self.connect_wrapper()
7775
assert smile.smile_hostname == "smile000000"
7876

79-
_LOGGER.info("Basics:")
80-
_LOGGER.info(" # Assert type = thermostat")
81-
assert smile.smile_type == "thermostat"
82-
_LOGGER.info(" # Assert version")
83-
assert smile.smile_version[0] == "3.0.23"
84-
_LOGGER.info(" # Assert legacy")
85-
assert not smile._smile_legacy
77+
self.validate_test_basics(
78+
_LOGGER,
79+
smile,
80+
smile_version="3.0.23",
81+
)
8682

8783
await self.device_test(smile, "2020-03-22 00:00:01", testdata)
8884
assert smile.device_items == 70
@@ -101,11 +97,12 @@ async def test_connect_adam_plus_anna_new(self):
10197
server, smile, client = await self.connect_wrapper()
10298
assert smile.smile_hostname == "smile000000"
10399

104-
_LOGGER.info("Basics:")
105-
_LOGGER.info(" # Assert version")
106-
assert smile.smile_version[0] == "3.7.8"
107-
_LOGGER.info(" # Assert legacy")
108-
assert not smile._smile_legacy
100+
self.validate_test_basics(
101+
_LOGGER,
102+
smile,
103+
smile_type=None,
104+
smile_version="3.7.8",
105+
)
109106

110107
await self.device_test(smile, "2023-12-17 00:00:01", testdata)
111108
assert smile.gateway_id == "da224107914542988a88561b4452b0f6"

‎tests/test_init.py‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -687,7 +687,9 @@ async def tinker_temp_offset(smile, dev_id):
687687
return False
688688

689689
@staticmethod
690-
def validate_test_basics(_LOGGER, smile, smile_type, smile_version, smile_legacy):
690+
def validate_test_basics(
691+
_LOGGER, smile, smile_type="thermostat", smile_version=None, smile_legacy=False
692+
):
691693
"""Produce visual assertion of components base validation."""
692694
_LOGGER.info("Basics:")
693695
if smile_type:

0 commit comments

Comments
 (0)