ENH: async tests

Author: dmgav

pyproject.toml

@@ -38,6 +38,7 @@ Homepage = "https://github.com/dmgav/save-and-restore-api"
 dev = [
   "pytest >=6",
   "pytest-cov >=3",
+  "pytest-asyncio",
   "pre-commit",
   "ruff",
 ]

src/save_and_restore_api/_api_async.py

@@ -33,5 +33,9 @@ async def send_request(
         return response
 
     async def login(self, *, username=None, password=None):
-        method, url, params = await self._prepare_login(username=username, password=password)
-        self.send_request(method, url, params=params)
+        method, url, params = self._prepare_login(username=username, password=password)
+        await self.send_request(method, url, params=params)
+
+    async def get_node(self, node_uid):
+        method, url = self._prepare_get_node(node_uid=node_uid)
+        return await self.send_request(method, url)

src/save_and_restore_api/_api_base.py

@@ -4,10 +4,6 @@
 
 import httpx
 
-rest_api_method_map = {
-    "login": ("POST", "/login"),
-}
-
 
 class RequestParameterError(Exception): ...
 
@@ -143,12 +139,13 @@ def _prepare_request(
         return kwargs
 
     def _prepare_login(self, *, username=None, password=None):
-        method, url = rest_api_method_map["login"]
+        method, url = "POST", "/login"
         params = {"username": username, "password": password}
         return method, url, params
 
-    def get_node(self, node_uid):
-        return self.send_request("GET", f"/node/{node_uid}")
+    def _prepare_get_node(self, *, node_uid):
+        method, url = "GET", f"/node/{node_uid}"
+        return method, url
 
     def get_children(self, node_uid):
         return self.send_request("GET", f"/node/{node_uid}/children")

src/save_and_restore_api/_api_threads.py

@@ -35,3 +35,7 @@ def send_request(
     def login(self, *, username=None, password=None):
         method, url, params = self._prepare_login(username=username, password=password)
         self.send_request(method, url, params=params)
+
+    def get_node(self, node_uid):
+        method, url = self._prepare_get_node(node_uid=node_uid)
+        return self.send_request(method, url)

tests/__init__.py

@@ -2,24 +2,37 @@
 
 import importlib.metadata
 
-import save_and_restore_api as m
-from save_and_restore_api import SaveRestoreAPI
+import pytest
 
+import save_and_restore_api
+from save_and_restore_api import SaveRestoreAPI as SaveRestoreAPI_Threads
+from save_and_restore_api.aio import SaveRestoreAPI as SaveRestoreAPI_Async
 
-def test_version():
-    assert importlib.metadata.version("save_and_restore_api") == m.__version__
+admin_username, admin_password = "admin", "adminPass"
+user_username, user_password = "user", "userPass"
+read_username, read_password = "johndoe", "1234"
+
+base_url = "http://localhost:8080/save-restore"
 
 
-def test_import():
-    from save_and_restore_api import SaveRestoreAPI  # noqa: F401
+def test_version():
+    assert importlib.metadata.version("save_and_restore_api") == save_and_restore_api.__version__
 
 
 def test_comm():
-    SR = SaveRestoreAPI(base_url="http://localhost:8080/save-restore", timeout=2)
-    # SR.set_username_password(username="johndoe", password="1234")
-    SR.set_auth(username="user", password="userPass")
-    # SR.set_username_password(username="admin", password="adminPass")
+    SR = SaveRestoreAPI_Threads(base_url=base_url, timeout=2)
+    SR.set_auth(username=user_username, password=user_password)
     SR.open()
     SR.login(username="user", password="userPass")
     SR.get_node(SR.ROOT_NODE_UID)
     SR.close()
+
+
+@pytest.mark.asyncio
+async def test_comm_async():
+    SR = SaveRestoreAPI_Async(base_url=base_url, timeout=2)
+    SR.set_auth(username="user", password="userPass")
+    SR.open()
+    await SR.login(username="user", password="userPass")
+    await SR.get_node(SR.ROOT_NODE_UID)
+    await SR.close()