fix: Fix CI/CD issues and enhance integration

Signed-off-by: Rafal Zielinski <sq4ind@gmail.com>

tests/conftest.py

@@ -6,7 +6,7 @@ from homeassistant.config_entries import ConfigEntry, SOURCE_USER
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT, CONF_USERNAME
 
 from custom_components.adguard_hub.api import AdGuardHomeAPI
-from custom_components.adguard_hub.const import DOMAIN
+from custom_components.adguard_hub.const import DOMAIN, CONF_SSL, CONF_VERIFY_SSL
 
 
 @pytest.fixture(autouse=True)
@@ -28,11 +28,15 @@ def mock_config_entry():
             CONF_PORT: 3000,
             CONF_USERNAME: "admin",
             CONF_PASSWORD: "password",
+            CONF_SSL: False,
+            CONF_VERIFY_SSL: True,
         },
         options={},
         source=SOURCE_USER,
         entry_id="test_entry_id",
         unique_id="192.168.1.100:3000",
+        discovery_keys=set(),  # Added required parameter
+        subentries_data={},    # Added required parameter
     )
 
 
@@ -42,39 +46,140 @@ def mock_api():
     api = MagicMock(spec=AdGuardHomeAPI)
     api.host = "192.168.1.100"
     api.port = 3000
+    api.ssl = False
+    api.verify_ssl = True
+
+    # Mock successful connection
     api.test_connection = AsyncMock(return_value=True)
+
+    # Mock status response
     api.get_status = AsyncMock(return_value={
         "protection_enabled": True,
         "version": "v0.107.0",
         "dns_port": 53,
         "running": True,
+        "dns_addresses": ["192.168.1.100:53"],
+        "bootstrap_dns": ["1.1.1.1", "8.8.8.8"],
+        "upstream_dns": ["1.1.1.1", "8.8.8.8", "1.0.0.1", "8.8.4.4"],
+        "safebrowsing_enabled": True,
+        "parental_enabled": False,
+        "safesearch_enabled": False,
+        "dhcp_available": False,
     })
+
+    # Mock clients response
     api.get_clients = AsyncMock(return_value={
         "clients": [
             {
                 "name": "test_client",
                 "ids": ["192.168.1.50"],
                 "filtering_enabled": True,
-                "blocked_services": {"ids": ["youtube"]},
+                "safebrowsing_enabled": False,
+                "parental_enabled": False,
+                "safesearch_enabled": False,
+                "use_global_settings": True,
+                "use_global_blocked_services": True,
+                "blocked_services": {"ids": ["youtube", "gaming"]},
+            },
+            {
+                "name": "test_client_2",
+                "ids": ["192.168.1.51"],
+                "filtering_enabled": False,
+                "safebrowsing_enabled": True,
+                "parental_enabled": True,
+                "safesearch_enabled": False,
+                "use_global_settings": False,
+                "blocked_services": {"ids": ["netflix"]},
             }
         ]
     })
+
+    # Mock statistics response
     api.get_statistics = AsyncMock(return_value={
         "num_dns_queries": 10000,
         "num_blocked_filtering": 1500,
+        "num_dns_queries_today": 5000,
+        "num_blocked_filtering_today": 750,
+        "num_replaced_safebrowsing": 50,
+        "num_replaced_parental": 25,
+        "num_replaced_safesearch": 10,
         "avg_processing_time": 2.5,
         "filtering_rules_count": 75000,
     })
+
+    # Mock client operations
     api.get_client_by_name = AsyncMock(return_value={
         "name": "test_client",
         "ids": ["192.168.1.50"],
         "filtering_enabled": True,
         "blocked_services": {"ids": ["youtube"]},
     })
+
+    api.add_client = AsyncMock(return_value={"success": True})
+    api.update_client = AsyncMock(return_value={"success": True})
+    api.delete_client = AsyncMock(return_value={"success": True})
+    api.update_client_blocked_services = AsyncMock(return_value={"success": True})
     api.set_protection = AsyncMock(return_value={"success": True})
+    api.close = AsyncMock(return_value=None)
+
     return api
 
 
+@pytest.fixture
+def mock_coordinator(mock_api):
+    """Mock coordinator with test data."""
+    from custom_components.adguard_hub import AdGuardControlHubCoordinator
+
+    coordinator = MagicMock(spec=AdGuardControlHubCoordinator)
+    coordinator.last_update_success = True
+    coordinator.api = mock_api
+
+    # Mock clients data
+    coordinator.clients = {
+        "test_client": {
+            "name": "test_client",
+            "ids": ["192.168.1.50"],
+            "filtering_enabled": True,
+            "blocked_services": {"ids": ["youtube"]},
+        },
+        "test_client_2": {
+            "name": "test_client_2", 
+            "ids": ["192.168.1.51"],
+            "filtering_enabled": False,
+            "blocked_services": {"ids": ["netflix"]},
+        }
+    }
+
+    # Mock statistics data
+    coordinator.statistics = {
+        "num_dns_queries": 10000,
+        "num_blocked_filtering": 1500,
+        "avg_processing_time": 2.5,
+        "filtering_rules_count": 75000,
+    }
+
+    # Mock protection status
+    coordinator.protection_status = {
+        "protection_enabled": True,
+        "version": "v0.107.0",
+        "dns_port": 53,
+        "running": True,
+        "safebrowsing_enabled": True,
+        "parental_enabled": False,
+        "safesearch_enabled": False,
+    }
+
+    coordinator.data = {
+        "clients": coordinator.clients,
+        "statistics": coordinator.statistics,
+        "status": coordinator.protection_status,
+    }
+
+    coordinator.async_request_refresh = AsyncMock()
+
+    return coordinator
+
+
 @pytest.fixture
 def mock_hass():
     """Mock Home Assistant instance."""
@@ -88,3 +193,25 @@ def mock_hass():
     hass.config_entries.async_forward_entry_setups = AsyncMock(return_value=True)
     hass.config_entries.async_unload_platforms = AsyncMock(return_value=True)
     return hass
+
+
+@pytest.fixture
+def mock_aiohttp_session():
+    """Mock aiohttp session."""
+    session = MagicMock()
+    response = MagicMock()
+    response.raise_for_status = MagicMock()
+    response.json = AsyncMock(return_value={"status": "ok"})
+    response.text = AsyncMock(return_value="OK")
+    response.status = 200
+    response.content_length = 100
+
+    # Mock async context manager
+    context_manager = MagicMock()
+    context_manager.__aenter__ = AsyncMock(return_value=response)
+    context_manager.__aexit__ = AsyncMock(return_value=None)
+
+    session.request = MagicMock(return_value=context_manager)
+    session.close = AsyncMock()
+
+    return session

tests/test_api.py

@@ -1,7 +1,16 @@
 """Test API functionality."""
 import pytest
-from unittest.mock import AsyncMock, MagicMock
-from custom_components.adguard_hub.api import AdGuardHomeAPI
+from unittest.mock import AsyncMock, MagicMock, patch
+from aiohttp import ClientError, ClientTimeout
+
+from custom_components.adguard_hub.api import (
+    AdGuardHomeAPI,
+    AdGuardHomeError,
+    AdGuardConnectionError,
+    AdGuardAuthError,
+    AdGuardNotFoundError,
+    AdGuardTimeoutError,
+)
 
 
 class TestAdGuardHomeAPI:
@@ -24,6 +33,17 @@ class TestAdGuardHomeAPI:
         assert api.ssl is True
         assert api.base_url == "https://192.168.1.100:3000"
 
+    def test_api_initialization_defaults(self):
+        """Test API initialization with defaults."""
+        api = AdGuardHomeAPI(host="192.168.1.100")
+
+        assert api.host == "192.168.1.100"
+        assert api.port == 3000
+        assert api.username is None
+        assert api.password is None
+        assert api.ssl is False
+        assert api.base_url == "http://192.168.1.100:3000"
+
     @pytest.mark.asyncio
     async def test_api_context_manager(self):
         """Test API as async context manager."""
@@ -33,21 +53,236 @@ class TestAdGuardHomeAPI:
             assert api.port == 3000
 
     @pytest.mark.asyncio
-    async def test_test_connection_success(self):
+    async def test_test_connection_success(self, mock_aiohttp_session):
         """Test successful connection test."""
-        session = MagicMock()
-        response = MagicMock()
-        response.status = 200
-        response.json = AsyncMock(return_value={"protection_enabled": True})
-        response.raise_for_status = MagicMock()
-        response.content_length = 100
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value={"protection_enabled": True}
+        )
 
-        context_manager = MagicMock()
-        context_manager.__aenter__ = AsyncMock(return_value=response)
-        context_manager.__aexit__ = AsyncMock(return_value=None)
-        session.request = MagicMock(return_value=context_manager)
-
-        api = AdGuardHomeAPI(host="192.168.1.100", session=session)
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
         result = await api.test_connection()
 
         assert result is True
+        mock_aiohttp_session.request.assert_called()
+
+    @pytest.mark.asyncio
+    async def test_test_connection_failure(self, mock_aiohttp_session):
+        """Test failed connection test."""
+        mock_aiohttp_session.request.side_effect = ClientError("Connection failed")
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        result = await api.test_connection()
+
+        assert result is False
+
+    @pytest.mark.asyncio
+    async def test_get_status_success(self, mock_aiohttp_session):
+        """Test successful status retrieval."""
+        expected_status = {
+            "protection_enabled": True,
+            "version": "v0.107.0",
+            "running": True,
+        }
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value=expected_status
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        status = await api.get_status()
+
+        assert status == expected_status
+
+    @pytest.mark.asyncio
+    async def test_get_clients_success(self, mock_aiohttp_session):
+        """Test successful clients retrieval."""
+        expected_clients = {
+            "clients": [
+                {"name": "client1", "ids": ["192.168.1.50"]},
+                {"name": "client2", "ids": ["192.168.1.51"]},
+            ]
+        }
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value=expected_clients
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        clients = await api.get_clients()
+
+        assert clients == expected_clients
+
+    @pytest.mark.asyncio
+    async def test_get_statistics_success(self, mock_aiohttp_session):
+        """Test successful statistics retrieval."""
+        expected_stats = {
+            "num_dns_queries": 10000,
+            "num_blocked_filtering": 1500,
+        }
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value=expected_stats
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        stats = await api.get_statistics()
+
+        assert stats == expected_stats
+
+    @pytest.mark.asyncio
+    async def test_set_protection_enable(self, mock_aiohttp_session):
+        """Test enabling protection."""
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value={"success": True}
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        result = await api.set_protection(True)
+
+        assert result == {"success": True}
+
+    @pytest.mark.asyncio
+    async def test_add_client_success(self, mock_aiohttp_session):
+        """Test successful client addition."""
+        client_data = {
+            "name": "test_client",
+            "ids": ["192.168.1.100"],
+        }
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value={"success": True}
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        result = await api.add_client(client_data)
+
+        assert result == {"success": True}
+
+    @pytest.mark.asyncio
+    async def test_add_client_missing_name(self, mock_aiohttp_session):
+        """Test client addition with missing name."""
+        client_data = {"ids": ["192.168.1.100"]}
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(ValueError, match="Client name is required"):
+            await api.add_client(client_data)
+
+    @pytest.mark.asyncio
+    async def test_add_client_missing_ids(self, mock_aiohttp_session):
+        """Test client addition with missing IDs."""
+        client_data = {"name": "test_client"}
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(ValueError, match="Client IDs are required"):
+            await api.add_client(client_data)
+
+    @pytest.mark.asyncio
+    async def test_get_client_by_name_found(self, mock_aiohttp_session):
+        """Test finding client by name."""
+        clients_data = {
+            "clients": [
+                {"name": "test_client", "ids": ["192.168.1.50"]},
+                {"name": "other_client", "ids": ["192.168.1.51"]},
+            ]
+        }
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value=clients_data
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        client = await api.get_client_by_name("test_client")
+
+        assert client == {"name": "test_client", "ids": ["192.168.1.50"]}
+
+    @pytest.mark.asyncio
+    async def test_get_client_by_name_not_found(self, mock_aiohttp_session):
+        """Test client not found by name."""
+        clients_data = {"clients": []}
+
+        mock_aiohttp_session.request.return_value.__aenter__.return_value.json = AsyncMock(
+            return_value=clients_data
+        )
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        client = await api.get_client_by_name("nonexistent_client")
+
+        assert client is None
+
+    @pytest.mark.asyncio
+    async def test_update_client_blocked_services_client_not_found(self, mock_aiohttp_session):
+        """Test blocked services update with client not found."""
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        api.get_client_by_name = AsyncMock(return_value=None)
+
+        with pytest.raises(AdGuardNotFoundError, match="Client 'nonexistent' not found"):
+            await api.update_client_blocked_services("nonexistent", ["youtube"])
+
+    @pytest.mark.asyncio
+    async def test_auth_error_handling(self, mock_aiohttp_session):
+        """Test 401 authentication error handling."""
+        mock_response = mock_aiohttp_session.request.return_value.__aenter__.return_value
+        mock_response.status = 401
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(AdGuardAuthError, match="Authentication failed"):
+            await api.get_status()
+
+    @pytest.mark.asyncio
+    async def test_not_found_error_handling(self, mock_aiohttp_session):
+        """Test 404 not found error handling."""
+        mock_response = mock_aiohttp_session.request.return_value.__aenter__.return_value
+        mock_response.status = 404
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(AdGuardNotFoundError):
+            await api.get_status()
+
+    @pytest.mark.asyncio
+    async def test_server_error_handling(self, mock_aiohttp_session):
+        """Test 500 server error handling."""
+        mock_response = mock_aiohttp_session.request.return_value.__aenter__.return_value
+        mock_response.status = 500
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(AdGuardConnectionError, match="Server error 500"):
+            await api.get_status()
+
+    @pytest.mark.asyncio
+    async def test_client_error_handling(self, mock_aiohttp_session):
+        """Test client error handling."""
+        mock_aiohttp_session.request.side_effect = ClientError("Client error")
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+
+        with pytest.raises(AdGuardConnectionError, match="Client error"):
+            await api.get_status()
+
+    @pytest.mark.asyncio
+    async def test_empty_response_handling(self, mock_aiohttp_session):
+        """Test empty response handling."""
+        mock_response = mock_aiohttp_session.request.return_value.__aenter__.return_value
+        mock_response.status = 204
+        mock_response.content_length = 0
+
+        api = AdGuardHomeAPI(host="192.168.1.100", session=mock_aiohttp_session)
+        result = await api._request("POST", "/control/protection", {"enabled": True})
+
+        assert result == {}
+
+    @pytest.mark.asyncio
+    async def test_close_session(self):
+        """Test closing API session."""
+        api = AdGuardHomeAPI(host="192.168.1.100")
+
+        # Create session
+        async with api:
+            assert api._session is not None
+
+        # Close session
+        await api.close()

tests/test_integration.py

@@ -1,9 +1,16 @@
 """Test the complete AdGuard Control Hub integration."""
 import pytest
-from unittest.mock import MagicMock, patch
+from unittest.mock import AsyncMock, MagicMock, patch
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.update_coordinator import UpdateFailed
 
-from custom_components.adguard_hub import async_setup_entry, async_unload_entry
+from custom_components.adguard_hub import (
+    async_setup_entry,
+    async_unload_entry,
+    AdGuardControlHubCoordinator,
+)
+from custom_components.adguard_hub.api import AdGuardConnectionError, AdGuardAuthError
 from custom_components.adguard_hub.const import DOMAIN
 
 
@@ -13,28 +20,72 @@ class TestIntegrationSetup:
     @pytest.mark.asyncio
     async def test_setup_entry_success(self, mock_hass, mock_config_entry, mock_api):
         """Test successful setup of config entry."""
-        with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession"):
+        with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession") as mock_session:
 
-            result = await async_setup_entry(mock_hass, mock_config_entry)
+            # Mock the coordinator's first refresh
+            with patch("custom_components.adguard_hub.AdGuardControlHubCoordinator.async_config_entry_first_refresh", new=AsyncMock()):
+                result = await async_setup_entry(mock_hass, mock_config_entry)
 
-            assert result is True
-            assert DOMAIN in mock_hass.data
-            assert mock_config_entry.entry_id in mock_hass.data[DOMAIN]
+                assert result is True
+                assert DOMAIN in mock_hass.data
+                assert mock_config_entry.entry_id in mock_hass.data[DOMAIN]
+                assert "coordinator" in mock_hass.data[DOMAIN][mock_config_entry.entry_id]
+                assert "api" in mock_hass.data[DOMAIN][mock_config_entry.entry_id]
+
+                # Verify platforms setup
+                mock_hass.config_entries.async_forward_entry_setups.assert_called_once()
 
     @pytest.mark.asyncio
     async def test_setup_entry_connection_failure(self, mock_hass, mock_config_entry):
         """Test setup failure due to connection error."""
         mock_api = MagicMock()
-        mock_api.test_connection = pytest.AsyncMock(return_value=False)
+        mock_api.test_connection = AsyncMock(return_value=False)
 
         with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession"):
 
-            with pytest.raises(ConfigEntryNotReady):
+            with pytest.raises(ConfigEntryNotReady, match="Unable to connect to AdGuard Home"):
                 await async_setup_entry(mock_hass, mock_config_entry)
 
+    @pytest.mark.asyncio
+    async def test_setup_entry_api_error(self, mock_hass, mock_config_entry):
+        """Test setup failure due to API error."""
+        mock_api = MagicMock()
+        mock_api.test_connection = AsyncMock(side_effect=AdGuardAuthError("Auth failed"))
+
+        with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession"):
+
+            with pytest.raises(ConfigEntryNotReady, match="Unable to connect"):
+                await async_setup_entry(mock_hass, mock_config_entry)
+
+    @pytest.mark.asyncio
+    async def test_setup_entry_coordinator_failure(self, mock_hass, mock_config_entry, mock_api):
+        """Test setup failure due to coordinator refresh error."""
+        with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession"),              patch.object(AdGuardControlHubCoordinator, "async_config_entry_first_refresh", 
+                         side_effect=UpdateFailed("Refresh failed")):
+
+            with pytest.raises(ConfigEntryNotReady, match="Failed to fetch initial data"):
+                await async_setup_entry(mock_hass, mock_config_entry)
+
+    @pytest.mark.asyncio
+    async def test_setup_entry_platform_failure(self, mock_hass, mock_config_entry, mock_api):
+        """Test setup failure due to platform setup error."""
+        mock_hass.config_entries.async_forward_entry_setups = AsyncMock(
+            side_effect=Exception("Platform setup failed")
+        )
+
+        with patch("custom_components.adguard_hub.AdGuardHomeAPI", return_value=mock_api),              patch("custom_components.adguard_hub.async_get_clientsession"),              patch.object(AdGuardControlHubCoordinator, "async_config_entry_first_refresh", 
+                         new=AsyncMock()):
+
+            with pytest.raises(ConfigEntryNotReady, match="Failed to set up platforms"):
+                await async_setup_entry(mock_hass, mock_config_entry)
+
+            # Verify cleanup
+            assert mock_config_entry.entry_id not in mock_hass.data.get(DOMAIN, {})
+
     @pytest.mark.asyncio
     async def test_unload_entry_success(self, mock_hass, mock_config_entry):
         """Test successful unloading of config entry."""
+        # Set up initial data
         mock_hass.data[DOMAIN] = {
             mock_config_entry.entry_id: {
                 "coordinator": MagicMock(),
@@ -46,3 +97,287 @@ class TestIntegrationSetup:
 
         assert result is True
         assert mock_config_entry.entry_id not in mock_hass.data[DOMAIN]
+        mock_hass.config_entries.async_unload_platforms.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_unload_entry_last_instance(self, mock_hass, mock_config_entry):
+        """Test unloading last config entry unregisters services."""
+        # Set up services
+        mock_services = MagicMock()
+        mock_services.unregister_services = MagicMock()
+        mock_hass.data[f"{DOMAIN}_services"] = mock_services
+        mock_hass.data[DOMAIN] = {
+            mock_config_entry.entry_id: {
+                "coordinator": MagicMock(),
+                "api": MagicMock(),
+            }
+        }
+
+        result = await async_unload_entry(mock_hass, mock_config_entry)
+
+        assert result is True
+        assert f"{DOMAIN}_services" not in mock_hass.data
+        assert DOMAIN not in mock_hass.data
+        mock_services.unregister_services.assert_called_once()
+
+
+class TestCoordinator:
+    """Test the data update coordinator."""
+
+    def test_coordinator_initialization(self, mock_hass, mock_api):
+        """Test coordinator initialization."""
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        assert coordinator.api == mock_api
+        assert coordinator.name == f"{DOMAIN}_coordinator"
+
+    @pytest.mark.asyncio
+    async def test_coordinator_update_success(self, mock_hass, mock_api):
+        """Test successful coordinator data update."""
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        data = await coordinator._async_update_data()
+
+        assert "clients" in data
+        assert "statistics" in data
+        assert "status" in data
+        assert "test_client" in data["clients"]
+        assert data["statistics"]["num_dns_queries"] == 10000
+        assert data["status"]["protection_enabled"] is True
+
+    @pytest.mark.asyncio
+    async def test_coordinator_update_partial_failure(self, mock_hass, mock_api):
+        """Test coordinator update with partial API failures."""
+        # Make one API call fail
+        mock_api.get_clients = AsyncMock(side_effect=Exception("Client fetch failed"))
+
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        data = await coordinator._async_update_data()
+
+        # Should still return data from successful calls
+        assert "clients" in data
+        assert "statistics" in data
+        assert "status" in data
+        assert data["statistics"]["num_dns_queries"] == 10000
+
+    @pytest.mark.asyncio
+    async def test_coordinator_update_connection_error(self, mock_hass, mock_api):
+        """Test coordinator update with connection error."""
+        mock_api.get_status = AsyncMock(side_effect=AdGuardConnectionError("Connection failed"))
+        mock_api.get_clients = AsyncMock(side_effect=AdGuardConnectionError("Connection failed"))
+        mock_api.get_statistics = AsyncMock(side_effect=AdGuardConnectionError("Connection failed"))
+
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        with pytest.raises(UpdateFailed, match="Connection error to AdGuard Home"):
+            await coordinator._async_update_data()
+
+    @pytest.mark.asyncio
+    async def test_coordinator_update_unexpected_error(self, mock_hass, mock_api):
+        """Test coordinator update with unexpected error."""
+        mock_api.get_status = AsyncMock(side_effect=Exception("Unexpected error"))
+        mock_api.get_clients = AsyncMock(side_effect=Exception("Unexpected error"))
+        mock_api.get_statistics = AsyncMock(side_effect=Exception("Unexpected error"))
+
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        with pytest.raises(UpdateFailed, match="Error communicating with AdGuard Control Hub"):
+            await coordinator._async_update_data()
+
+    def test_coordinator_properties(self, mock_hass, mock_api):
+        """Test coordinator properties."""
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        # Set test data
+        test_clients = {"client1": {"name": "client1"}}
+        test_stats = {"num_dns_queries": 5000}
+        test_status = {"protection_enabled": False}
+
+        coordinator._clients = test_clients
+        coordinator._statistics = test_stats
+        coordinator._protection_status = test_status
+
+        assert coordinator.clients == test_clients
+        assert coordinator.statistics == test_stats
+        assert coordinator.protection_status == test_status
+
+    def test_coordinator_properties_empty_data(self, mock_hass, mock_api):
+        """Test coordinator properties with empty data."""
+        coordinator = AdGuardControlHubCoordinator(mock_hass, mock_api)
+
+        # Properties should return empty containers, not None
+        assert coordinator.clients == {}
+        assert coordinator.statistics == {}
+        assert coordinator.protection_status == {}
+
+
+class TestServices:
+    """Test service functionality."""
+
+    def test_services_registration(self, mock_hass):
+        """Test that services are properly registered."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        services = AdGuardControlHubServices(mock_hass)
+        services.register_services()
+
+        # Verify services registration was called
+        assert mock_hass.services.register.called
+
+        # Verify correct number of service registrations
+        expected_call_count = 6  # block_services, unblock_services, emergency_unblock, add_client, remove_client, refresh_data
+        assert mock_hass.services.register.call_count == expected_call_count
+
+    def test_services_unregistration(self, mock_hass):
+        """Test that services are properly unregistered."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        # Mock service existence
+        mock_hass.services.has_service.return_value = True
+
+        services = AdGuardControlHubServices(mock_hass)
+        services.unregister_services()
+
+        # Verify correct number of service removals
+        expected_call_count = 6
+        assert mock_hass.services.remove.call_count == expected_call_count
+
+    @pytest.mark.asyncio
+    async def test_block_services_success(self, mock_hass, mock_api):
+        """Test successful service blocking."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        mock_hass.data[DOMAIN] = {
+            "entry_id": {"api": mock_api}
+        }
+
+        services = AdGuardControlHubServices(mock_hass)
+        call = MagicMock()
+        call.data = {
+            "client_name": "test_client",
+            "services": ["youtube", "netflix"]
+        }
+
+        await services.block_services(call)
+
+        mock_api.get_client_by_name.assert_called_once_with("test_client")
+        mock_api.update_client_blocked_services.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_unblock_services_success(self, mock_hass, mock_api):
+        """Test successful service unblocking."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        mock_hass.data[DOMAIN] = {
+            "entry_id": {"api": mock_api}
+        }
+
+        services = AdGuardControlHubServices(mock_hass)
+        call = MagicMock()
+        call.data = {
+            "client_name": "test_client",
+            "services": ["youtube"]
+        }
+
+        await services.unblock_services(call)
+
+        mock_api.get_client_by_name.assert_called_once_with("test_client")
+        mock_api.update_client_blocked_services.assert_called_once()
+
+    @pytest.mark.asyncio
+    async def test_emergency_unblock_global(self, mock_hass, mock_api):
+        """Test emergency unblock for all clients."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        mock_hass.data[DOMAIN] = {
+            "entry_id": {"api": mock_api}
+        }
+
+        services = AdGuardControlHubServices(mock_hass)
+        call = MagicMock()
+        call.data = {
+            "duration": 300,
+            "clients": ["all"]
+        }
+
+        await services.emergency_unblock(call)
+
+        mock_api.set_protection.assert_called_once_with(False)
+
+    @pytest.mark.asyncio
+    async def test_refresh_data_success(self, mock_hass, mock_coordinator):
+        """Test successful data refresh."""
+        from custom_components.adguard_hub.services import AdGuardControlHubServices
+
+        mock_hass.data[DOMAIN] = {
+            "entry_id": {"coordinator": mock_coordinator}
+        }
+
+        services = AdGuardControlHubServices(mock_hass)
+        call = MagicMock()
+        call.data = {}
+
+        await services.refresh_data(call)
+
+        mock_coordinator.async_request_refresh.assert_called_once()
+
+
+class TestConstants:
+    """Test constant definitions."""
+
+    def test_blocked_services_constants(self):
+        """Test that blocked services are properly defined."""
+        from custom_components.adguard_hub.const import BLOCKED_SERVICES
+
+        required_services = ["youtube", "netflix", "gaming", "facebook"]
+
+        for service in required_services:
+            assert service in BLOCKED_SERVICES
+            assert isinstance(BLOCKED_SERVICES[service], str)
+            assert len(BLOCKED_SERVICES[service]) > 0
+
+    def test_api_endpoints_constants(self):
+        """Test that API endpoints are properly defined."""
+        from custom_components.adguard_hub.const import API_ENDPOINTS
+
+        required_endpoints = [
+            "status", "clients", "stats", "protection",
+            "clients_add", "clients_update", "clients_delete"
+        ]
+
+        for endpoint in required_endpoints:
+            assert endpoint in API_ENDPOINTS
+            assert API_ENDPOINTS[endpoint].startswith("/")
+
+    def test_platform_constants(self):
+        """Test platform constants."""
+        from custom_components.adguard_hub.const import PLATFORMS
+
+        expected_platforms = ["switch", "binary_sensor", "sensor"]
+        assert PLATFORMS == expected_platforms
+
+    def test_service_constants(self):
+        """Test service name constants."""
+        from custom_components.adguard_hub.const import (
+            SERVICE_BLOCK_SERVICES,
+            SERVICE_UNBLOCK_SERVICES,
+            SERVICE_EMERGENCY_UNBLOCK,
+            SERVICE_ADD_CLIENT,
+            SERVICE_REMOVE_CLIENT,
+            SERVICE_REFRESH_DATA,
+        )
+
+        services = [
+            SERVICE_BLOCK_SERVICES,
+            SERVICE_UNBLOCK_SERVICES,
+            SERVICE_EMERGENCY_UNBLOCK,
+            SERVICE_ADD_CLIENT,
+            SERVICE_REMOVE_CLIENT,
+            SERVICE_REFRESH_DATA,
+        ]
+
+        for service in services:
+            assert isinstance(service, str)
+            assert len(service) > 0
+            assert "_" in service  # Snake case format