Upated unit tests accordingly

Author: tisnik

src/configuration.py

@@ -56,45 +56,46 @@ def init_from_dict(self, config_dict: dict[Any, Any]) -> None:
         """Initialize configuration from a dictionary."""
         self._configuration = Configuration(**config_dict)
 
-    def check_configuration_loaded(self):
-        """Check that configuration is loaded, raise exception instead."""
-        if self._configuration is None:
-            raise LogicError("logic error: configuration is not loaded")
-
     @property
     def configuration(self) -> Configuration:
         """Return the whole configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration
 
     @property
     def service_configuration(self) -> ServiceConfiguration:
         """Return service configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.service
 
     @property
     def llama_stack_configuration(self) -> LlamaStackConfiguration:
         """Return Llama stack configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.llama_stack
 
     @property
     def user_data_collection_configuration(self) -> UserDataCollection:
         """Return user data collection configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.user_data_collection
 
     @property
     def mcp_servers(self) -> list[ModelContextProtocolServer]:
         """Return model context protocol servers configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.mcp_servers
 
     @property
     def authentication_configuration(self) -> AuthenticationConfiguration:
         """Return authentication configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
 
         if self._configuration.authentication is None:
             raise LogicError("logic error: authentication configuration is not loaded")
@@ -104,7 +105,8 @@ def authentication_configuration(self) -> AuthenticationConfiguration:
     @property
     def authorization_configuration(self) -> AuthorizationConfiguration:
         """Return authorization configuration or default no-op configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
 
         if self._configuration.authorization is None:
             return AuthorizationConfiguration()
@@ -114,19 +116,22 @@ def authorization_configuration(self) -> AuthorizationConfiguration:
     @property
     def customization(self) -> Optional[Customization]:
         """Return customization configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.customization
 
     @property
     def inference(self) -> InferenceConfiguration:
         """Return inference configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.inference
 
     @property
     def database_configuration(self) -> DatabaseConfiguration:
         """Return database configuration."""
-        self.check_configuration_loaded()
+        if self._configuration is None:
+            raise LogicError("logic error: configuration is not loaded")
         return self._configuration.database
 
 

tests/unit/test_configuration.py

@@ -1,7 +1,7 @@
 """Unit tests for functions defined in src/configuration.py."""
 
 import pytest
-from configuration import AppConfig
+from configuration import AppConfig, LogicError
 from models.config import ModelContextProtocolServer
 
 
@@ -290,63 +290,49 @@ def test_mcp_servers_property_with_servers() -> None:
 def test_configuration_not_loaded():
     """Test that accessing configuration before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.configuration  # pylint: disable=pointless-statement
 
 
 def test_service_configuration_not_loaded():
     """Test that accessing service_configuration before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.service_configuration  # pylint: disable=pointless-statement
 
 
 def test_llama_stack_configuration_not_loaded():
     """Test that accessing llama_stack_configuration before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.llama_stack_configuration  # pylint: disable=pointless-statement
 
 
 def test_user_data_collection_configuration_not_loaded():
     """Test that accessing user_data_collection_configuration before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.user_data_collection_configuration  # pylint: disable=pointless-statement
 
 
 def test_mcp_servers_not_loaded():
     """Test that accessing mcp_servers before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.mcp_servers  # pylint: disable=pointless-statement
 
 
 def test_authentication_configuration_not_loaded():
     """Test that accessing authentication_configuration before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.authentication_configuration  # pylint: disable=pointless-statement
 
 
 def test_customization_not_loaded():
     """Test that accessing customization before loading raises an error."""
     cfg = AppConfig()
-    with pytest.raises(
-        AssertionError, match="logic error: configuration is not loaded"
-    ):
+    with pytest.raises(LogicError, match="logic error: configuration is not loaded"):
         cfg.customization  # pylint: disable=pointless-statement