Merge branch 'master' into dev-greg

1 files changed, 17 insertions, 14 deletions

diff --git a/tests/managers/thl/test_user_manager/test_mysql.py b/tests/managers/thl/test_user_manager/test_mysql.py
index 0313bbf..ed7d458 100644
--- a/tests/managers/thl/test_user_manager/test_mysql.py
+++ b/tests/managers/thl/test_user_manager/test_mysql.py
@@ -1,25 +1,28 @@
-from test_utils.models.conftest import user, user_manager
+from __future__ import annotations
+
+from typing import TYPE_CHECKING
+
+if TYPE_CHECKING:
+    from generalresearch.managers.thl.user_manager.mysql_user_manager import (
+        MysqlUserManager,
+    )
+    from generalresearch.models.thl.user import User
 
 
 class TestUserManagerMysqlNew:
 
-    def test_get_notset(self, user_manager):
-        assert (
-            user_manager.mysql_user_manager.get_user_from_mysql(user_id=-3105) is None
-        )
+    def test_get_notset(self, mysql_user_manager: MysqlUserManager):
+        assert mysql_user_manager.get_user_from_mysql(user_id=-3105) is None
 
-    def test_get_user_id(self, user, user_manager):
-        assert (
-            user_manager.mysql_user_manager.get_user_from_mysql(user_id=user.user_id)
-            == user
-        )
+    def test_get_user_id(self, user: User, mysql_user_manager: MysqlUserManager):
+        assert mysql_user_manager.get_user_from_mysql(user_id=user.user_id) == user
 
-    def test_get_uuid(self, user, user_manager):
-        u = user_manager.mysql_user_manager.get_user_from_mysql(user_uuid=user.uuid)
+    def test_get_uuid(self, user: User, mysql_user_manager: MysqlUserManager):
+        u = mysql_user_manager.get_user_from_mysql(user_uuid=user.uuid)
         assert u == user
 
-    def test_get_ubp(self, user, user_manager):
-        u = user_manager.mysql_user_manager.get_user_from_mysql(
+    def test_get_ubp(self, user: User, mysql_user_manager: MysqlUserManager):
+        u = mysql_user_manager.get_user_from_mysql(
             product_id=user.product_id, product_user_id=user.product_user_id
         )
         assert u == user