[tests] Removed redundant current_client() fixtures from unit tests

Author: Aryamanz29

tests/unit/conftest.py

@@ -2,34 +2,36 @@
 
 import pytest
 
+from pyatlan.client.atlan import AtlanClient
+
 
 @pytest.fixture()
 def mock_role_cache():
-    with patch("pyatlan.cache.role_cache.RoleCache") as cache:
+    with patch.object(AtlanClient, "role_cache") as cache:
         yield cache
 
 
 @pytest.fixture()
 def mock_user_cache():
-    with patch("pyatlan.cache.user_cache.UserCache") as cache:
+    with patch.object(AtlanClient, "user_cache") as cache:
         yield cache
 
 
 @pytest.fixture()
 def mock_group_cache():
-    with patch("pyatlan.cache.group_cache.GroupCache") as cache:
+    with patch.object(AtlanClient, "group_cache") as cache:
         yield cache
 
 
 @pytest.fixture()
 def mock_custom_metadata_cache():
-    with patch("pyatlan.cache.custom_metadata_cache.CustomMetadataCache") as cache:
+    with patch.object(AtlanClient, "custom_metadata_cache") as cache:
         yield cache
 
 
 @pytest.fixture()
 def mock_tag_cache():
-    with patch("pyatlan.cache.atlan_tag_cache.AtlanTagCache") as cache:
+    with patch.object(AtlanClient, "atlan_tag_cache") as cache:
         yield cache
 
 

tests/unit/model/badge_test.py

@@ -1,5 +1,3 @@
-from unittest.mock import MagicMock
-
 import pytest
 
 from pyatlan.client.atlan import AtlanClient
@@ -37,22 +35,6 @@ def client():
     return AtlanClient()
 
 
-@pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def mock_cm_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    monkeypatch.setattr(AtlanClient, "custom_metadata_cache", mock_cache)
-    return mock_cache
-
-
 @pytest.mark.parametrize(
     "name, cm_name, cm_attribute, badge_conditions, message",
     [
@@ -78,9 +60,9 @@ def test_create_when_required_parameters_are_missing_raises_value_error(
         )
 
 
-def test_create(mock_cm_cache, client: AtlanClient):
-    mock_cm_cache.get_attr_id_for_name.return_value = CM_ATTR_ID
-    mock_cm_cache.get_id_for_name.return_value = CM_ID
+def test_create(mock_custom_metadata_cache, client: AtlanClient):
+    mock_custom_metadata_cache.get_attr_id_for_name.return_value = CM_ATTR_ID
+    mock_custom_metadata_cache.get_id_for_name.return_value = CM_ID
 
     badge = Badge.create(
         client=client,

tests/unit/model/connection_test.py

@@ -1,5 +1,5 @@
 from typing import List, Optional
-from unittest.mock import MagicMock, patch
+from unittest.mock import patch
 
 import pytest
 
@@ -21,36 +21,6 @@ def client():
     return AtlanClient()
 
 
-@pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def mock_group_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    monkeypatch.setattr(AtlanClient, "group_cache", mock_cache)
-    return mock_cache
-
-
-@pytest.fixture()
-def mock_user_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    monkeypatch.setattr(AtlanClient, "user_cache", mock_cache)
-    return mock_cache
-
-
-@pytest.fixture()
-def mock_role_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    monkeypatch.setattr(AtlanClient, "role_cache", mock_cache)
-    return mock_cache
-
-
 @pytest.mark.parametrize(
     "name, connector_type, admin_users, admin_groups, admin_roles, message",
     [

tests/unit/model/data_product_test.py

@@ -34,15 +34,6 @@ def client():
     return AtlanClient()
 
 
-@pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
 def load_json(respones_dir, filename):
     with (respones_dir / filename).open() as input_file:
         return load(input_file)

tests/unit/test_atlan_tag_name.py

@@ -4,7 +4,6 @@
 from pydantic.v1 import parse_obj_as
 
 import pyatlan.cache.atlan_tag_cache
-from pyatlan.client.atlan import AtlanClient
 from pyatlan.model.assets import Purpose
 from pyatlan.model.core import AtlanTagName
 
@@ -13,28 +12,8 @@
 GOOD_ATLAN_TAG_NAME = "PII"
 
 
-@pytest.fixture(autouse=True)
-def set_env(monkeypatch):
-    monkeypatch.setenv("ATLAN_BASE_URL", "https://test.atlan.com")
-    monkeypatch.setenv("ATLAN_API_KEY", "test-api-key")
-
-
-@pytest.fixture()
-def client():
-    return AtlanClient()
-
-
 @pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def good_atlan_tag(current_client: AtlanClient, monkeypatch):
+def good_atlan_tag(monkeypatch):
     def get_id_for_name(_, value):
         return ATLAN_TAG_ID
 
@@ -46,7 +25,7 @@ def get_id_for_name(_, value):
     return AtlanTagName(GOOD_ATLAN_TAG_NAME)
 
 
-def test_init_with_good_name(current_client: AtlanClient, monkeypatch):
+def test_init_with_good_name(monkeypatch):
     def get_id_for_name(_, value):
         assert value == GOOD_ATLAN_TAG_NAME
         return GOOD_ATLAN_TAG_NAME
@@ -70,9 +49,7 @@ def test_convert_to_display_text_when_atlan_tag_passed_returns_same_atlan_tag(
     assert good_atlan_tag is AtlanTagName._convert_to_tag_name(good_atlan_tag)
 
 
-def test_convert_to_display_text_when_bad_string(
-    current_client: AtlanClient, monkeypatch
-):
+def test_convert_to_display_text_when_bad_string(monkeypatch):
     def get_name_for_id(_, __):
         return None
 
@@ -85,7 +62,7 @@ def get_name_for_id(_, __):
     assert AtlanTagName._convert_to_tag_name("bad").__repr__() == "AtlanTagName('bad')"
 
 
-def test_convert_to_tag_name(current_client: AtlanClient, monkeypatch):
+def test_convert_to_tag_name(monkeypatch):
     sut = AtlanTagName._convert_to_tag_name(ATLAN_TAG_ID)
 
     assert str(sut) == ATLAN_TAG_ID
@@ -95,7 +72,7 @@ def test_convert_to_tag_name(current_client: AtlanClient, monkeypatch):
 #     assert AtlanTagName.json_encode_atlan_tag(good_atlan_tag) == ATLAN_TAG_ID
 
 
-def test_asset_tag_name_field_deserialization(current_client: AtlanClient, monkeypatch):
+def test_asset_tag_name_field_deserialization(monkeypatch):
     def get_name_for_id(_, __):
         return None
 

tests/unit/test_client.py

@@ -6,7 +6,7 @@
 from json import load, loads
 from pathlib import Path
 from re import escape
-from unittest.mock import DEFAULT, MagicMock, Mock, call, patch
+from unittest.mock import DEFAULT, Mock, call, patch
 
 import pytest
 from pydantic.v1 import ValidationError
@@ -138,30 +138,6 @@ def client():
     return AtlanClient()
 
 
-@pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def mock_cm_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    mock_cache.get_name_for_id.return_value = CM_NAME
-    monkeypatch.setattr(AtlanClient, "custom_metadata_cache", mock_cache)
-    return mock_cache
-
-
-@pytest.fixture()
-def mock_role_cache(current_client, monkeypatch):
-    mock_cache = MagicMock()
-    monkeypatch.setattr(AtlanClient, "role_cache", mock_cache)
-    return mock_cache
-
-
 @pytest.fixture
 def group_client(mock_api_caller):
     return GroupClient(client=mock_api_caller)
@@ -1878,7 +1854,6 @@ def test_asset_retrieve_minimal_without_asset_type(
 
 
 def test_user_create(
-    current_client,
     mock_api_caller,
     mock_role_cache,
 ):
@@ -1901,9 +1876,7 @@ def test_user_create(
     mock_api_caller.reset_mock()
 
 
-def test_user_create_with_info(
-    current_client, mock_api_caller, mock_role_cache, user_list_json
-):
+def test_user_create_with_info(mock_api_caller, mock_role_cache, user_list_json):
     test_role_id = "role-guid-123"
     client = UserClient(mock_api_caller)
     mock_api_caller._call_api.side_effect = [
@@ -2724,7 +2697,7 @@ def test_get_all_sorting(group_client, mock_api_caller):
     mock_api_caller.reset_mock()
 
 
-def test_get_by_guid_asset_not_found_fluent_search(current_client):
+def test_get_by_guid_asset_not_found_fluent_search():
     guid = "123"
     asset_type = Table
 
@@ -2745,9 +2718,7 @@ def test_get_by_guid_asset_not_found_fluent_search(current_client):
         mock_execute.assert_called_once()
 
 
-def test_get_by_guid_type_mismatch_fluent_search(
-    current_client: AtlanClient, mock_api_caller
-):
+def test_get_by_guid_type_mismatch_fluent_search(mock_api_caller):
     guid = "123"
     expected_asset_type = Table
     returned_asset_type = View
@@ -2772,9 +2743,7 @@ def test_get_by_guid_type_mismatch_fluent_search(
         mock_execute.assert_called_once()
 
 
-def test_get_by_qualified_name_type_mismatch(
-    current_client: AtlanClient, mock_api_caller
-):
+def test_get_by_qualified_name_type_mismatch(mock_api_caller):
     qualified_name = "example_qualified_name"
     expected_asset_type = Table
     returned_asset_type = View
@@ -2798,9 +2767,7 @@ def test_get_by_qualified_name_type_mismatch(
         mock_execute.assert_called_once()
 
 
-def test_get_by_qualified_name_asset_not_found(
-    current_client: AtlanClient, mock_api_caller
-):
+def test_get_by_qualified_name_asset_not_found(mock_api_caller):
     qualified_name = "example_qualified_name"
     asset_type = Table
 

tests/unit/test_connection_cache.py

@@ -22,23 +22,14 @@ def client():
 
 
 @pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def mock_connection_cache(current_client, monkeypatch):
-    mock_cache = ConnectionCache(current_client)
+def mock_connection_cache(client, monkeypatch):
+    mock_cache = ConnectionCache(client)
     monkeypatch.setattr(AtlanClient, "connection_cache", mock_cache)
     return mock_cache
 
 
-def test_get_by_guid_with_not_found_error(current_client):
-    connection_cache = ConnectionCache(current_client)
+def test_get_by_guid_with_not_found_error(client):
+    connection_cache = ConnectionCache(client)
     with pytest.raises(InvalidRequestError, match=ErrorCode.MISSING_ID.error_message):
         connection_cache.get_by_guid("")
 

tests/unit/test_core.py

@@ -24,17 +24,8 @@ def client():
 
 
 @pytest.fixture()
-def current_client(client, monkeypatch):
-    monkeypatch.setattr(
-        AtlanClient,
-        "get_current_client",
-        lambda: client,
-    )
-
-
-@pytest.fixture()
-def mock_tag_cache(current_client, monkeypatch):
-    mock_cache = MagicMock(current_client)
+def mock_tag_cache(client, monkeypatch):
+    mock_cache = MagicMock(client)
     monkeypatch.setattr(AtlanClient, "atlan_tag_cache", mock_cache)
     return mock_cache