implement and use TestAPIBase._create_resource

Author: geetu040

openml/testing.py

@@ -15,8 +15,8 @@
 import requests
 
 import openml
-from openml._api import HTTPCache, HTTPClient, MinIOClient
-from openml.enums import APIVersion, RetryPolicy
+from openml._api import API_REGISTRY, HTTPCache, HTTPClient, MinIOClient, ResourceAPI
+from openml.enums import APIVersion, ResourceType, RetryPolicy
 from openml.exceptions import OpenMLServerException
 from openml.tasks import TaskType
 
@@ -316,6 +316,11 @@ def setUp(self, n_levels: int = 1, tmpdir_suffix: str = "") -> None:
         }
         self.minio_client = MinIOClient(path=cache_dir)
 
+    def _create_resource(self, api_version: APIVersion, resource_type: ResourceType) -> ResourceAPI:
+        http_client = self.http_clients[api_version]
+        resource_cls = API_REGISTRY[api_version][resource_type]
+        return resource_cls(http=http_client, minio=self.minio_client)
+
 
 def check_task_existence(
     task_type: TaskType,

tests/test_api/test_versions.py

@@ -48,9 +48,10 @@ def _tag_and_untag(self):
 class TestResourceV1API(TestResourceAPIBase):
     def setUp(self):
         super().setUp()
-        http_client = self.http_clients[APIVersion.V1]
-        self.resource = ResourceV1API(http_client)
-        self.resource.resource_type = ResourceType.TASK
+        self.resource = self._create_resource(
+            api_version=APIVersion.V1,
+            resource_type=ResourceType.TASK,
+        )
 
     def test_publish_and_delete(self):
         self._publish_and_delete()
@@ -62,9 +63,10 @@ def test_tag_and_untag(self):
 class TestResourceV2API(TestResourceAPIBase):
     def setUp(self):
         super().setUp()
-        http_client = self.http_clients[APIVersion.V2]
-        self.resource = ResourceV2API(http_client)
-        self.resource.resource_type = ResourceType.TASK
+        self.resource = self._create_resource(
+            api_version=APIVersion.V2,
+            resource_type=ResourceType.TASK,
+        )
 
     def test_publish_and_delete(self):
         with pytest.raises(OpenMLNotSupportedError):
@@ -78,14 +80,14 @@ def test_tag_and_untag(self):
 class TestResourceFallbackAPI(TestResourceAPIBase):
     def setUp(self):
         super().setUp()
-        http_client_v1 = self.http_clients[APIVersion.V1]
-        resource_v1 = ResourceV1API(http_client_v1)
-        resource_v1.resource_type = ResourceType.TASK
-
-        http_client_v2 = self.http_clients[APIVersion.V2]
-        resource_v2 = ResourceV2API(http_client_v2)
-        resource_v2.resource_type = ResourceType.TASK
-
+        resource_v1 = self._create_resource(
+            api_version=APIVersion.V1,
+            resource_type=ResourceType.TASK,
+        )
+        resource_v2 = self._create_resource(
+            api_version=APIVersion.V2,
+            resource_type=ResourceType.TASK,
+        )
         self.resource = FallbackProxy(resource_v2, resource_v1)
 
     def test_publish_and_delete(self):