update client config in test_estimation_procedure

Author: EmanAbdelhaleem

…s/test_api/test_estimation_procedures.py …ts/test_api/test_estimation_procedure.pytests/test_api/test_estimation_procedures.py renamed to tests/test_api/test_estimation_procedure.py tests/test_api/test_estimation_procedures.py renamed to tests/test_api/test_estimation_procedure.py

@@ -1,10 +1,8 @@
 # License: BSD 3-Clause  
 from __future__ import annotations  
 
-import pytest  
-from openml._api.config import settings
-  
-from openml._api.resources.estimation_procedures import EstimationProceduresV1, EstimationProceduresV2
+import pytest    
+from openml._api.resources.estimation_procedure import EstimationProcedureV1API, EstimationProcedureV2API
 from openml.testing import TestAPIBase
 from openml._api.resources.base.fallback import FallbackProxy
 
@@ -16,15 +14,8 @@ class TestEstimationProceduresV1(TestAPIBase):
 
     def setUp(self) -> None:    
         super().setUp() 
-        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)
+        self.client = self.http_client
+        self.resource = EstimationProcedureV1API(self.client)
 
     @pytest.mark.uses_test_server()
     def test_list(self):
@@ -56,14 +47,15 @@ class TestEstimationProceduresV2(TestAPIBase):
     def setUp(self) -> None:    
         super().setUp() 
         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,
+            server="http://localhost:8001/",
+            base_url="",
+            api_key="",
+            timeout_seconds=self.timeout_seconds,
+            retries=self.retries,
+            retry_policy=self.retry_policy,
+            cache=self.cache,
         )
-        self.resource = EstimationProceduresV2(self.client)
+        self.resource = EstimationProcedureV2API(self.client)
 
     @pytest.mark.uses_test_server()
     def test_list(self):
@@ -77,31 +69,25 @@ def test_list(self):
 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.v1_client = self.http_client
         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,
+            server="http://localhost:8001/",
+            base_url="",
+            api_key="",
+            timeout_seconds=self.timeout_seconds,
+            retries=self.retries,
+            retry_policy=self.retry_policy,
+            cache=self.cache,
         )
-        self.resource_v1 = EstimationProceduresV1(self.v1_client)
-        self.resource_v2 = EstimationProceduresV2(self.v2_client)
+        self.resource_v1 = EstimationProcedureV1API(self.v1_client)
+        self.resource_v2 = EstimationProcedureV2API(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