Skip to content

Add continent code(s) assignment #226

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
Bost wants to merge 7 commits into from
Closed

Add continent code(s) assignment #226

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f6640cb
assert_equal: formatted json-strings make debugging easier
BostX Mar 26, 2020
0ca8f68
Readable json test files
BostX Mar 27, 2020
937648e
Add continent code(s) assignment
BostX Mar 26, 2020
336c2e4
Document continent_codes_list in the README.md
BostX Mar 26, 2020
a6094ff
Fix formatting and import order
BostX Mar 27, 2020
09e02b5
Fix continent codes form a set. Not a list
BostX Mar 28, 2020
ee02187
Egypt is located in Africa and also in Asia
BostX Mar 28, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
assert_equal: formatted json-strings make debugging easier
  • Loading branch information
@BostX
BostX committed Mar 29, 2020
commit f6640cb0e2f0a297d684aa4531c070c1cc3e10dd
66 changes: 24 additions & 42 deletions tests/test_routes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,24 @@
from .test_jhu import DATETIME_STRING, mocked_requests_get, mocked_strptime_isoformat


def format_json(s):
return json.dumps(json.loads(s), indent=4, sort_keys=True)

def do_test_v1(obj, state, mock_request_get, mock_datetime):
"Formatted json-strings make debugging easier"
mock_datetime.utcnow.return_value.isoformat.return_value = obj.date
mock_datetime.strptime.side_effect = mocked_strptime_isoformat

json_ret = obj.asgi_client.get("/{}".format(state)).json()
ret = str(json_ret).replace("\'", "\"")

filepath = "tests/expected_output/v1_{state}.json".format(state=state)
with open(filepath, "r") as file:
exp = file.read()

assert format_json(ret) == format_json(exp)


@mock.patch("app.services.location.jhu.datetime")
@mock.patch("app.services.location.jhu.requests.get", side_effect=mocked_requests_get)
class FlaskRoutesTest(unittest.TestCase):
Expand All @@ -26,12 +44,6 @@ def setUp(self):
self.asgi_client = TestClient(APP)
self.date = DATETIME_STRING

def read_file_v1(self, state):
filepath = "tests/expected_output/v1_{state}.json".format(state=state)
with open(filepath, "r") as file:
expected_json_output = file.read()
return expected_json_output

def test_root_api(self, mock_request_get, mock_datetime):
"""Validate that / returns a 200 and is not a redirect."""
response = self.asgi_client.get("/")
Expand All @@ -40,49 +52,23 @@ def test_root_api(self, mock_request_get, mock_datetime):
assert not response.is_redirect

def test_v1_confirmed(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = self.date
mock_datetime.strptime.side_effect = mocked_strptime_isoformat
state = "confirmed"
expected_json_output = self.read_file_v1(state=state)
return_data = self.asgi_client.get("/{}".format(state)).json()

assert return_data == json.loads(expected_json_output)
do_test_v1(self, "confirmed", mock_request_get, mock_datetime)

def test_v1_deaths(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = self.date
mock_datetime.strptime.side_effect = mocked_strptime_isoformat
state = "deaths"
expected_json_output = self.read_file_v1(state=state)
return_data = self.asgi_client.get("/{}".format(state)).json()

assert return_data == json.loads(expected_json_output)
do_test_v1(self, "deaths", mock_request_get, mock_datetime)

def test_v1_recovered(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = self.date
mock_datetime.strptime.side_effect = mocked_strptime_isoformat
state = "recovered"
expected_json_output = self.read_file_v1(state=state)
return_data = self.asgi_client.get("/{}".format(state)).json()

assert return_data == json.loads(expected_json_output)
do_test_v1(self, "recovered", mock_request_get, mock_datetime)

def test_v1_all(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = self.date
mock_datetime.strptime.side_effect = mocked_strptime_isoformat
state = "all"
expected_json_output = self.read_file_v1(state=state)
return_data = self.asgi_client.get("/{}".format(state)).json()

assert return_data == json.loads(expected_json_output)
do_test_v1(self, "all", mock_request_get, mock_datetime)

def test_v2_latest(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = DATETIME_STRING
mock_datetime.strptime.side_effect = mocked_strptime_isoformat
state = "latest"
return_data = self.asgi_client.get(f"/v2/{state}").json()

check_dict = {"latest": {"confirmed": 1940, "deaths": 1940, "recovered": 0}}

assert return_data == check_dict

def test_v2_locations(self, mock_request_get, mock_datetime):
Expand All @@ -93,9 +79,7 @@ def test_v2_locations(self, mock_request_get, mock_datetime):

filepath = "tests/expected_output/v2_{state}.json".format(state=state)
with open(filepath, "r") as file:
expected_json_output = file.read()

# assert return_data == json.loads(expected_json_output)
data_read = file.read()

def test_v2_locations_id(self, mock_request_get, mock_datetime):
mock_datetime.utcnow.return_value.isoformat.return_value = DATETIME_STRING
Expand All @@ -107,9 +91,7 @@ def test_v2_locations_id(self, mock_request_get, mock_datetime):

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()

# assert return_data == expected_json_output
data_read = file.read()

def tearDown(self):
pass
Expand Down