update tests

Author: hamdan-mslm

tests/proxy/test_proxy.py

@@ -1,6 +1,6 @@
 import unittest
 from unittest.mock import patch, Mock
-from src.oxylabs.proxy import Proxy
+from oxylabs.proxy import ProxyClient
 
 class TestProxyGet(unittest.TestCase):
     @patch('requests.Session')
@@ -40,7 +40,7 @@ def test_proxy_get_with_timeout(self, MockSession):
         session_instance.get.return_value = mock_response
 
         # Initialize the Proxy with credentials
-        proxy = Proxy("wsapiuman", "A1705pdVe9hil")
+        proxy = ProxyClient("wsapiuman", "A1705pdVe9hil")
 
         # Customize headers (optional)
         proxy.add_user_agent_header("desktop_chrome")

tests/sources/ecommerce/test_wayfair.py

@@ -1,6 +1,6 @@
 import unittest
-from src.oxylabs.sources.ecommerce import Ecommerce, EcommerceAsync
-from src.oxylabs.utils.types import user_agent_type
+from oxylabs.sources.ecommerce import Ecommerce, EcommerceAsync
+from oxylabs.utils.types import user_agent_type
 
 class TestWayfairSearchSync(unittest.TestCase):
     def test_wayfair_search_sync(self):

tests/sources/serp/test_bing.py

@@ -1,82 +1,116 @@
 import unittest
-from src.oxylabs.sources.serp import SERP, SERPAsync
-from src.oxylabs.utils.types import user_agent_type
+from oxylabs.utils.types import user_agent_type
+from oxylabs.internal import AsyncClient, RealtimeClient
 
 class TestBingSearchSync(unittest.TestCase):
+    """
+    Test case for synchronous Bing search.
+
+    This test case tests the functionality of the synchronous Bing search
+    in the RealtimeClient class. It uses a mock response to simulate the
+    behavior of the Bing search.
+    """
+
     def test_bing_search_sync(self):
         """
-        Tests synchronous SERP's Bing search functionality to ensure it returns 
-        expected results.
+        Test the synchronous Bing search.
 
-        Mocks the response from the _get_resp method to simulate SERP 
-        processing and validates that the method handles the search query 
-        correctly and returns the correct mock response.
+        This test creates a RealtimeClient and sets its _get_resp method to a
+        lambda function that returns a mock response. It then calls the
+        scrape_search method with a query and checks that the returned result
+        contains the mock response.
         """
-        serp = SERP('user', 'pass')
+        client = RealtimeClient('user', 'pass')
         query = "nike"
-        opts = {"domain": "com", "limit": 10}
-        serp._get_resp = lambda payload, config: {"mocked_response": "search_results"}
+        client._get_resp = lambda payload, config: {"mocked_response": "search_results"}
 
-        result = serp.bing.scrape_search(query, opts)
+        result = client.serp.bing.scrape_search(query, domain="com", limit=10)
         self.assertIn("mocked_response", result)
         self.assertEqual(result["mocked_response"], "search_results")
 
 class TestBingUrlSync(unittest.TestCase):
+    """
+    Test case for synchronous Bing URL scraping.
+
+    This test case tests the functionality of the synchronous Bing URL scraping
+    in the RealtimeClient class. It uses a mock response to simulate the
+    behavior of the Bing URL scraping.
+    """
+
     def test_bing_url_sync(self):
         """
-        Tests the SERP's Bing URL scraping functionality in a synchronous 
-        manner.
+        Test the synchronous Bing URL scraping.
 
-        Mocks the _get_resp method to return controlled responses, ensuring 
-        that the method correctly processes the URL and user agent type, 
-        returning the expected data.
+        This test creates a RealtimeClient and sets its _get_resp method to a
+        lambda function that returns a mock response. It then calls the
+        scrape_url method with a URL and checks that the returned result
+        contains the mock response.
         """
-        serp = SERP('user', 'pass')
+
+        client = RealtimeClient('user', 'pass')
         url = "https://www.bing.com/search?q=nike"
         opts = {"user_agent_type": user_agent_type.DESKTOP}
-        serp._get_resp = lambda payload, config: {"mocked_response": "url_results"}
+        client._get_resp = lambda payload, config: {"mocked_response": "url_results"}
 
-        result = serp.bing.scrape_url(url, opts)
+        result = client.serp.bing.scrape_url(url, opts)
         self.assertIn("mocked_response", result)
         self.assertEqual(result["mocked_response"], "url_results")
 
+
 class TestBingSearchAsync(unittest.IsolatedAsyncioTestCase):
+    """
+    Test case for asynchronous Bing search.
+
+    This test case tests the functionality of the asynchronous Bing search
+    in the AsyncClient class. It uses a mock response to simulate the
+    behavior of the Bing search.
+    """
+
     async def test_bing_search_async(self):
         """
-        Asynchronously tests SERP's Bing search to validate the async 
-        API handling.
+        Test the asynchronous Bing search.
 
-        Uses a mocked asynchronous response to verify that the search query 
-        processing is handled correctly and that the async functionality 
-        returns expected results.
+        This test creates an AsyncClient and sets its _get_resp method to a
+        mock function that returns a mock response. It then calls the
+        scrape_search method with a query and checks that the returned result
+        contains the mock response.
         """
-        serp_async = SERPAsync('user', 'pass')
+        client = AsyncClient('user', 'pass')
         query = "nike"
         opts = {"domain": "com", "limit": 10}
         async def mock_get_resp(payload, config):
             return {"mocked_response": "async_search_results"}
-        serp_async._get_resp = mock_get_resp
+        client._get_resp = mock_get_resp
 
-        result = await serp_async.bing_async.scrape_search(query, opts)
+        result = await client.serp.bing.scrape_search(query, opts)
         self.assertIn("mocked_response", result)
         self.assertEqual(result["mocked_response"], "async_search_results")
 
 class TestBingUrlAsync(unittest.IsolatedAsyncioTestCase):
+    """
+    Test case for asynchronous Bing URL scraping.
+
+    This test case tests the functionality of the asynchronous Bing URL scraping
+    in the AsyncClient class. It uses a mock response to simulate the
+    behavior of the Bing URL scraping.
+    """
+
     async def test_bing_url_async(self):
         """
-        Asynchronously tests SERP's Bing URL scraping functionality.
+        Test the asynchronous Bing URL scraping.
 
-        Mocks the _get_resp method to provide controlled async responses, 
-        verifying that the URL and user agent options are processed correctly 
-        and yield expected outcomes.
+        This test creates an AsyncClient and sets its _get_resp method to a
+        mock function that returns a mock response. It then calls the
+        scrape_url method with a URL and checks that the returned result
+        contains the mock response.
         """
-        serp_async = SERPAsync('user', 'pass')
+        client = AsyncClient('user', 'pass')
         url = "https://www.bing.com/search?q=nike"
         opts = {"user_agent_type": user_agent_type.DESKTOP}
         async def mock_get_resp(payload, config):
             return {"mocked_response": "async_url_results"}
-        serp_async._get_resp = mock_get_resp
+        client._get_resp = mock_get_resp
 
-        result = await serp_async.bing_async.scrape_url(url, opts)
+        result = await client.serp.bing.scrape_url(url, opts)
         self.assertIn("mocked_response", result)
         self.assertEqual(result["mocked_response"], "async_url_results")