From dd2e754730f65054fd03621672eab00fc97bc5c9 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 7 Feb 2017 12:47:07 +0000 Subject: [PATCH] Refactor test into loop MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This makes it less repetitive, and will let us add more assertions for each month that we’re checking. --- tests/app/dao/test_services_dao.py | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/tests/app/dao/test_services_dao.py b/tests/app/dao/test_services_dao.py index 1a76eb50d..fde32621f 100644 --- a/tests/app/dao/test_services_dao.py +++ b/tests/app/dao/test_services_dao.py @@ -526,23 +526,25 @@ def test_fetch_monthly_historical_stats_separates_weeks(notify_db, notify_db_ses result = dao_fetch_monthly_historical_stats_for_service(sample_template.service_id, 2016) - assert result['2016-04']['sms']['created'] == 1 - assert result['2016-04']['sms']['sending'] == 0 - assert result['2016-04']['sms']['delivered'] == 0 - assert result['2016-04']['sms']['pending'] == 0 - assert result['2016-04']['sms']['failed'] == 0 - assert result['2016-04']['sms']['technical-failure'] == 0 - assert result['2016-04']['sms']['temporary-failure'] == 0 - assert result['2016-04']['sms']['permanent-failure'] == 0 + for date, status, count in ( + ('2016-04', 'sending', 0), + ('2016-04', 'delivered', 0), + ('2016-04', 'pending', 0), + ('2016-04', 'failed', 0), + ('2016-04', 'technical-failure', 0), + ('2016-04', 'temporary-failure', 0), + ('2016-04', 'permanent-failure', 0), - assert result['2016-06']['sms']['created'] == 1 + ('2016-06', 'created', 1), - assert result['2016-10']['sms']['created'] == 1 + ('2016-10', 'created', 1), - assert result['2016-12']['sms']['created'] == 0 - assert result['2016-12']['sms']['delivered'] == 1 + ('2016-12', 'created', 0), + ('2016-12', 'delivered', 1), - assert result['2017-03']['sms']['created'] == 2 + ('2017-03', 'created', 2), + ): + assert result[date]['sms'][status] == count assert result.keys() == { '2016-04', '2016-05', '2016-06',