update tests structure

Author: EmanAbdelhaleem

tests/test_api/test_estimation_procedures.py

@@ -2,24 +2,33 @@
 from __future__ import annotations  
 
 import pytest  
+from openml._api.config import settings
 
-from openml._api.runtime.core import build_backend
-from openml.testing import TestBase  
+from openml._api.resources.estimation_procedures import EstimationProceduresV1, EstimationProceduresV2
+from openml.testing import TestAPIBase
+from openml._api.resources.base.fallback import FallbackProxy
 
 
-class TestEstimationProceduresV1(TestBase):  
+class TestEstimationProceduresV1(TestAPIBase):  
     """Tests for V1 XML API implementation of estimation procedures."""  
 
     _multiprocess_can_split_ = True  
 
     def setUp(self) -> None:    
         super().setUp() 
-        backend = build_backend('v1', strict=True)
-        self.api = backend.estimation_procedures
+        self.client = self._get_http_client(
+            server=settings.api.v1.server,
+            base_url=settings.api.v1.base_url,
+            api_key=settings.api.v1.api_key,
+            timeout=settings.api.v1.timeout,
+            retries=settings.connection.retries,
+            retry_policy=settings.connection.retry_policy,
+        )
+        self.resource = EstimationProceduresV1(self.client)
 
     @pytest.mark.uses_test_server()
     def test_list(self):
-        procedures = self.api.list()
+        procedures = self.resource.list()
 
         assert isinstance(procedures, list)
         assert len(procedures) > 0
@@ -28,7 +37,7 @@ def test_list(self):
 
     @pytest.mark.uses_test_server()
     def test_get_details(self):
-        details = self.api._get_details()
+        details = self.resource._get_details()
 
         assert isinstance(details, list)
         assert len(details) > 0
@@ -39,20 +48,67 @@ def test_get_details(self):
         assert all("task_type_id" in d for d in details)
 
 
-class TestEstimationProceduresV2(TestBase):
+class TestEstimationProceduresV2(TestAPIBase):
     """Tests for V2 JSON API implementation of estimation procedures."""   
 
     _multiprocess_can_split_ = True  
 
     def setUp(self) -> None:    
         super().setUp() 
-        backend = build_backend('v2', strict=True)
-        self.api = backend.estimation_procedures
+        self.client = self._get_http_client(
+            server=settings.api.v2.server,
+            base_url=settings.api.v2.base_url,
+            api_key=settings.api.v2.api_key,
+            timeout=settings.api.v2.timeout,
+            retries=settings.connection.retries,
+            retry_policy=settings.connection.retry_policy,
+        )
+        self.resource = EstimationProceduresV2(self.client)
 
     @pytest.mark.uses_test_server()
     def test_list(self):
-        procedures = self.api.list()
+        procedures = self.resource.list()
 
         assert isinstance(procedures, list)
         assert len(procedures) > 0
         assert all(isinstance(p, str) for p in procedures)
+
+
+class TestEstimationProceduresCombined(TestAPIBase):
+    def setUp(self):
+        super().setUp()
+        self.v1_client = self._get_http_client(
+            server=settings.api.v1.server,
+            base_url=settings.api.v1.base_url,
+            api_key=settings.api.v1.api_key,
+            timeout=settings.api.v1.timeout,
+            retries=settings.connection.retries,
+            retry_policy=settings.connection.retry_policy,
+        )
+        self.v2_client = self._get_http_client(
+            server=settings.api.v2.server,
+            base_url=settings.api.v2.base_url,
+            api_key=settings.api.v2.api_key,
+            timeout=settings.api.v2.timeout,
+            retries=settings.connection.retries,
+            retry_policy=settings.connection.retry_policy,
+        )
+        self.resource_v1 = EstimationProceduresV1(self.v1_client)
+        self.resource_v2 = EstimationProceduresV2(self.v2_client)
+        self.resource_fallback = FallbackProxy(self.resource_v2, self.resource_v1)
+
+    @pytest.mark.uses_test_server()
+    def test_list_matches(self):
+        output_v1 = self.resource_v1.list()
+        output_v2 = self.resource_v2.list()
+        # output_v1 matches output_v2
+        assert isinstance(output_v1, list)
+        assert isinstance(output_v2, list)
+        assert output_v1 == output_v2
+
+    @pytest.mark.uses_test_server()
+    def test_list_fallback(self):
+        output_fallback = self.resource_fallback.list()
+        assert isinstance(output_fallback, list)
+        assert len(output_fallback) > 0
+        assert all(isinstance(p, str) for p in output_fallback)