Decode response_content before loading in JSON #297

- Add a unit test for `api.request_license_data`

Signed-off-by: Thomas Druez <[email protected]>

Author: tdruez

src/attributecode/api.py

@@ -63,7 +63,7 @@ def request_license_data(url, api_key, license_key):
     try:
         request = Request(quoted_url, headers=headers)
         response = urlopen(request)
-        response_content = response.read()
+        response_content = response.read().decode('utf-8')
         license_data = json.loads(response_content)
         if not license_data['results']:
             msg = u"Invalid 'license': %s" % license_key

tests/test_api.py

@@ -23,11 +23,23 @@
 from mock import patch
 
 from attributecode import api
+from attributecode import ERROR
+from attributecode import Error
+
+
+class FakeResponse(object):
+    response_content = None
+
+    def __init__(self, response_content):
+        self.response_content = response_content
+
+    def read(self):
+        return self.response_content
 
 
 class ApiTest(unittest.TestCase):
     @patch.object(api, 'request_license_data')
-    def test_get_license_details_from_api(self, mock_data):
+    def test_api_get_license_details_from_api(self, mock_data):
         license_data = {
             'name': 'Apache License 2.0',
             'full_text': 'Apache License Version 2.0 ...',
@@ -39,3 +51,19 @@ def test_get_license_details_from_api(self, mock_data):
         expected = ('Apache License 2.0', 'apache-2.0', 'Apache License Version 2.0 ...', [])
         result = api.get_license_details_from_api('url', 'api_key', 'license_key')
         assert expected == result
+
+    @patch.object(api, 'urlopen')
+    def test_api_request_license_data(self, mock_data):
+        response_content = (
+            b'{"count":1,"results":[{"name":"Apache 2.0","key":"apache-2.0","text":"Text"}]}'
+        )
+        mock_data.return_value = FakeResponse(response_content)
+        license_data = api.request_license_data('http://fake.url/', 'api_key', 'apache-2.0')
+        expected = ({'name': 'Apache 2.0', 'key': 'apache-2.0', 'text': 'Text'}, [])
+        assert expected == license_data
+
+        response_content = b'{"count":0,"results":[]}'
+        mock_data.return_value = FakeResponse(response_content)
+        license_data = api.request_license_data('http://fake.url/', 'api_key', 'apache-2.0')
+        expected = ({}, [Error(ERROR, "Invalid 'license': apache-2.0")])
+        assert expected == license_data