Rename Android TV to Android Debug Bridge (#90657)

* Rename Android TV to Android debug bridge

* More renaming
This commit is contained in:
tronikos 2023-04-02 11:22:16 -07:00 committed by GitHub
parent 17270979e6
commit b52fab0f6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 80 additions and 79 deletions

View file

@ -95,8 +95,8 @@ MSG_RECONNECT = {
SHELL_RESPONSE_OFF = ""
SHELL_RESPONSE_STANDBY = "1"
# Android TV device with Python ADB implementation
CONFIG_ANDROIDTV_PYTHON_ADB = {
# Android device with Python ADB implementation
CONFIG_ANDROID_PYTHON_ADB = {
ADB_PATCH_KEY: patchers.KEY_PYTHON,
TEST_ENTITY_NAME: f"{PREFIX_ANDROIDTV} {HOST}",
DOMAIN: {
@ -106,28 +106,28 @@ CONFIG_ANDROIDTV_PYTHON_ADB = {
},
}
# Android TV device with Python ADB implementation imported from YAML
CONFIG_ANDROIDTV_PYTHON_ADB_YAML = {
# Android device with Python ADB implementation imported from YAML
CONFIG_ANDROID_PYTHON_ADB_YAML = {
ADB_PATCH_KEY: patchers.KEY_PYTHON,
TEST_ENTITY_NAME: "ADB yaml import",
DOMAIN: {
CONF_NAME: "ADB yaml import",
**CONFIG_ANDROIDTV_PYTHON_ADB[DOMAIN],
**CONFIG_ANDROID_PYTHON_ADB[DOMAIN],
},
}
# Android TV device with Python ADB implementation with custom adbkey
CONFIG_ANDROIDTV_PYTHON_ADB_KEY = {
# Android device with Python ADB implementation with custom adbkey
CONFIG_ANDROID_PYTHON_ADB_KEY = {
ADB_PATCH_KEY: patchers.KEY_PYTHON,
TEST_ENTITY_NAME: CONFIG_ANDROIDTV_PYTHON_ADB[TEST_ENTITY_NAME],
TEST_ENTITY_NAME: CONFIG_ANDROID_PYTHON_ADB[TEST_ENTITY_NAME],
DOMAIN: {
**CONFIG_ANDROIDTV_PYTHON_ADB[DOMAIN],
**CONFIG_ANDROID_PYTHON_ADB[DOMAIN],
CONF_ADBKEY: "user_provided_adbkey",
},
}
# Android TV device with ADB server
CONFIG_ANDROIDTV_ADB_SERVER = {
# Android device with ADB server
CONFIG_ANDROID_ADB_SERVER = {
ADB_PATCH_KEY: patchers.KEY_SERVER,
TEST_ENTITY_NAME: f"{PREFIX_ANDROIDTV} {HOST}",
DOMAIN: {
@ -163,7 +163,7 @@ CONFIG_FIRETV_ADB_SERVER = {
},
}
CONFIG_ANDROIDTV_DEFAULT = CONFIG_ANDROIDTV_PYTHON_ADB
CONFIG_ANDROID_DEFAULT = CONFIG_ANDROID_PYTHON_ADB
CONFIG_FIRETV_DEFAULT = CONFIG_FIRETV_PYTHON_ADB
@ -213,10 +213,10 @@ def _setup(config):
@pytest.mark.parametrize(
"config",
[
CONFIG_ANDROIDTV_PYTHON_ADB,
CONFIG_ANDROIDTV_PYTHON_ADB_YAML,
CONFIG_ANDROID_PYTHON_ADB,
CONFIG_ANDROID_PYTHON_ADB_YAML,
CONFIG_FIRETV_PYTHON_ADB,
CONFIG_ANDROIDTV_ADB_SERVER,
CONFIG_ANDROID_ADB_SERVER,
CONFIG_FIRETV_ADB_SERVER,
],
)
@ -275,9 +275,9 @@ async def test_reconnect(
@pytest.mark.parametrize(
"config",
[
CONFIG_ANDROIDTV_PYTHON_ADB,
CONFIG_ANDROID_PYTHON_ADB,
CONFIG_FIRETV_PYTHON_ADB,
CONFIG_ANDROIDTV_ADB_SERVER,
CONFIG_ANDROID_ADB_SERVER,
CONFIG_FIRETV_ADB_SERVER,
],
)
@ -313,7 +313,7 @@ async def test_adb_shell_returns_none(
async def test_setup_with_adbkey(hass: HomeAssistant) -> None:
"""Test that setup succeeds when using an ADB key."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_PYTHON_ADB_KEY)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_PYTHON_ADB_KEY)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -331,12 +331,12 @@ async def test_setup_with_adbkey(hass: HomeAssistant) -> None:
@pytest.mark.parametrize(
"config",
[
CONFIG_ANDROIDTV_DEFAULT,
CONFIG_ANDROID_DEFAULT,
CONFIG_FIRETV_DEFAULT,
],
)
async def test_sources(hass: HomeAssistant, config: dict[str, Any]) -> None:
"""Test that sources (i.e., apps) are handled correctly for Android TV and Fire TV devices."""
"""Test that sources (i.e., apps) are handled correctly for Android and Fire TV devices."""
conf_apps = {
"com.app.test1": "TEST 1",
"com.app.test3": None,
@ -397,7 +397,7 @@ async def test_sources(hass: HomeAssistant, config: dict[str, Any]) -> None:
@pytest.mark.parametrize(
("config", "expected_sources"),
[
(CONFIG_ANDROIDTV_DEFAULT, ["TEST 1"]),
(CONFIG_ANDROID_DEFAULT, ["TEST 1"]),
(CONFIG_FIRETV_DEFAULT, ["TEST 1"]),
],
)
@ -503,7 +503,7 @@ async def test_select_source_androidtv(
"com.app.test3": None,
}
await _test_select_source(
hass, CONFIG_ANDROIDTV_DEFAULT, conf_apps, source, expected_arg, method_patch
hass, CONFIG_ANDROID_DEFAULT, conf_apps, source, expected_arg, method_patch
)
@ -517,7 +517,7 @@ async def test_androidtv_select_source_overridden_app_name(hass: HomeAssistant)
assert "com.youtube.test" not in ANDROIDTV_APPS
await _test_select_source(
hass,
CONFIG_ANDROIDTV_PYTHON_ADB,
CONFIG_ANDROID_PYTHON_ADB,
conf_apps,
"YouTube",
"com.youtube.test",
@ -554,9 +554,9 @@ async def test_select_source_firetv(
@pytest.mark.parametrize(
("config", "connect"),
[
(CONFIG_ANDROIDTV_DEFAULT, False),
(CONFIG_ANDROID_DEFAULT, False),
(CONFIG_FIRETV_DEFAULT, False),
(CONFIG_ANDROIDTV_DEFAULT, True),
(CONFIG_ANDROID_DEFAULT, True),
(CONFIG_FIRETV_DEFAULT, True),
],
)
@ -581,7 +581,7 @@ async def test_setup_fail(
async def test_adb_command(hass: HomeAssistant) -> None:
"""Test sending a command via the `androidtv.adb_command` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
command = "test command"
response = "test response"
@ -610,7 +610,7 @@ async def test_adb_command(hass: HomeAssistant) -> None:
async def test_adb_command_unicode_decode_error(hass: HomeAssistant) -> None:
"""Test sending a command via the `androidtv.adb_command` service that raises a UnicodeDecodeError exception."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
command = "test command"
response = b"test response"
@ -639,7 +639,7 @@ async def test_adb_command_unicode_decode_error(hass: HomeAssistant) -> None:
async def test_adb_command_key(hass: HomeAssistant) -> None:
"""Test sending a key command via the `androidtv.adb_command` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
command = "HOME"
response = None
@ -668,7 +668,7 @@ async def test_adb_command_key(hass: HomeAssistant) -> None:
async def test_adb_command_get_properties(hass: HomeAssistant) -> None:
"""Test sending the "GET_PROPERTIES" command via the `androidtv.adb_command` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
command = "GET_PROPERTIES"
response = {"test key": "test value"}
@ -698,7 +698,7 @@ async def test_adb_command_get_properties(hass: HomeAssistant) -> None:
async def test_learn_sendevent(hass: HomeAssistant) -> None:
"""Test the `androidtv.learn_sendevent` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
response = "sendevent 1 2 3 4"
@ -727,7 +727,7 @@ async def test_learn_sendevent(hass: HomeAssistant) -> None:
async def test_update_lock_not_acquired(hass: HomeAssistant) -> None:
"""Test that the state does not get updated when a `LockNotAcquiredException` is raised."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -760,7 +760,7 @@ async def test_update_lock_not_acquired(hass: HomeAssistant) -> None:
async def test_download(hass: HomeAssistant) -> None:
"""Test the `androidtv.download` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
device_path = "device/path"
local_path = "local/path"
@ -806,7 +806,7 @@ async def test_download(hass: HomeAssistant) -> None:
async def test_upload(hass: HomeAssistant) -> None:
"""Test the `androidtv.upload` service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
device_path = "device/path"
local_path = "local/path"
@ -851,8 +851,8 @@ async def test_upload(hass: HomeAssistant) -> None:
async def test_androidtv_volume_set(hass: HomeAssistant) -> None:
"""Test setting the volume for an Android TV device."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
"""Test setting the volume for an Android device."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -881,7 +881,7 @@ async def test_get_image_http(
This is based on `test_get_image_http` in tests/components/media_player/test_init.py.
"""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -894,7 +894,7 @@ async def test_get_image_http(
await async_update_entity(hass, entity_id)
media_player_name = "media_player." + slugify(
CONFIG_ANDROIDTV_DEFAULT[TEST_ENTITY_NAME]
CONFIG_ANDROID_DEFAULT[TEST_ENTITY_NAME]
)
state = hass.states.get(media_player_name)
assert "entity_picture_local" not in state.attributes
@ -923,7 +923,7 @@ async def test_get_image_http(
async def test_get_image_disabled(hass: HomeAssistant) -> None:
"""Test that the screencap option can disable entity_picture."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
hass.config_entries.async_update_entry(
config_entry, options={CONF_SCREENCAP: False}
@ -939,7 +939,7 @@ async def test_get_image_disabled(hass: HomeAssistant) -> None:
await async_update_entity(hass, entity_id)
media_player_name = "media_player." + slugify(
CONFIG_ANDROIDTV_DEFAULT[TEST_ENTITY_NAME]
CONFIG_ANDROID_DEFAULT[TEST_ENTITY_NAME]
)
state = hass.states.get(media_player_name)
assert "entity_picture_local" not in state.attributes
@ -954,7 +954,7 @@ async def _test_service(
additional_service_data=None,
return_value=None,
):
"""Test generic Android TV media player entity service."""
"""Test generic Android media player entity service."""
service_data = {ATTR_ENTITY_ID: entity_id}
if additional_service_data:
service_data.update(additional_service_data)
@ -977,8 +977,8 @@ async def _test_service(
async def test_services_androidtv(hass: HomeAssistant) -> None:
"""Test media player services for an Android TV device."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
"""Test media player services for an Android device."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key]:
@ -1042,7 +1042,7 @@ async def test_services_firetv(hass: HomeAssistant) -> None:
async def test_volume_mute(hass: HomeAssistant) -> None:
"""Test the volume mute service."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key]:
@ -1085,7 +1085,7 @@ async def test_volume_mute(hass: HomeAssistant) -> None:
async def test_connection_closed_on_ha_stop(hass: HomeAssistant) -> None:
"""Test that the ADB socket connection is closed when HA stops."""
patch_key, _, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, _, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -1105,7 +1105,7 @@ async def test_exception(hass: HomeAssistant) -> None:
HA will attempt to reconnect on the next update.
"""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(
@ -1135,7 +1135,7 @@ async def test_exception(hass: HomeAssistant) -> None:
async def test_options_reload(hass: HomeAssistant) -> None:
"""Test changing an option that will cause integration reload."""
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROIDTV_DEFAULT)
patch_key, entity_id, config_entry = _setup(CONFIG_ANDROID_DEFAULT)
config_entry.add_to_hass(hass)
with patchers.patch_connect(True)[patch_key], patchers.patch_shell(