add test for api_config

runawaycoast · runawaycoast · commit 784a11f22688 · 2022-08-16T10:28:44.000-04:00
diff --git a/nasdaqdatalink/api_config.py b/nasdaqdatalink/api_config.py
@@ -17,7 +17,7 @@ class ApiConfig:
     retry_status_codes = [429] + list(range(500, 512))
     verify_ssl = True
 
-    def read_key(self, filename):
+    def read_key(self, filename=None):
         if not os.path.isfile(filename):
             raise_empty_file(filename)
 
@@ -117,8 +117,11 @@ def read_key(filename=None):
 
 
 def get_config_from_kwargs(kwargs):
-    params = getattr(kwargs, "params", None)
-    result = getattr(params, "api_config", None)
-    if result is None:
-        result = ApiConfig
+    result = ApiConfig
+    if isinstance(kwargs, dict):
+        params = kwargs.get('params')
+        if isinstance(params, dict):
+            result = params.get('api_config')
+            if not isinstance(result, ApiConfig):
+                result = ApiConfig
     return result
diff --git a/nasdaqdatalink/model/authorized_session.py b/nasdaqdatalink/model/authorized_session.py
@@ -10,24 +10,26 @@
 import urllib
 
 
-def get_retries(api_config):
-    if isinstance(api_config, ApiConfig):
-        if not api_config.use_retries:
-            return Retry(total=0)
-
-        Retry.BACKOFF_MAX = api_config.max_wait_between_retries
-        retries = Retry(total=api_config.number_of_retries,
-                        connect=api_config.number_of_retries,
-                        read=api_config.number_of_retries,
-                        status_forcelist=api_config.retry_status_codes,
-                        backoff_factor=api_config.retry_backoff_factor,
-                        raise_on_status=False)
+def get_retries(api_config=ApiConfig):
+    retries = None
+    if not api_config.use_retries:
+        return Retry(total=0)
+
+    Retry.BACKOFF_MAX = api_config.max_wait_between_retries
+    retries = Retry(total=api_config.number_of_retries,
+                    connect=api_config.number_of_retries,
+                    read=api_config.number_of_retries,
+                    status_forcelist=api_config.retry_status_codes,
+                    backoff_factor=api_config.retry_backoff_factor,
+                    raise_on_status=False)
     return retries
 
 
 class AuthorizedSession:
     def __init__(self, api_config=ApiConfig) -> None:
         super(AuthorizedSession, self).__init__()
+        if not isinstance(api_config, ApiConfig):
+            api_config = ApiConfig
         self._api_config = api_config
         self._auth_session = requests.Session()
         retries = get_retries(self._api_config)
diff --git a/test/test_api_config.py b/test/test_api_config.py
@@ -132,3 +132,58 @@ def test_read_key_from_file_with_tab(self):
     def test_read_key_from_file_with_multi_newline(self):
         given = "keyfordefaultfile\n\nanotherkey\n"
         self._read_key_from_file_helper(given, TEST_DEFAULT_FILE_CONTENTS)
+
+    def test_default_instance_will_have_share_values_with_singleton(self):
+        os.environ['NASDAQ_DATA_LINK_API_KEY'] = 'setinenv'
+        ApiConfig.api_key = None
+        read_key()
+        api_config = ApiConfig()
+        self.assertEqual(api_config.api_key, "setinenv")
+        # make sure change in instance will not affect the singleton
+        api_config.api_key = None
+        self.assertEqual(ApiConfig.api_key, "setinenv")
+
+    def test_get_config_from_kwargs_return_api_config_if_present(self):
+        api_config = get_config_from_kwargs({
+            'params': {
+                'api_config': ApiConfig()
+            }
+        })
+        self.assertTrue(isinstance(api_config, ApiConfig))
+
+    def test_get_config_from_kwargs_return_singleton_if_not_present_or_wrong_type(self):
+        api_config = get_config_from_kwargs(None)
+        self.assertTrue(issubclass(api_config, ApiConfig))
+        self.assertFalse(isinstance(api_config, ApiConfig))
+        api_config = get_config_from_kwargs(1)
+        self.assertTrue(issubclass(api_config, ApiConfig))
+        self.assertFalse(isinstance(api_config, ApiConfig))
+        api_config = get_config_from_kwargs({
+            'params': None
+        })
+        self.assertTrue(issubclass(api_config, ApiConfig))
+        self.assertFalse(isinstance(api_config, ApiConfig))
+
+    def test_instance_read_key_should_raise_error(self):
+        api_config = ApiConfig()
+        with self.assertRaises(TypeError):
+            api_config.read_key(None)
+        with self.assertRaises(ValueError):
+            api_config.read_key('')
+
+    def test_instance_read_key_should_raise_error_when_empty(self):
+        save_key("", TEST_KEY_FILE)
+        api_config = ApiConfig()
+        with self.assertRaises(ValueError):
+            # read empty file
+            api_config.read_key(TEST_KEY_FILE)
+
+    def test_instance_read_the_right_key(self):
+        expected_key = 'ilovepython'
+        save_key(expected_key, TEST_KEY_FILE)
+        api_config = ApiConfig()
+        api_config.api_key = ''
+        api_config.read_key(TEST_KEY_FILE)
+        self.assertEqual(ApiConfig.api_key, expected_key)
+        
+        
diff --git a/test/test_authorized_session.py b/test/test_authorized_session.py
@@ -0,0 +1,24 @@
+from unittest import TestCase
+from unittest.mock import patch
+
+from nasdaqdatalink.model.authorized_session import AuthorizedSession
+from nasdaqdatalink.api_config import ApiConfig
+from requests.sessions import Session
+from requests.adapters import HTTPAdapter
+
+
+class AuthorizedSessionTest(TestCase):
+    def test_authorized_session_assign_correct_internal_config(self):
+        authed_session = AuthorizedSession()
+        self.assertTrue(issubclass(authed_session._api_config, ApiConfig))
+        authed_session = AuthorizedSession(None)
+        self.assertTrue(issubclass(authed_session._api_config, ApiConfig))
+        api_config = ApiConfig()
+        authed_session = AuthorizedSession(api_config)
+        self.assertTrue(isinstance(authed_session._api_config, ApiConfig))
+
+    def test_authorized_session_pass_created_session(self):
+        authed_session = AuthorizedSession()
+        self.assertTrue(isinstance(authed_session._auth_session, Session))
+        adapter = authed_session._auth_session.get_adapter(ApiConfig.api_protocol)
+        self.assertTrue(isinstance(adapter, HTTPAdapter))
