cleanup

Author: ExpDev07

.gitignore

@@ -8,6 +8,9 @@
 __pycache__/
 *.py[cod]
 
+# Testing
+.pytest_cache/
+
 # C extensions
 *.so
 

tests/test_coordinates.py

@@ -1,19 +1,19 @@
-from unittest import mock
 import pytest
-
+from unittest import mock
 from app import coordinates
 
-@pytest.mark.parametrize("latitude, longitude",
-                         [("1", "2"),
-                          (100, "2"),
-                          (-3, 0),
-                          (-10, -10000000)])
+@pytest.mark.parametrize("latitude, longitude", [
+                            ("1", "2"),
+                            (100, "2"),
+                            (-3, 0),
+                            (-10, -10000000)])
 def test_coordinates_class(latitude, longitude):
-    coord_obj = coordinates.Coordinates(latitude=latitude,
-                                        longitude=longitude)
+    coord_obj = coordinates.Coordinates(latitude=latitude, longitude=longitude)
 
     #validate serialize
-    check_obj = {'latitude' : latitude,
-                 'longitude': longitude}
+    check_obj = {
+        'latitude' : latitude,
+        'longitude': longitude
+    }
 
     assert coord_obj.serialize() == check_obj

tests/test_countrycodes.py

@@ -1,23 +1,22 @@
 import pytest
-
 from app.utils import countrycodes
 
 """
 Todo:
     * Test cases for capturing of stdout/stderr
 """
 
-@pytest.mark.parametrize("country_name,expected_country_code",
-                         [("Germany", "DE"),
-                          ("Bolivia, Plurinational State of", "BO"),
-                          ("Korea, Democratic People's Republic of", "KP"),
-                          ("BlaBla", "XX")])
+@pytest.mark.parametrize("country_name,expected_country_code", [
+                            ("Germany", "DE"),
+                            ("Bolivia, Plurinational State of", "BO"),
+                            ("Korea, Democratic People's Republic of", "KP"),
+                            ("BlaBla", "XX")])
 def test_countrycodes_is_3166_1(country_name, expected_country_code):
     assert countrycodes.country_code(country_name) == expected_country_code
 
-@pytest.mark.parametrize("country_name_synonym, expected_country_code",
-                         [("Deutschland", "DE"),
-                          ("Iran (Islamic Republic of)", "IR"),
-                          ("British Virgin Islands", "VG")])
+@pytest.mark.parametrize("country_name_synonym, expected_country_code", [
+                            ("Deutschland", "DE"),
+                            ("Iran (Islamic Republic of)", "IR"),
+                            ("British Virgin Islands", "VG")])
 def test_countrycodes_synonym(country_name_synonym, expected_country_code):
     assert countrycodes.country_code(country_name_synonym) == expected_country_code

tests/test_date.py

@@ -1,17 +1,15 @@
 import pytest
-
 from app.utils import date
 
-
-@pytest.mark.parametrize("str_date, fuzzy_bool, expected_value",
-                         [("1990-12-1", False, True),
-                          ("2005/3", False, True),
-                          ("Jan 19, 1990", False, True),
-                          ("today is 2019-03-27", False, False),
-                          ("Monday at 12:01am", False, True),
-                          ("xyz_not_a_date", False, False),
-                          ("yesterday", False, False),
-                          ("today is 2019-03-27", True, True)])
+@pytest.mark.parametrize("str_date, fuzzy_bool, expected_value", [
+                            ("1990-12-1", False, True),
+                            ("2005/3", False, True),
+                            ("Jan 19, 1990", False, True),
+                            ("today is 2019-03-27", False, False),
+                            ("Monday at 12:01am", False, True),
+                            ("xyz_not_a_date", False, False),
+                            ("yesterday", False, False),
+                            ("today is 2019-03-27", True, True)])
 def test_is_date(str_date, fuzzy_bool, expected_value):
     """
     Testdata from https://stackoverflow.com/a/25341965/7120095

tests/test_jhu.py

@@ -1,8 +1,7 @@
-from unittest import mock
+import app
 import datetime
 import pytest
-
-import app
+from unittest import mock
 from app.utils import date
 from app import location
 from app.services.location import jhu
@@ -21,7 +20,6 @@ def __init__(self, url, filename, state):
             self.state = state
             self.text = self.read_file(self.state)
 
-
         def read_file(self, state):
             """
             Mock HTTP GET-method and return text from file
@@ -33,8 +31,10 @@ def read_file(self, state):
 
     #get url from `request.get`
     url = args[0]
+
     #get filename from url
     filename = url.split("/")[-1]
+
     #clean up for id token (e.g. Deaths)
     state = filename.split("-")[-1].replace(".csv", "").lower().capitalize()
 
@@ -58,16 +58,15 @@ def isoformat(self):
 
     return DateTimeStrpTime(date, strformat)
 
-@pytest.mark.parametrize("category, capitalize_category",
-                         [("deaths", "Deaths"),
-                          ("recovered", "Recovered"),
-                          ("confirmed", "Confirmed")])
+@pytest.mark.parametrize("category, capitalize_category", [
+                            ("deaths", "Deaths"),
+                            ("recovered", "Recovered"),
+                            ("confirmed", "Confirmed")])
 @mock.patch('app.services.location.jhu.requests.get', side_effect=mocked_requests_get)
 def test_validate_category(mock_request_get, category, capitalize_category):
-    base_url = 'https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/\
-                master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-%s.csv'
-
+    base_url = 'https://raw.githubusercontent.com/CSSEGISandData/2019-nCoV/master/csse_covid_19_data/csse_covid_19_time_series/time_series_19-covid-%s.csv'
     request = app.services.location.jhu.requests.get(base_url % category)
+    
     assert request.state == capitalize_category
 
 @pytest.mark.parametrize("category, datetime_str, latest_value, country_name, \

tests/test_location.py

@@ -1,7 +1,6 @@
-from unittest import mock
 import pytest
-
-from app import (location, coordinates, timeline)
+from unittest import mock
+from app import location, coordinates, timeline
 
 def mocked_timeline(*args, **kwargs):
     class TestTimeline:

tests/test_routes.py

@@ -1,12 +1,10 @@
+import app
 import unittest
-from unittest import mock
 import json
-
-import app
+from unittest import mock
 from app import services
 
-from .test_jhu import (mocked_requests_get, mocked_strptime_isoformat,
-                       DATETIME_STRING)
+from .test_jhu import mocked_requests_get, mocked_strptime_isoformat, DATETIME_STRING
 
 @mock.patch('app.services.location.jhu.datetime')
 @mock.patch('app.services.location.jhu.requests.get', side_effect=mocked_requests_get)
@@ -17,7 +15,7 @@ class FlaskRoutesTest(unittest.TestCase):
     Store all integration testcases in one class to ensure app context
     """
 
-    #load app context only once
+    #load app context only once.
     app = app.create_app()
 
     def setUp(self):
@@ -97,11 +95,9 @@ def test_v2_locations_id(self, mock_request_get, mock_datetime):
 
         state = "locations"
         test_id = 1
-        return_data = self.client.get("/v2/{}/{}".format(state, test_id)) \
-                                                 .data.decode()
+        return_data = self.client.get("/v2/{}/{}".format(state, test_id)).data.decode()
 
-        filepath = "tests/expected_output/v2_{state}_id_{test_id}.json".format(state=state,
-                                                                               test_id=test_id)
+        filepath = "tests/expected_output/v2_{state}_id_{test_id}.json".format(state=state, test_id=test_id)
         with open(filepath, "r") as file:
             expected_json_output = file.read()
 

tests/test_timeline.py

@@ -1,30 +1,34 @@
+import pytest
 from unittest import mock
 from collections import OrderedDict
-import pytest
-
 from app import timeline
 
 def test_timeline_class():
-    #unordered series
-    timeseries = {'1/24/20': 5,
-                  '1/22/20': 2,
-                  '1/25/20': 7,
-                  '1/23/20': 3}
+    # Unordered timeseries.
+    timeseries = {
+        '1/24/20': 5,
+        '1/22/20': 2,
+        '1/25/20': 7,
+        '1/23/20': 3,
+    }
 
     history_data = timeline.Timeline(history=timeseries)
 
-    #validate last value
+    # validate last value
     assert history_data.latest == 7
 
-    #validate order
-    assert list(dict(history_data.timeline).keys()) \
-        == ['1/22/20', '1/23/20', '1/24/20', '1/25/20']
+    # validate order
+    assert list(dict(history_data.timeline).keys()) == ['1/22/20', '1/23/20', '1/24/20', '1/25/20']
 
-    #validate serialize
-    check_serialize = {'latest': 7,
-                       'timeline': OrderedDict([('1/22/20', 2),
-                                                ('1/23/20', 3),
-                                                ('1/24/20', 5),
-                                                ('1/25/20', 7)])}
+    # validate serialize
+    check_serialize = {
+        'latest': 7,
+        'timeline': OrderedDict([
+            ('1/22/20', 2),
+            ('1/23/20', 3),
+            ('1/24/20', 5),
+            ('1/25/20', 7),
+        ])
+    }
 
     assert dict(history_data.serialize()) == check_serialize