diff --git a/homeassistant/components/binary_sensor/zwave.py b/homeassistant/components/zwave/binary_sensor.py similarity index 100% rename from homeassistant/components/binary_sensor/zwave.py rename to homeassistant/components/zwave/binary_sensor.py diff --git a/homeassistant/components/climate/zwave.py b/homeassistant/components/zwave/climate.py similarity index 100% rename from homeassistant/components/climate/zwave.py rename to homeassistant/components/zwave/climate.py diff --git a/homeassistant/components/cover/zwave.py b/homeassistant/components/zwave/cover.py similarity index 100% rename from homeassistant/components/cover/zwave.py rename to homeassistant/components/zwave/cover.py diff --git a/homeassistant/components/fan/zwave.py b/homeassistant/components/zwave/fan.py similarity index 100% rename from homeassistant/components/fan/zwave.py rename to homeassistant/components/zwave/fan.py diff --git a/homeassistant/components/light/zwave.py b/homeassistant/components/zwave/light.py similarity index 100% rename from homeassistant/components/light/zwave.py rename to homeassistant/components/zwave/light.py diff --git a/homeassistant/components/lock/zwave.py b/homeassistant/components/zwave/lock.py similarity index 100% rename from homeassistant/components/lock/zwave.py rename to homeassistant/components/zwave/lock.py diff --git a/homeassistant/components/sensor/zwave.py b/homeassistant/components/zwave/sensor.py similarity index 100% rename from homeassistant/components/sensor/zwave.py rename to homeassistant/components/zwave/sensor.py diff --git a/homeassistant/components/switch/zwave.py b/homeassistant/components/zwave/switch.py similarity index 100% rename from homeassistant/components/switch/zwave.py rename to homeassistant/components/zwave/switch.py diff --git a/tests/components/zwave/conftest.py b/tests/components/zwave/conftest.py new file mode 100644 index 00000000000..7a1aae357ad --- /dev/null +++ b/tests/components/zwave/conftest.py @@ -0,0 +1,24 @@ +"""Fixtures for Z-Wave tests.""" +from unittest.mock import patch, MagicMock + +import pytest + +from tests.mock.zwave import MockNetwork, MockOption + + +@pytest.fixture +def mock_openzwave(): + """Mock out Open Z-Wave.""" + base_mock = MagicMock() + libopenzwave = base_mock.libopenzwave + libopenzwave.__file__ = 'test' + base_mock.network.ZWaveNetwork = MockNetwork + base_mock.option.ZWaveOption = MockOption + + with patch.dict('sys.modules', { + 'libopenzwave': libopenzwave, + 'openzwave.option': base_mock.option, + 'openzwave.network': base_mock.network, + 'openzwave.group': base_mock.group, + }): + yield base_mock diff --git a/tests/components/binary_sensor/test_zwave.py b/tests/components/zwave/test_binary_sensor.py similarity index 98% rename from tests/components/binary_sensor/test_zwave.py rename to tests/components/zwave/test_binary_sensor.py index f33e8a83e1e..786afb1b9ce 100644 --- a/tests/components/binary_sensor/test_zwave.py +++ b/tests/components/zwave/test_binary_sensor.py @@ -4,7 +4,7 @@ import datetime from unittest.mock import patch from homeassistant.components.zwave import const -from homeassistant.components.binary_sensor import zwave +import homeassistant.components.zwave.binary_sensor as zwave from tests.mock.zwave import ( MockNode, MockValue, MockEntityValues, value_changed) diff --git a/tests/components/climate/test_zwave.py b/tests/components/zwave/test_climate.py similarity index 98% rename from tests/components/climate/test_zwave.py rename to tests/components/zwave/test_climate.py index 39a85ab493f..e8be6d7382b 100644 --- a/tests/components/climate/test_zwave.py +++ b/tests/components/zwave/test_climate.py @@ -1,7 +1,8 @@ """Test Z-Wave climate devices.""" import pytest -from homeassistant.components.climate import zwave, STATE_COOL, STATE_HEAT +from homeassistant.components.climate import STATE_COOL, STATE_HEAT +import homeassistant.components.zwave.climate as zwave from homeassistant.const import ( STATE_OFF, TEMP_CELSIUS, TEMP_FAHRENHEIT, ATTR_TEMPERATURE) diff --git a/tests/components/cover/test_zwave.py b/tests/components/zwave/test_cover.py similarity index 98% rename from tests/components/cover/test_zwave.py rename to tests/components/zwave/test_cover.py index b870075d39f..cf3bcdf993b 100644 --- a/tests/components/cover/test_zwave.py +++ b/tests/components/zwave/test_cover.py @@ -1,7 +1,8 @@ """Test Z-Wave cover devices.""" from unittest.mock import MagicMock -from homeassistant.components.cover import zwave, SUPPORT_OPEN, SUPPORT_CLOSE +from homeassistant.components.cover import SUPPORT_OPEN, SUPPORT_CLOSE +import homeassistant.components.zwave.cover as zwave from homeassistant.components.zwave import const from tests.mock.zwave import ( diff --git a/tests/components/fan/test_zwave.py b/tests/components/zwave/test_fan.py similarity index 96% rename from tests/components/fan/test_zwave.py rename to tests/components/zwave/test_fan.py index b7d7e497c03..af3d16f6288 100644 --- a/tests/components/fan/test_zwave.py +++ b/tests/components/zwave/test_fan.py @@ -1,6 +1,7 @@ """Test Z-Wave fans.""" +import homeassistant.components.zwave.fan as zwave from homeassistant.components.fan import ( - zwave, SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH, SUPPORT_SET_SPEED) + SPEED_OFF, SPEED_LOW, SPEED_MEDIUM, SPEED_HIGH, SUPPORT_SET_SPEED) from tests.mock.zwave import ( MockNode, MockValue, MockEntityValues, value_changed) diff --git a/tests/components/zwave/test_init.py b/tests/components/zwave/test_init.py index 212d3e02802..66011f3e6ee 100644 --- a/tests/components/zwave/test_init.py +++ b/tests/components/zwave/test_init.py @@ -10,7 +10,7 @@ from unittest.mock import patch, MagicMock from homeassistant.bootstrap import async_setup_component from homeassistant.const import ATTR_ENTITY_ID, EVENT_HOMEASSISTANT_START from homeassistant.components import zwave -from homeassistant.components.binary_sensor.zwave import get_device +from homeassistant.components.zwave.binary_sensor import get_device from homeassistant.components.zwave import ( const, CONFIG_SCHEMA, CONF_DEVICE_CONFIG_GLOB, DATA_NETWORK) from homeassistant.setup import setup_component diff --git a/tests/components/light/test_zwave.py b/tests/components/zwave/test_light.py similarity index 99% rename from tests/components/light/test_zwave.py rename to tests/components/zwave/test_light.py index 5805c8eb2fb..5e85f28da39 100644 --- a/tests/components/light/test_zwave.py +++ b/tests/components/zwave/test_light.py @@ -3,8 +3,9 @@ from unittest.mock import patch, MagicMock import homeassistant.components.zwave from homeassistant.components.zwave import const +import homeassistant.components.zwave.light as zwave from homeassistant.components.light import ( - zwave, ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION, + ATTR_BRIGHTNESS, ATTR_COLOR_TEMP, ATTR_HS_COLOR, ATTR_TRANSITION, SUPPORT_BRIGHTNESS, SUPPORT_TRANSITION, SUPPORT_COLOR, ATTR_WHITE_VALUE, SUPPORT_COLOR_TEMP, SUPPORT_WHITE_VALUE) diff --git a/tests/components/lock/test_zwave.py b/tests/components/zwave/test_lock.py similarity index 99% rename from tests/components/lock/test_zwave.py rename to tests/components/zwave/test_lock.py index 07095e4fe3e..98734db8d7c 100644 --- a/tests/components/lock/test_zwave.py +++ b/tests/components/zwave/test_lock.py @@ -2,7 +2,7 @@ from unittest.mock import patch, MagicMock from homeassistant import config_entries -from homeassistant.components.lock import zwave +import homeassistant.components.zwave.lock as zwave from homeassistant.components.zwave import const from tests.mock.zwave import ( diff --git a/tests/components/sensor/test_zwave.py b/tests/components/zwave/test_sensor.py similarity index 98% rename from tests/components/sensor/test_zwave.py rename to tests/components/zwave/test_sensor.py index e3792c27d77..cce6bf9deaa 100644 --- a/tests/components/sensor/test_zwave.py +++ b/tests/components/zwave/test_sensor.py @@ -1,5 +1,5 @@ """Test Z-Wave sensor.""" -from homeassistant.components.sensor import zwave +import homeassistant.components.zwave.sensor as zwave from homeassistant.components.zwave import const import homeassistant.const diff --git a/tests/components/switch/test_zwave.py b/tests/components/zwave/test_switch.py similarity index 97% rename from tests/components/switch/test_zwave.py rename to tests/components/zwave/test_switch.py index 3769eef828b..943be9fc4ea 100644 --- a/tests/components/switch/test_zwave.py +++ b/tests/components/zwave/test_switch.py @@ -1,7 +1,7 @@ """Test Z-Wave switches.""" from unittest.mock import patch -from homeassistant.components.switch import zwave +import homeassistant.components.zwave.switch as zwave from tests.mock.zwave import ( MockNode, MockValue, MockEntityValues, value_changed) diff --git a/tests/conftest.py b/tests/conftest.py index c2e8eb1eb28..1dc5733cf40 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -3,7 +3,7 @@ import asyncio import functools import logging import os -from unittest.mock import patch, MagicMock +from unittest.mock import patch import pytest import requests_mock as _requests_mock @@ -17,7 +17,6 @@ from tests.common import ( async_test_home_assistant, INSTANCES, mock_coro, mock_storage as mock_storage, MockUser, CLIENT_ID) from tests.test_util.aiohttp import mock_aiohttp_client -from tests.mock.zwave import MockNetwork, MockOption if os.environ.get('UVLOOP') == '1': import uvloop @@ -92,24 +91,6 @@ def aioclient_mock(): yield mock_session -@pytest.fixture -def mock_openzwave(): - """Mock out Open Z-Wave.""" - base_mock = MagicMock() - libopenzwave = base_mock.libopenzwave - libopenzwave.__file__ = 'test' - base_mock.network.ZWaveNetwork = MockNetwork - base_mock.option.ZWaveOption = MockOption - - with patch.dict('sys.modules', { - 'libopenzwave': libopenzwave, - 'openzwave.option': base_mock.option, - 'openzwave.network': base_mock.network, - 'openzwave.group': base_mock.group, - }): - yield base_mock - - @pytest.fixture def mock_device_tracker_conf(): """Prevent device tracker from reading/writing data."""