add test_catgenerator tests and refactored catgenerator

Author: jjisnow

catinabox/catgenerator.py

@@ -2,7 +2,6 @@
 import requests
 import time
 
-
 NAME_GENERATOR_API_ENDPOINT = "http://namey.muffinlabs.com/name.json"
 # ignoring leap years for now
 SECONDS_IN_YEAR = 365 * 24 * 60 * 60
@@ -18,20 +17,30 @@ def __init__(self, e):
         )
 
 
+def get_name():
+    result = requests.get(NAME_GENERATOR_API_ENDPOINT)
+    name = result.json()[0]
+    return name
+
+
+def get_birthday():
+    current_time = int(time.time())
+    birthday = random.randint(
+        current_time - (SECONDS_IN_YEAR * MAX_YEARS_OLD),
+        current_time)
+    birthday_datetime = time.strftime('%Y-%m-%d %H:%M:%S',
+                                      time.localtime(birthday))
+    return birthday_datetime
+
+
 def cat_generator():
     while True:
         try:
-            result = requests.get(NAME_GENERATOR_API_ENDPOINT)
-            name = result.json()[0]
+            name = get_name()
         except requests.exceptions.RequestException as e:
             raise CouldNotGetNameError(e)
 
-        current_time = int(time.time())
-        birthday = random.randint(
-            current_time - (SECONDS_IN_YEAR * MAX_YEARS_OLD),
-            current_time)
-        birthday_datetime = time.strftime('%Y-%m-%d %H:%M:%S',
-                                          time.localtime(birthday))
+        birthday_datetime = get_birthday()
 
-        yield {"name": name,
+        yield {"name"    : name,
                "birthday": birthday_datetime}

tests/test_catgenerator.py

@@ -1,9 +1,30 @@
-# import pytest
+from catinabox.catgenerator import get_name, get_birthday
+from catinabox import catgenerator
 
-# from catinabox import catgenerator
 
+def test_get_name(mocker):
+    mock_get = mocker.patch('requests.get', autospec=True)
+    mock_get.return_value.json.return_value = (['tim'],)
+    assert get_name() == ['tim']
 
-# Write tests for the refactored `catinabox.catgenerator`
 
-def test__():
-    pass
+def test_get_birthday(mocker):
+    mock_time = mocker.patch('time.time', autospec=True)
+    mock_time.side_effect = (catgenerator.SECONDS_IN_YEAR * 35,)
+    mock_bday = mocker.patch('random.randint')
+    mock_bday.return_value = catgenerator.SECONDS_IN_YEAR * 2
+    assert catgenerator.get_birthday() == "1972-01-01 11:00:00"
+    mock_bday.assert_called_with(catgenerator.SECONDS_IN_YEAR * 5,
+                                 catgenerator.SECONDS_IN_YEAR * 35)
+
+
+def test_cat_generator(mocker):
+    mock_name = mocker.patch.object(get_name, autospec=True)
+    mock_name.side_effect = ["David", "Moe"]
+    mock_bday = mocker.patch.object(get_birthday)
+    mock_bday.return_value = 'birthday'
+    catgen = catgenerator.cat_generator()
+    assert next(catgen) == {"name"    : "David",
+                                   "birthday": "birthday"}
+    assert next(catgen) == {"name"    : "Moe",
+                                   "birthday": "birthday"}