test: Update tests to common standard

tests/conftest.py

@@ -77,29 +77,15 @@ def skip_notifications_fixture():
 def base_config_entry(request, hass: HomeAssistant) -> MS365MockConfigEntry:
     """Create MS365 entry in Home Assistant."""
     data = deepcopy(BASE_CONFIG_ENTRY)
+    options = None
     if hasattr(request, "param"):
         for key, value in request.param.items():
-            data[key] = value
+            if key == "options":
+                options = value
+            else:
+                data[key] = value
     entry = MS365MockConfigEntry(
-        domain=DOMAIN,
-        title=TITLE,
-        unique_id=DOMAIN,
-        data=data,
-    )
-    entry.runtime_data = None
-    return entry
-
-
-@pytest.fixture
-def update_config_entry(hass: HomeAssistant) -> MS365MockConfigEntry:
-    """Create MS365 entry in Home Assistant."""
-    data = deepcopy(BASE_CONFIG_ENTRY)
-    data["enable_update"] = True
-    entry = MS365MockConfigEntry(
-        domain=DOMAIN,
-        title=TITLE,
-        unique_id=DOMAIN,
-        data=data,
+        domain=DOMAIN, title=TITLE, unique_id=DOMAIN, data=data, options=options
     )
     entry.runtime_data = None
     return entry

tests/helpers/utils.py

@@ -101,20 +101,25 @@ def check_entity_state(
     entity_state,
     entity_attributes=None,
     data_length=None,
-    subject=None,
+    attributes=None,
 ):
     """Check entity state."""
     state = hass.states.get(entity_name)
-
+    # print(state)
     assert state.state == entity_state
     if entity_attributes:
-        # print("*************************** State Attributes")
-        # print(state.attributes)
-        assert state.attributes["data"] == entity_attributes
+        print("*************************** State Attributes")
+        print(state.attributes)
+        if "data" in state.attributes:
+            assert state.attributes["data"] == entity_attributes
+        else:
+            assert state.attributes == entity_attributes
     if data_length is not None:
         assert len(state.attributes["data"]) == data_length
-    if subject is not None:
-        assert state.attributes["message"] == subject
+
+    if attributes is not None:
+        for key, value in attributes.items():
+            assert state.attributes[key] == value
 
 
 def utcnow():

tests/integration/test_calendar.py

@@ -232,7 +232,9 @@ async def test_all_day_event(
     base_config_entry: MS365MockConfigEntry,
 ) -> None:
     """Test all day event."""
-    check_entity_state(hass, "calendar.test_calendar1", "on", subject="Test all day")
+    check_entity_state(
+        hass, "calendar.test_calendar1", "on", attributes={"message": "Test all day"}
+    )
 
 
 @pytest.mark.parametrize(
@@ -245,7 +247,9 @@ async def test_started_event(
 ) -> None:
     """Test started event."""
 
-    check_entity_state(hass, "calendar.test_calendar1", "on", subject="Test started")
+    check_entity_state(
+        hass, "calendar.test_calendar1", "on", attributes={"message": "Test started"}
+    )
 
 
 @pytest.mark.parametrize(
@@ -261,7 +265,10 @@ async def test_not_started_event(
     """Test not started event."""
 
     check_entity_state(
-        hass, "calendar.test_calendar1", "off", subject="Test not started"
+        hass,
+        "calendar.test_calendar1",
+        "off",
+        attributes={"message": "Test not started"},
     )
 
 

tests/integration/test_filemgmt.py

@@ -16,7 +16,7 @@ async def test_base_filemgmt(
     setup_base_integration,
     base_config_entry: MS365MockConfigEntry,
 ) -> None:
-    """Test basic file management."""
+    """Test base file management."""
 
     check_yaml_file_contents(tmp_path, "ms365_calendars_base")
 

tests/integration/test_permissions.py

@@ -10,7 +10,7 @@
 from requests_mock import Mocker
 
 from ..helpers.mock_config_entry import MS365MockConfigEntry
-from ..helpers.utils import build_token_file, token_setup
+from ..helpers.utils import build_token_file
 from .helpers_integration.mocks import MS365MOCKS
 
 ### Note that permissions code also supports Presence/Send which are not present in the calendar integration
@@ -75,36 +75,6 @@ async def test_update_shared_permissions(
     assert len(entities) == 2
 
 
-async def test_no_token(
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    base_config_entry: MS365MockConfigEntry,
-) -> None:
-    """Test no token."""
-    base_config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(base_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert "Could not locate token" in caplog.text
-
-
-async def test_corrupt_token(
-    tmp_path,
-    hass: HomeAssistant,
-    caplog: pytest.LogCaptureFixture,
-    base_config_entry: MS365MockConfigEntry,
-) -> None:
-    """Fixture for setting up the component."""
-    token_setup(tmp_path, "corrupt")
-    base_config_entry.add_to_hass(hass)
-
-    await hass.config_entries.async_setup(base_config_entry.entry_id)
-    await hass.async_block_till_done()
-
-    assert "Token corrupted for integration" in caplog.text
-
-
 async def test_missing_permissions(
     tmp_path,
     hass: HomeAssistant,

tests/integration/test_services.py

@@ -28,10 +28,10 @@
 async def test_update_service_setup(
     hass: HomeAssistant,
     setup_update_integration,
-    update_config_entry: MS365MockConfigEntry,
+    base_config_entry: MS365MockConfigEntry,
 ) -> None:
     """Test the reconfigure flow."""
-    assert update_config_entry.data[CONF_ENABLE_UPDATE]
+    assert base_config_entry.data[CONF_ENABLE_UPDATE]
     assert hass.services.has_service(DOMAIN, "create_calendar_event")
     assert hass.services.has_service(DOMAIN, "modify_calendar_event")
     assert hass.services.has_service(DOMAIN, "remove_calendar_event")

tests/test_permissions.py

@@ -5,6 +5,7 @@
 from homeassistant.core import HomeAssistant
 
 from .helpers.mock_config_entry import MS365MockConfigEntry
+from .helpers.utils import token_setup
 
 
 async def test_no_token(
@@ -19,3 +20,19 @@ async def test_no_token(
     await hass.async_block_till_done()
 
     assert "Could not locate token" in caplog.text
+
+
+async def test_corrupt_token(
+    tmp_path,
+    hass: HomeAssistant,
+    caplog: pytest.LogCaptureFixture,
+    base_config_entry: MS365MockConfigEntry,
+) -> None:
+    """Fixture for setting up the component."""
+    token_setup(tmp_path, "corrupt")
+    base_config_entry.add_to_hass(hass)
+
+    await hass.config_entries.async_setup(base_config_entry.entry_id)
+    await hass.async_block_till_done()
+
+    assert "Token corrupted for integration" in caplog.text