Skip to content

Commit 6a170d0

Browse files
CoMPaTechCoMPaTech
committed
Sonarcloud smell resolves for Adam (and cleanup)
1 parent bb5085b commit 6a170d0

File tree

2 files changed

+74
-84
lines changed

2 files changed

+74
-84
lines changed

‎tests/test_adam.py‎

Lines changed: 57 additions & 84 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,12 @@
66

77
SMILE_TYPE = "adam"
88

9+
# Reoccuring constants
10+
BADKAMER_SCHEMA = "Badkamer Schema"
11+
CV_JESSIE = "CV Jessie"
12+
GF7_WOONKAMER = "GF7 Woonkamer"
13+
WERKDAG_SCHEMA = "Werkdag schema"
14+
915

1016
class TestPlugwiseAdam(TestPlugwise): # pylint: disable=attribute-defined-outside-init
1117
"""Tests for Adam standalone, i.e. not combined with Anna or Jip."""
@@ -16,46 +22,35 @@ async def test_connect_adam_zone_per_device(self):
1622
self.smile_setup = "adam_zone_per_device"
1723

1824
testdata = self.load_testdata(SMILE_TYPE, self.smile_setup)
19-
_LOGGER.error("HOI")
20-
_LOGGER.error(testdata)
21-
2225
server, smile, client = await self.connect_wrapper()
2326
assert smile.smile_hostname == "smile000000"
2427

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

3336
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
3437
assert smile.gateway_id == "fe799307f1624099878210aa0b9f1475"
35-
assert (
36-
smile._last_active["12493538af164a409c6a1c79e38afe1c"] == "Badkamer Schema"
37-
)
38-
assert (
39-
smile._last_active["c50f167537524366a5af7aa3942feb1e"] == "GF7 Woonkamer"
40-
)
41-
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == "CV Jessie"
42-
assert (
43-
smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == "Badkamer Schema"
44-
)
45-
assert (
46-
smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == "Badkamer Schema"
47-
)
38+
assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
39+
assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
40+
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
41+
assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
42+
assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
4843
assert smile.device_items == 315
4944

5045
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
5146
await smile.delete_notification()
5247

5348
result = await self.tinker_thermostat(
54-
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
49+
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
5550
)
5651
assert result
5752
result = await self.tinker_thermostat(
58-
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
53+
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
5954
)
6055
assert result
6156
switch_change = await self.tinker_switch(
@@ -70,23 +65,25 @@ async def test_connect_adam_zone_per_device(self):
7065
result = await self.tinker_thermostat(
7166
smile,
7267
"c50f167537524366a5af7aa3942feb1e",
73-
good_schedules=["GF7 Woonkamer"],
68+
good_schedules=[GF7_WOONKAMER],
7469
unhappy=True,
7570
)
7671
assert result
7772
result = await self.tinker_thermostat(
7873
smile,
7974
"82fa13f017d240daa0d0ea1775420f24",
80-
good_schedules=["CV Jessie"],
75+
good_schedules=[CV_JESSIE],
8176
unhappy=True,
8277
)
8378
assert result
8479

8580
try:
8681
await smile.delete_notification()
87-
assert False # pragma: no cover
82+
NotificationDeletion = False # pragma: no cover
8883
except pw_exceptions.ResponseError:
89-
assert True
84+
NotificationDeletion = True
85+
86+
assert NotificationDeletion
9087

9188
await smile.close_connection()
9289
await self.disconnect(server, client)
@@ -100,38 +97,30 @@ async def test_connect_adam_multiple_devices_per_zone(self):
10097
server, smile, client = await self.connect_wrapper()
10198
assert smile.smile_hostname == "smile000000"
10299

103-
_LOGGER.info("Basics:")
104-
_LOGGER.info(" # Assert type = thermostat")
105-
assert smile.smile_type == "thermostat"
106-
_LOGGER.info(" # Assert version")
107-
assert smile.smile_version[0] == "3.0.15"
108-
_LOGGER.info(" # Assert legacy")
109-
assert not smile._smile_legacy
100+
self.validate_test_basics(
101+
_LOGGER,
102+
smile,
103+
smile_type="thermostat",
104+
smile_version="3.0.15",
105+
smile_legacy=False,
106+
)
110107

111108
await self.device_test(smile, "2022-05-16 00:00:01", testdata)
112-
assert (
113-
smile._last_active["12493538af164a409c6a1c79e38afe1c"] == "Badkamer Schema"
114-
)
115-
assert (
116-
smile._last_active["c50f167537524366a5af7aa3942feb1e"] == "GF7 Woonkamer"
117-
)
118-
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == "CV Jessie"
119-
assert (
120-
smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == "Badkamer Schema"
121-
)
122-
assert (
123-
smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == "Badkamer Schema"
124-
)
109+
assert smile._last_active["12493538af164a409c6a1c79e38afe1c"] == BADKAMER_SCHEMA
110+
assert smile._last_active["c50f167537524366a5af7aa3942feb1e"] == GF7_WOONKAMER
111+
assert smile._last_active["82fa13f017d240daa0d0ea1775420f24"] == CV_JESSIE
112+
assert smile._last_active["08963fec7c53423ca5680aa4cb502c63"] == BADKAMER_SCHEMA
113+
assert smile._last_active["446ac08dd04d4eff8ac57489757b7314"] == BADKAMER_SCHEMA
125114
assert smile.device_items == 315
126115

127116
assert "af82e4ccf9c548528166d38e560662a4" in self.notifications
128117

129118
result = await self.tinker_thermostat(
130-
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=["GF7 Woonkamer"]
119+
smile, "c50f167537524366a5af7aa3942feb1e", good_schedules=[GF7_WOONKAMER]
131120
)
132121
assert result
133122
result = await self.tinker_thermostat(
134-
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=["CV Jessie"]
123+
smile, "82fa13f017d240daa0d0ea1775420f24", good_schedules=[CV_JESSIE]
135124
)
136125
assert result
137126
switch_change = await self.tinker_switch(
@@ -150,36 +139,16 @@ async def test_adam_heatpump_cooling(self):
150139
server, smile, client = await self.connect_wrapper()
151140

152141
await self.device_test(smile, "2022-01-02 00:00:01", testdata)
153-
assert (
154-
smile._last_active["b52908550469425b812c87f766fe5303"] == "Werkdag schema"
155-
)
156-
assert (
157-
smile._last_active["20e735858f8146cead98b873177a4f99"] == "Werkdag schema"
158-
)
159-
assert (
160-
smile._last_active["e39529c79ab54fda9bed26cfc0447546"] == "Werkdag schema"
161-
)
162-
assert (
163-
smile._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == "Werkdag schema"
164-
)
165-
assert (
166-
smile._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == "Werkdag schema"
167-
)
168-
assert (
169-
smile._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == "Werkdag schema"
170-
)
171-
assert (
172-
smile._last_active["04b15f6e884448288f811d29fb7b1b30"] == "Werkdag schema"
173-
)
174-
assert (
175-
smile._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == "Werkdag schema"
176-
)
177-
assert (
178-
smile._last_active["8cf650a4c10c44819e426bed406aec34"] == "Werkdag schema"
179-
)
180-
assert (
181-
smile._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == "Werkdag schema"
182-
)
142+
assert smile._last_active["b52908550469425b812c87f766fe5303"] == WERKDAG_SCHEMA
143+
assert smile._last_active["20e735858f8146cead98b873177a4f99"] == WERKDAG_SCHEMA
144+
assert smile._last_active["e39529c79ab54fda9bed26cfc0447546"] == WERKDAG_SCHEMA
145+
assert smile._last_active["9a27714b970547ee9a6bdadc2b815ad5"] == WERKDAG_SCHEMA
146+
assert smile._last_active["93ac3f7bf25342f58cbb77c4a99ac0b3"] == WERKDAG_SCHEMA
147+
assert smile._last_active["fa5fa6b34f6b40a0972988b20e888ed4"] == WERKDAG_SCHEMA
148+
assert smile._last_active["04b15f6e884448288f811d29fb7b1b30"] == WERKDAG_SCHEMA
149+
assert smile._last_active["a562019b0b1f47a4bde8ebe3dbe3e8a9"] == WERKDAG_SCHEMA
150+
assert smile._last_active["8cf650a4c10c44819e426bed406aec34"] == WERKDAG_SCHEMA
151+
assert smile._last_active["5cc21042f87f4b4c94ccb5537c47a53f"] == WERKDAG_SCHEMA
183152
assert smile.device_items == 413
184153

185154
await smile.close_connection()
@@ -194,9 +163,13 @@ async def test_connect_adam_onoff_cooling_fake_firmware(self):
194163
server, smile, client = await self.connect_wrapper()
195164
assert smile.smile_hostname == "smile000000"
196165

197-
_LOGGER.info("Basics:")
198-
_LOGGER.info(" # Assert type = thermostat")
199-
assert smile.smile_type == "thermostat"
166+
self.validate_test_basics(
167+
_LOGGER,
168+
smile,
169+
smile_type="thermostat",
170+
smile_version=None,
171+
smile_legacy=None,
172+
)
200173

201174
await self.device_test(smile, "2022-01-02 00:00:01", testdata)
202175
assert smile.device_items == 54

‎tests/test_init.py‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,6 +686,23 @@ async def tinker_temp_offset(smile, dev_id):
686686
_LOGGER.info(" + failed as intended")
687687
return False
688688

689+
@staticmethod
690+
def validate_test_basics(_LOGGER, smile, smile_type, smile_version, smile_legacy):
691+
"""Produce visual assertion of components base validation."""
692+
_LOGGER.info("Basics:")
693+
if smile_type:
694+
_LOGGER.info(f" # Assert type matching {smile_type}")
695+
assert smile.smile_type == smile_type
696+
if smile_version:
697+
_LOGGER.info(f" # Assert version matching '{smile_version}")
698+
assert smile.smile_version[0] == smile_version
699+
if smile_version:
700+
_LOGGER.info(f" # Assert legacy {smile_legacy}")
701+
if smile_legacy:
702+
assert smile._smile_legacy
703+
else:
704+
assert not smile._smile_legacy
705+
689706
class PlugwiseTestError(Exception):
690707
"""Plugwise test exceptions class."""
691708

0 commit comments

Comments
 (0)