- refactor tests

Author: r-brown

netlicensing/netlicensing.py

@@ -9,6 +9,7 @@ class NetLicensing:
     def __init__(self, nlic_apikey, nlic_baseurl=NLIC_API_URL):
         self.nlic_apikey = nlic_apikey
         self.nlic_baseurl = nlic_baseurl
+
         # https://requests.readthedocs.io/en/master/user/advanced/
         requests_session = requests.Session()
         requests_adapters = requests.adapters.HTTPAdapter(max_retries=3)
@@ -35,14 +36,23 @@ def __init__(self, code=None, reason=None):
 
     @staticmethod
     def get_response(response):
+        verbose = True
+        if verbose:
+            print('NetLicensing response:')
+            print(response.url)
+            print(response.headers)
+            print(response.status_code)
+            print(response.elapsed)
+
         if response.status_code != requests.codes.ok:
             raise NetLicensing.HttpError(response.status_code, response.reason)
         result = response.json()
-        if result['code'] != 0:
-            raise NetLicensing.ResponseError(
-                result.get('code'), result.get('message')
-            )
-        return result.get('response')
+
+        if verbose:
+            print('NetLicensing result:')
+            print(result)
+
+        return result
 
     def _get(self, url, payload=None):
         response = self.requests_session.get(url, params=payload)
@@ -56,20 +66,10 @@ def _delete(self, url, payload=None):
         response = self.requests_session.delete(url, data=payload)
         return self.get_response(response)
 
-    def validate(self, licensee_uid):
-        url = f'{self.nlic_baseurl}licensee/{licensee_uid}/validate'
-        payload = {'licensee_uid': licensee_uid}
-        return self._post(url, payload)
+    def validate(self, licensee_number):
+        url = f'{self.nlic_baseurl}licensee/{licensee_number}/validate'
+        return self._post(url)
 
-    def get_licensee(self, licensee_uid):
-        url = f'{self.imp_url}licensee/{licensee_uid}'
+    def get_licensee(self, licensee_number):
+        url = f'{self.nlic_baseurl}licensee/{licensee_number}'
         return self._get(url)
-
-    def get_licensee(self, **kwargs):
-        customer_uid = kwargs.get('customer_uid')
-        url = f'{self.imp_url}licensee/{customer_uid}'
-        return self._get(url)
-
-    def delete_licensee(self, licensee_uid):
-        url = f'{self.imp_url}licensee/{licensee_uid}'
-        return self._delete(url)

tests/test_about.py tests/test_common.pytests/test_about.py renamed to tests/test_common.py

@@ -0,0 +1,12 @@
+import pytest, json
+
+def test_get_licensee(netlicensing):
+    customer_number = 'CUST-001'
+    result = netlicensing.get_licensee(customer_number)
+    assert customer_number in json.dumps(result)
+
+def test_validate(netlicensing):
+    customer_number = 'CUST-11'
+    result = netlicensing.validate(customer_number)
+    assert 'ProductModuleValidation' in json.dumps(result)
+    assert 'true' in json.dumps(result)