Skip to content

Commit

Permalink
update tests to work with the updates on upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
Lennart99 committed Dec 17, 2020
1 parent 01e4716 commit b287a60
Showing 1 changed file with 84 additions and 36 deletions.
120 changes: 84 additions & 36 deletions test/devices_tests/light_test.py
Expand Up @@ -295,35 +295,35 @@ def test_sync_individual_color(self):
test_telegrams = [
Telegram(
destination_address=GroupAddress("1/1/2"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/4"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/6"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/8"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/10"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/12"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/14"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
Telegram(
destination_address=GroupAddress("1/1/16"),
telegramtype=TelegramType.GROUP_READ,
payload=GroupValueRead(),
),
]

Expand Down Expand Up @@ -437,16 +437,20 @@ def test_set_on_individual_color(self):

test_telegrams = [
Telegram(
destination_address=GroupAddress("1/1/1"), payload=DPTBinary(True)
destination_address=GroupAddress("1/1/1"),
payload=GroupValueWrite(DPTBinary(True)),
),
Telegram(
destination_address=GroupAddress("1/1/5"), payload=DPTBinary(True)
destination_address=GroupAddress("1/1/5"),
payload=GroupValueWrite(DPTBinary(True)),
),
Telegram(
destination_address=GroupAddress("1/1/9"), payload=DPTBinary(True)
destination_address=GroupAddress("1/1/9"),
payload=GroupValueWrite(DPTBinary(True)),
),
Telegram(
destination_address=GroupAddress("1/1/13"), payload=DPTBinary(True)
destination_address=GroupAddress("1/1/13"),
payload=GroupValueWrite(DPTBinary(True)),
),
]
self.assertEqual(len(set(telegrams)), 4)
Expand Down Expand Up @@ -505,16 +509,20 @@ def test_set_off_individual_color(self):

test_telegrams = [
Telegram(
destination_address=GroupAddress("1/1/1"), payload=DPTBinary(False)
destination_address=GroupAddress("1/1/1"),
payload=GroupValueWrite(DPTBinary(False)),
),
Telegram(
destination_address=GroupAddress("1/1/5"), payload=DPTBinary(False)
destination_address=GroupAddress("1/1/5"),
payload=GroupValueWrite(DPTBinary(False)),
),
Telegram(
destination_address=GroupAddress("1/1/9"), payload=DPTBinary(False)
destination_address=GroupAddress("1/1/9"),
payload=GroupValueWrite(DPTBinary(False)),
),
Telegram(
destination_address=GroupAddress("1/1/13"), payload=DPTBinary(False)
destination_address=GroupAddress("1/1/13"),
payload=GroupValueWrite(DPTBinary(False)),
),
]
self.assertEqual(len(set(telegrams)), 4)
Expand Down Expand Up @@ -616,9 +624,18 @@ def test_set_individual_color(self):
telegrams = [xknx.telegrams.get_nowait() for _ in range(3)]

test_telegrams = [
Telegram(destination_address=GroupAddress("1/1/3"), payload=DPTArray(23)),
Telegram(destination_address=GroupAddress("1/1/7"), payload=DPTArray(24)),
Telegram(destination_address=GroupAddress("1/1/11"), payload=DPTArray(25)),
Telegram(
destination_address=GroupAddress("1/1/3"),
payload=GroupValueWrite(DPTArray(23)),
),
Telegram(
destination_address=GroupAddress("1/1/7"),
payload=GroupValueWrite(DPTArray(24)),
),
Telegram(
destination_address=GroupAddress("1/1/11"),
payload=GroupValueWrite(DPTArray(25)),
),
]

self.assertEqual(len(set(telegrams)), 3)
Expand All @@ -627,21 +644,24 @@ def test_set_individual_color(self):
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/4"), payload=DPTArray(23)
destination_address=GroupAddress("1/1/4"),
payload=GroupValueWrite(DPTArray(23)),
)
)
)
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/8"), payload=DPTArray(24)
destination_address=GroupAddress("1/1/8"),
payload=GroupValueWrite(DPTArray(24)),
)
)
)
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/12"), payload=DPTArray(25)
destination_address=GroupAddress("1/1/12"),
payload=GroupValueWrite(DPTArray(25)),
)
)
)
Expand Down Expand Up @@ -735,10 +755,22 @@ def test_set_individual_color_rgbw(self):
telegrams = [xknx.telegrams.get_nowait() for _ in range(4)]

test_telegrams = [
Telegram(destination_address=GroupAddress("1/1/3"), payload=DPTArray(23)),
Telegram(destination_address=GroupAddress("1/1/7"), payload=DPTArray(24)),
Telegram(destination_address=GroupAddress("1/1/11"), payload=DPTArray(25)),
Telegram(destination_address=GroupAddress("1/1/15"), payload=DPTArray(26)),
Telegram(
destination_address=GroupAddress("1/1/3"),
payload=GroupValueWrite(DPTArray(23)),
),
Telegram(
destination_address=GroupAddress("1/1/7"),
payload=GroupValueWrite(DPTArray(24)),
),
Telegram(
destination_address=GroupAddress("1/1/11"),
payload=GroupValueWrite(DPTArray(25)),
),
Telegram(
destination_address=GroupAddress("1/1/15"),
payload=GroupValueWrite(DPTArray(26)),
),
]

self.assertEqual(len(set(telegrams)), 4)
Expand All @@ -747,28 +779,32 @@ def test_set_individual_color_rgbw(self):
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/4"), payload=DPTArray(23)
destination_address=GroupAddress("1/1/4"),
payload=GroupValueWrite(DPTArray(23)),
)
)
)
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/8"), payload=DPTArray(24)
destination_address=GroupAddress("1/1/8"),
payload=GroupValueWrite(DPTArray(24)),
)
)
)
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/12"), payload=DPTArray(25)
destination_address=GroupAddress("1/1/12"),
payload=GroupValueWrite(DPTArray(25)),
)
)
)
self.loop.run_until_complete(
xknx.devices.process(
Telegram(
destination_address=GroupAddress("1/1/16"), payload=DPTArray(26)
destination_address=GroupAddress("1/1/16"),
payload=GroupValueWrite(DPTArray(26)),
)
)
)
Expand Down Expand Up @@ -929,13 +965,15 @@ def test_process_color_switch(self):
self.assertEqual(light.state, None)

telegram = Telegram(
destination_address=GroupAddress("1/1/2"), payload=DPTBinary(True)
destination_address=GroupAddress("1/1/2"),
payload=GroupValueWrite(DPTBinary(True)),
)
self.loop.run_until_complete(light.process(telegram))
self.assertEqual(light.state, True)

telegram = Telegram(
destination_address=GroupAddress("1/1/2"), payload=DPTBinary(False)
destination_address=GroupAddress("1/1/2"),
payload=GroupValueWrite(DPTBinary(False)),
)
self.loop.run_until_complete(light.process(telegram))
self.assertEqual(light.state, False)
Expand Down Expand Up @@ -1057,9 +1095,18 @@ def test_process_individual_color(self):
self.assertEqual(light.current_color, (None, None))

telegrams = [
Telegram(destination_address=GroupAddress("1/1/4"), payload=DPTArray(42)),
Telegram(destination_address=GroupAddress("1/1/8"), payload=DPTArray(43)),
Telegram(destination_address=GroupAddress("1/1/12"), payload=DPTArray(44)),
Telegram(
destination_address=GroupAddress("1/1/4"),
payload=GroupValueWrite(DPTArray(42)),
),
Telegram(
destination_address=GroupAddress("1/1/8"),
payload=GroupValueWrite(DPTArray(43)),
),
Telegram(
destination_address=GroupAddress("1/1/12"),
payload=GroupValueWrite(DPTArray(44)),
),
]

for telegram in telegrams:
Expand Down Expand Up @@ -1109,7 +1156,8 @@ def test_process_individual_color_rgbw(self):
)
self.assertEqual(light.current_color, (None, None))
telegram = Telegram(
destination_address=GroupAddress("1/1/16"), payload=DPTArray(42)
destination_address=GroupAddress("1/1/16"),
payload=GroupValueWrite(DPTArray(42)),
)
self.loop.run_until_complete(light.process(telegram))
self.assertEqual(light.current_color, (None, 42))
Expand Down

0 comments on commit b287a60

Please sign in to comment.