Skip to content

added last_updated to Location #119

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

Merged
ExpDev07 merged 3 commits into from
Mar 21, 2020
Merged

added last_updated to Location #119

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
129600f
added last_updated to Location
Mar 21, 2020
ffb84ce
fix test
Mar 21, 2020
3ef2227
m
Mar 21, 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
Prev Previous commit
Next Next commit
fix test
  • Loading branch information
ExpDev07 committed Mar 21, 2020
commit ffb84ce9a4e8a592fb7a31dc53f593936e97a938
20 changes: 12 additions & 8 deletions tests/test_location.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import pytest
from datetime import datetime
from unittest import mock
from app import location, coordinates, timeline

Expand All @@ -9,14 +10,13 @@ def __init__(self, latest):

return TestTimeline(args[0])

@pytest.mark.parametrize("test_id, country, country_code, province, latitude, longitude, \
confirmed_latest, deaths_latest, recovered_latest",
[(0, "Thailand", "TH", "", 15, 100, 1000, 1111, 22222),
(1, "Deutschland", "DE", "", 15, 100, 1000, 1111, 22222),
(2, "Cruise Ship", "XX", "", 15, 100, 1000, 1111, 22222)])
@pytest.mark.parametrize("test_id, country, country_code, province, latitude, longitude, confirmed_latest, deaths_latest, recovered_latest", [
(0, "Thailand", "TH", "", 15, 100, 1000, 1111, 22222),
(1, "Deutschland", "DE", "", 15, 100, 1000, 1111, 22222),
(2, "Cruise Ship", "XX", "", 15, 100, 1000, 1111, 22222)
])
@mock.patch('app.timeline.Timeline', side_effect=mocked_timeline)
def test_location_class(mocked_timeline, test_id, country, country_code, province, latitude,
longitude, confirmed_latest, deaths_latest, recovered_latest):
def test_location_class(mocked_timeline, test_id, country, country_code, province, latitude, longitude, confirmed_latest, deaths_latest, recovered_latest):

# id, country, province, coordinates, confirmed, deaths, recovered
coords = coordinates.Coordinates(latitude=latitude, longitude=longitude)
Expand All @@ -26,8 +26,11 @@ def test_location_class(mocked_timeline, test_id, country, country_code, provinc
deaths = timeline.Timeline(deaths_latest)
recovered = timeline.Timeline(recovered_latest)

# Date now.
now = datetime.utcnow().isoformat() + 'Z'

# Location.
location_obj = location.TimelinedLocation(test_id, country, province, coords, {
location_obj = location.TimelinedLocation(test_id, country, province, coords, now, {
'confirmed': confirmed,
'deaths' : deaths,
'recovered': recovered,
Expand All @@ -41,6 +44,7 @@ def test_location_class(mocked_timeline, test_id, country, country_code, provinc
'country': country,
'country_code': country_code,
'province': province,
'last_updated': now,
'coordinates': {
'latitude': latitude,
'longitude': longitude
Expand Down