From 994e797b26cbd1dc07fa787888c65f417abba144 Mon Sep 17 00:00:00 2001 From: Imdad Ahad Date: Mon, 21 Aug 2017 13:46:50 +0100 Subject: [PATCH] Replace 'sms' with SMS_TYPE --- tests/app/dao/test_notification_usage_dao.py | 34 ++++++++++---------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/tests/app/dao/test_notification_usage_dao.py b/tests/app/dao/test_notification_usage_dao.py index 5cc72d761..24f09e026 100644 --- a/tests/app/dao/test_notification_usage_dao.py +++ b/tests/app/dao/test_notification_usage_dao.py @@ -20,7 +20,7 @@ def test_get_rates_for_daterange(notify_db, notify_db_session): set_up_rate(notify_db, datetime(2016, 5, 18), 0.016) set_up_rate(notify_db, datetime(2017, 3, 31, 23), 0.0158) start_date, end_date = get_financial_year(2017) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates) == 1 assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2017-03-31 23:00:00" assert rates[0].rate == 0.0158 @@ -31,7 +31,7 @@ def test_get_rates_for_daterange_multiple_result_per_year(notify_db, notify_db_s set_up_rate(notify_db, datetime(2016, 5, 18), 0.016) set_up_rate(notify_db, datetime(2017, 4, 1), 0.0158) start_date, end_date = get_financial_year(2016) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates) == 2 assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2016-04-01 00:00:00" assert rates[0].rate == 0.015 @@ -44,7 +44,7 @@ def test_get_rates_for_daterange_returns_correct_rates(notify_db, notify_db_sess set_up_rate(notify_db, datetime(2016, 9, 1), 0.016) set_up_rate(notify_db, datetime(2017, 6, 1), 0.0175) start_date, end_date = get_financial_year(2017) - rates_2017 = get_rates_for_daterange(start_date, end_date, 'sms') + rates_2017 = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates_2017) == 2 assert datetime.strftime(rates_2017[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2016-09-01 00:00:00" assert rates_2017[0].rate == 0.016 @@ -56,7 +56,7 @@ def test_get_rates_for_daterange_in_the_future(notify_db, notify_db_session): set_up_rate(notify_db, datetime(2016, 4, 1), 0.015) set_up_rate(notify_db, datetime(2017, 6, 1), 0.0175) start_date, end_date = get_financial_year(2018) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2017-06-01 00:00:00" assert rates[0].rate == 0.0175 @@ -65,7 +65,7 @@ def test_get_rates_for_daterange_returns_empty_list_if_year_is_before_earliest_r set_up_rate(notify_db, datetime(2016, 4, 1), 0.015) set_up_rate(notify_db, datetime(2017, 6, 1), 0.0175) start_date, end_date = get_financial_year(2015) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert rates == [] @@ -75,7 +75,7 @@ def test_get_rates_for_daterange_early_rate(notify_db, notify_db_session): set_up_rate(notify_db, datetime(2016, 9, 1), 0.016) set_up_rate(notify_db, datetime(2017, 6, 1), 0.0175) start_date, end_date = get_financial_year(2016) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates) == 3 @@ -83,7 +83,7 @@ def test_get_rates_for_daterange_edge_case(notify_db, notify_db_session): set_up_rate(notify_db, datetime(2016, 3, 31, 23, 00), 0.015) set_up_rate(notify_db, datetime(2017, 3, 31, 23, 00), 0.0175) start_date, end_date = get_financial_year(2016) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates) == 1 assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2016-03-31 23:00:00" assert rates[0].rate == 0.015 @@ -96,7 +96,7 @@ def test_get_rates_for_daterange_where_daterange_is_one_month_that_falls_between set_up_rate(notify_db, datetime(2017, 3, 31), 0.123) start_date = datetime(2017, 2, 1, 00, 00, 00) end_date = datetime(2017, 2, 28, 23, 59, 59, 99999) - rates = get_rates_for_daterange(start_date, end_date, 'sms') + rates = get_rates_for_daterange(start_date, end_date, SMS_TYPE) assert len(rates) == 1 assert datetime.strftime(rates[0].valid_from, '%Y-%m-%d %H:%M:%S') == "2017-01-01 00:00:00" assert rates[0].rate == 0.175 @@ -131,10 +131,10 @@ def test_get_monthly_billing_data(notify_db, notify_db_session, sample_template, results = get_monthly_billing_data(sample_template.service_id, 2016) assert len(results) == 4 # (billable_units, rate_multiplier, international, type, rate) - assert results[0] == ('April', 1, 1, False, 'sms', 0.014) - assert results[1] == ('May', 2, 1, False, 'sms', 0.014) - assert results[2] == ('July', 7, 1, False, 'sms', 0.014) - assert results[3] == ('July', 6, 2, False, 'sms', 0.014) + assert results[0] == ('April', 1, 1, False, SMS_TYPE, 0.014) + assert results[1] == ('May', 2, 1, False, SMS_TYPE, 0.014) + assert results[2] == ('July', 7, 1, False, SMS_TYPE, 0.014) + assert results[3] == ('July', 6, 2, False, SMS_TYPE, 0.014) def test_get_monthly_billing_data_with_multiple_rates(notify_db, notify_db_session, sample_template, @@ -165,10 +165,10 @@ def test_get_monthly_billing_data_with_multiple_rates(notify_db, notify_db_sessi sent_at=datetime(2017, 3, 31), status='sending', billable_units=6) results = get_monthly_billing_data(sample_template.service_id, 2016) assert len(results) == 4 - assert results[0] == ('April', 1, 1, False, 'sms', 0.014) - assert results[1] == ('May', 2, 1, False, 'sms', 0.014) - assert results[2] == ('June', 3, 1, False, 'sms', 0.014) - assert results[3] == ('June', 4, 1, False, 'sms', 0.0175) + assert results[0] == ('April', 1, 1, False, SMS_TYPE, 0.014) + assert results[1] == ('May', 2, 1, False, SMS_TYPE, 0.014) + assert results[2] == ('June', 3, 1, False, SMS_TYPE, 0.014) + assert results[3] == ('June', 4, 1, False, SMS_TYPE, 0.0175) def test_get_monthly_billing_data_with_no_notifications_for_daterange(notify_db, notify_db_session, sample_template): @@ -178,7 +178,7 @@ def test_get_monthly_billing_data_with_no_notifications_for_daterange(notify_db, def set_up_rate(notify_db, start_date, value): - rate = Rate(id=uuid.uuid4(), valid_from=start_date, rate=value, notification_type='sms') + rate = Rate(id=uuid.uuid4(), valid_from=start_date, rate=value, notification_type=SMS_TYPE) notify_db.session.add(rate)