Add Alexa.ModeController to cover entities, adds open/close utterances! (#28309)

* Added Alexa.ModeController to cover entities.

* Added synonyms for directives.

* Updated tests for additional synonyms for directives.

* Added Alexa.ModeController to cover entities.

* Sacrifice unused variable in split() to please the Pylint gods.

* Removed duplicate instance check.

* Corrected variable name, clarified definition and consistency.

* Changed list to tuple.
This commit is contained in:
ochlocracy authored and Paulus Schoutsen committed 2019-11-25 15:07:33 -08:00
1 parent dc8c085872
commit 5ea5db32d2
4 files changed
+189 -9

No files matched your search

+117 -2
View File
@@ -565,7 +565,7 @@ async def test_direction_fan(hass):
},
} in supported_modes
call, _ = await assert_request_calls_service(
call, msg = await assert_request_calls_service(
"Alexa.ModeController",
"SetMode",
"fan#test_4",
@@ -575,6 +575,25 @@ async def test_direction_fan(hass):
instance="fan.direction",
)
assert call.data["direction"] == "reverse"
properties = msg["context"]["properties"][0]
assert properties["name"] == "mode"
assert properties["namespace"] == "Alexa.ModeController"
assert properties["value"] == "direction.reverse"
call, msg = await assert_request_calls_service(
"Alexa.ModeController",
"SetMode",
"fan#test_4",
"fan.set_direction",
hass,
payload={"mode": "direction.forward"},
instance="fan.direction",
)
assert call.data["direction"] == "forward"
properties = msg["context"]["properties"][0]
assert properties["name"] == "mode"
assert properties["namespace"] == "Alexa.ModeController"
assert properties["value"] == "direction.forward"
# Test for AdjustMode instance=None Error coverage
with pytest.raises(AssertionError):
@@ -1190,11 +1209,12 @@ async def test_cover(hass):
appliance = await discovery_test(device, hass)
assert appliance["endpointId"] == "cover#test"
assert appliance["displayCategories"][0] == "DOOR"
assert appliance["displayCategories"][0] == "OTHER"
assert appliance["friendlyName"] == "Test cover"
assert_endpoint_capabilities(
appliance,
"Alexa.ModeController",
"Alexa.PercentageController",
"Alexa.PowerController",
"Alexa.EndpointHealth",
@@ -2076,3 +2096,98 @@ async def test_mode_unsupported_domain(hass):
assert msg["header"]["name"] == "ErrorResponse"
assert msg["header"]["namespace"] == "Alexa"
assert msg["payload"]["type"] == "INVALID_DIRECTIVE"
async def test_cover_position(hass):
"""Test cover position mode discovery."""
device = (
"cover.test",
"off",
{"friendly_name": "Test cover", "supported_features": 255, "position": 30},
)
appliance = await discovery_test(device, hass)
assert appliance["endpointId"] == "cover#test"
assert appliance["displayCategories"][0] == "OTHER"
assert appliance["friendlyName"] == "Test cover"
capabilities = assert_endpoint_capabilities(
appliance,
"Alexa.ModeController",
"Alexa.PercentageController",
"Alexa.PowerController",
"Alexa.EndpointHealth",
)
mode_capability = get_capability(capabilities, "Alexa.ModeController")
assert mode_capability is not None
assert mode_capability["instance"] == "cover.position"
properties = mode_capability["properties"]
assert properties["nonControllable"] is False
assert {"name": "mode"} in properties["supported"]
capability_resources = mode_capability["capabilityResources"]
assert capability_resources is not None
assert {
"@type": "asset",
"value": {"assetId": "Alexa.Setting.Mode"},
} in capability_resources["friendlyNames"]
configuration = mode_capability["configuration"]
assert configuration is not None
assert configuration["ordered"] is False
supported_modes = configuration["supportedModes"]
assert supported_modes is not None
assert {
"value": "position.open",
"modeResources": {
"friendlyNames": [
{"@type": "text", "value": {"text": "open", "locale": "en-US"}},
{"@type": "text", "value": {"text": "opened", "locale": "en-US"}},
{"@type": "text", "value": {"text": "raise", "locale": "en-US"}},
{"@type": "text", "value": {"text": "raised", "locale": "en-US"}},
]
},
} in supported_modes
assert {
"value": "position.closed",
"modeResources": {
"friendlyNames": [
{"@type": "text", "value": {"text": "close", "locale": "en-US"}},
{"@type": "text", "value": {"text": "closed", "locale": "en-US"}},
{"@type": "text", "value": {"text": "shut", "locale": "en-US"}},
{"@type": "text", "value": {"text": "lower", "locale": "en-US"}},
{"@type": "text", "value": {"text": "lowered", "locale": "en-US"}},
]
},
} in supported_modes
call, msg = await assert_request_calls_service(
"Alexa.ModeController",
"SetMode",
"cover#test",
"cover.close_cover",
hass,
payload={"mode": "position.closed"},
instance="cover.position",
)
properties = msg["context"]["properties"][0]
assert properties["name"] == "mode"
assert properties["namespace"] == "Alexa.ModeController"
assert properties["value"] == "position.closed"
call, msg = await assert_request_calls_service(
"Alexa.ModeController",
"SetMode",
"cover#test",
"cover.open_cover",
hass,
payload={"mode": "position.open"},
instance="cover.position",
)
properties = msg["context"]["properties"][0]
assert properties["name"] == "mode"
assert properties["namespace"] == "Alexa.ModeController"
assert properties["value"] == "position.open"