test: Rename items to make location clearer

tests/conftest.py

@@ -15,13 +15,13 @@
 from .helpers.mock_config_entry import MS365MockConfigEntry
 from .helpers.utils import build_token_file
 from .integration import permissions
-from .integration.const import (
+from .integration.const_integration import (
     BASE_CONFIG_ENTRY,
     BASE_TOKEN_PERMS,
     DOMAIN,
     UPDATE_TOKEN_PERMS,
 )
-from .integration.helpers.mocks import MS365MOCKS
+from .integration.helpers_integration.mocks import MS365MOCKS
 
 pytest_plugins = [
     "pytest_homeassistant_custom_component",

tests/helpers/utils.py

@@ -9,7 +9,7 @@
 from pathlib import Path
 
 from ..const import ENTITY_NAME, TEST_DATA_LOCATION, TOKEN_LOCATION, TOKEN_PARAMS
-from ..integration.const import DOMAIN
+from ..integration.const_integration import DOMAIN
 
 TOKEN_TIME = 5000
 

tests/integration/fixtures.py

@@ -19,7 +19,7 @@
 from custom_components.ms365_calendar.integration import filemgmt_integration
 
 from ..const import STORAGE_LOCATION
-from .const import DOMAIN
+from .const_integration import DOMAIN
 
 
 @pytest.fixture(autouse=True)

tests/integration/helpers/mocks.py → tests/integration/helpers_integration/mocks.py

@@ -3,7 +3,7 @@
 from datetime import timedelta
 
 from ...helpers.utils import mock_call, utcnow
-from ..const import URL
+from ..const_integration import URL
 
 
 class MS365Mocks:

tests/integration/helpers/utils.py → tests/integration/helpers_integration/utils_integration.py

@@ -17,7 +17,7 @@
 
 from ...const import STORAGE_LOCATION, TEST_DATA_LOCATION
 from ...helpers.mock_config_entry import MS365MockConfigEntry
-from ..const import UPDATE_CALENDAR_LIST
+from ..const_integration import UPDATE_CALENDAR_LIST
 
 
 def yaml_setup(tmpdir, infile):

tests/integration/test_calendar.py

@@ -18,8 +18,8 @@
 from ..data.state import BASE_STATE_CAL1, BASE_STATE_CAL2
 from ..helpers.mock_config_entry import MS365MockConfigEntry
 from ..helpers.utils import check_entity_state, utcnow
-from .helpers.mocks import MS365MOCKS
-from .helpers.utils import update_options, yaml_setup
+from .helpers_integration.mocks import MS365MOCKS
+from .helpers_integration.utils_integration import update_options, yaml_setup
 
 START_BASE = datetime(2020, 1, 1, 0, 0, 0, tzinfo=ZoneInfo(key="UTC"))
 END_BASE = datetime(2020, 1, 1, 23, 59, 59, tzinfo=ZoneInfo(key="UTC"))

tests/integration/test_config_flow.py

@@ -17,8 +17,8 @@
 
 from ..helpers.mock_config_entry import MS365MockConfigEntry
 from ..helpers.utils import get_schema_default
-from .const import UPDATE_CALENDAR_LIST
-from .helpers.mocks import MS365MOCKS
+from .const_integration import UPDATE_CALENDAR_LIST
+from .helpers_integration.mocks import MS365MOCKS
 
 
 async def test_options_flow(

tests/integration/test_filemgmt.py

@@ -6,8 +6,8 @@
 from requests_mock import Mocker
 
 from ..helpers.mock_config_entry import MS365MockConfigEntry
-from .helpers.mocks import MS365MOCKS
-from .helpers.utils import check_yaml_file_contents, yaml_setup
+from .helpers_integration.mocks import MS365MOCKS
+from .helpers_integration.utils_integration import check_yaml_file_contents, yaml_setup
 
 
 async def test_base_filemgmt(

tests/integration/test_init.py

@@ -14,7 +14,7 @@
 )
 
 from ..helpers.mock_config_entry import MS365MockConfigEntry
-from .const import UPDATE_CALENDAR_LIST
+from .const_integration import UPDATE_CALENDAR_LIST
 
 
 async def test_reload(

tests/integration/test_permissions.py

@@ -11,7 +11,7 @@
 
 from ..helpers.mock_config_entry import MS365MockConfigEntry
 from ..helpers.utils import build_token_file, token_setup
-from .helpers.mocks import MS365MOCKS
+from .helpers_integration.mocks import MS365MOCKS
 
 ### Note that permissions code also supports Presence/Send which are not present in the calendar integration
 

tests/integration/test_services.py

@@ -18,7 +18,7 @@
 
 from ..conftest import MS365MockConfigEntry
 from ..helpers.utils import mock_call
-from .const import URL
+from .const_integration import URL
 from .fixtures import ClientFixture, ListenerSetupData
 
 START_BASE = datetime(2020, 1, 1, 0, 0, 0, tzinfo=ZoneInfo(key="UTC"))

tests/test_config_flow.py

@@ -13,7 +13,7 @@
 from .const import CLIENT_ID, ENTITY_NAME, TOKEN_URL_ASSERT
 from .helpers.mock_config_entry import MS365MockConfigEntry
 from .helpers.utils import build_token_url, mock_token
-from .integration.const import (
+from .integration.const_integration import (
     ALT_CONFIG_ENTRY,
     AUTH_CALLBACK_PATH_ALT,
     AUTH_CALLBACK_PATH_DEFAULT,
@@ -22,7 +22,7 @@
     DOMAIN,
     RECONFIGURE_CONFIG_ENTRY,
 )
-from .integration.helpers.mocks import MS365MOCKS
+from .integration.helpers_integration.mocks import MS365MOCKS
 
 
 async def test_default_flow(

tests/test_diagnostic.py

@@ -5,7 +5,7 @@
 
 from .helpers.mock_config_entry import MS365MockConfigEntry
 from .integration import async_get_config_entry_diagnostics
-from .integration.const import (
+from .integration.const_integration import (
     DIAGNOSTIC_GRANTED_PERMISSIONS,
     DIAGNOSTIC_REQUESTED_PERMISSIONS,
 )

tests/test_init.py

@@ -10,8 +10,8 @@
 from requests_mock import Mocker
 
 from .helpers.mock_config_entry import MS365MockConfigEntry
-from .integration.const import FULL_INIT_ENTITY_NO
-from .integration.helpers.mocks import MS365MOCKS
+from .integration.const_integration import FULL_INIT_ENTITY_NO
+from .integration.helpers_integration.mocks import MS365MOCKS
 
 
 async def test_full_init(