X-Git-Url: https://plomlompom.com/repos/?a=blobdiff_plain;f=tests%2Fdays.py;h=f26885e27468bdab9f9d9fc5ff383f3011cb8403;hb=ffeee1618e4d169c9f125028ef7cd75b913cda8f;hp=9e12d3ff665550f3fb23bb603e639ce8efbf60ff;hpb=ec2996e0036ceec72a1be79cea1166c4ab116582;p=plomtask diff --git a/tests/days.py b/tests/days.py index 9e12d3f..f26885e 100644 --- a/tests/days.py +++ b/tests/days.py @@ -1,23 +1,23 @@ """Test Days module.""" from unittest import TestCase from datetime import datetime +from json import loads as json_loads from tests.utils import TestCaseWithDB, TestCaseWithServer -from plomtask.days import Day, todays_date -from plomtask.exceptions import BadFormatException +from plomtask.dating import date_in_n_days +from plomtask.days import Day class TestsSansDB(TestCase): """Days module tests not requiring DB setup.""" + legal_ids = ['2024-01-01'] + illegal_ids = ['foo', '2024-02-30', '2024-02-01 23:00:00'] - def test_Day_valid_date(self) -> None: - """Test Day's date format validation and parsing.""" - with self.assertRaises(BadFormatException): - Day('foo') - with self.assertRaises(BadFormatException): - Day('2024-02-30') - with self.assertRaises(BadFormatException): - Day('2024-02-01 23:00:00') - self.assertEqual(datetime(2024, 1, 1), Day('2024-01-01').datetime) + def test_Day_datetime_weekday_neighbor_dates(self) -> None: + """Test Day's date parsing.""" + self.assertEqual(datetime(2024, 5, 1), Day('2024-05-01').datetime) + self.assertEqual('Sunday', Day('2024-03-17').weekday) + self.assertEqual('2023-12-31', Day('2024-01-01').prev_date) + self.assertEqual('2023-03-01', Day('2023-02-28').next_date) def test_Day_sorting(self) -> None: """Test sorting by .__lt__ and Day.__eq__.""" @@ -27,85 +27,71 @@ class TestsSansDB(TestCase): days = [day3, day1, day2] self.assertEqual(sorted(days), [day1, day2, day3]) - def test_Day_weekday(self) -> None: - """Test Day.weekday.""" - self.assertEqual(Day('2024-03-17').weekday, 'Sunday') - - def test_Day_neighbor_dates(self) -> None: - """Test Day.prev_date and Day.next_date.""" - self.assertEqual(Day('2024-01-01').prev_date, '2023-12-31') - self.assertEqual(Day('2023-02-28').next_date, '2023-03-01') - class TestsWithDB(TestCaseWithDB): """Tests requiring DB, but not server setup.""" checked_class = Day default_ids = ('2024-01-01', '2024-01-02', '2024-01-03') - def test_saving_and_caching(self) -> None: - """Test storage of instances. - - We don't use the parent class's method here because the checked class - has too different a handling of IDs. - """ - kwargs = {'date': self.default_ids[0], 'comment': 'foo'} - self.check_saving_and_caching(**kwargs) - - def test_Day_from_table_row(self) -> None: - """Test .from_table_row() properly reads in class from DB""" - self.check_from_table_row() - - def test_Day_by_id(self) -> None: - """Test .by_id().""" - self.check_by_id() - - def test_Day_all(self) -> None: - """Test Day.all(), especially in regards to date range filtering.""" + def test_Day_by_date_range_filled(self) -> None: + """Test Day.by_date_range_filled.""" date1, date2, date3 = self.default_ids - day1, day2, day3 = self.check_all() - self.assertEqual(Day.all(self.db_conn, ('', '')), - [day1, day2, day3]) + day1 = Day(date1) + day2 = Day(date2) + day3 = Day(date3) + day1.save(self.db_conn) + day2.save(self.db_conn) + day3.save(self.db_conn) # check date range is a closed interval - self.assertEqual(Day.all(self.db_conn, (date1, date3)), + self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date3), [day1, day2, day3]) # check first date range value excludes what's earlier - self.assertEqual(Day.all(self.db_conn, (date2, date3)), + self.assertEqual(Day.by_date_range_filled(self.db_conn, date2, date3), [day2, day3]) - self.assertEqual(Day.all(self.db_conn, (date3, '')), - [day3]) # check second date range value excludes what's later - self.assertEqual(Day.all(self.db_conn, ('', date2)), + self.assertEqual(Day.by_date_range_filled(self.db_conn, date1, date2), [day1, day2]) # check swapped (impossible) date range returns emptiness - self.assertEqual(Day.all(self.db_conn, (date3, date1)), + self.assertEqual(Day.by_date_range_filled(self.db_conn, date3, date1), []) # check fill_gaps= instantiates unsaved dates within date range # (but does not store them) - day4 = Day('2024-01-04') day5 = Day('2024-01-05') day6 = Day('2024-01-06') day6.save(self.db_conn) - self.assertEqual(Day.all(self.db_conn, (date2, '2024-01-07'), - fill_gaps=True), - [day2, day3, day4, day5, day6]) - self.check_storage([day1, day2, day3, day6]) + day7 = Day('2024-01-07') + self.assertEqual(Day.by_date_range_filled(self.db_conn, + day5.date, day7.date), + [day5, day6, day7]) + self.check_identity_with_cache_and_db([day1, day2, day3, day6]) # check 'today' is interpreted as today's date - today = Day(todays_date()) + today = Day(date_in_n_days(0)) today.save(self.db_conn) - self.assertEqual(Day.all(self.db_conn, ('today', 'today')), [today]) - - def test_Day_remove(self) -> None: - """Test .remove() effects on DB and cache.""" - self.check_remove() - - def test_Day_singularity(self) -> None: - """Test pointers made for single object keep pointing to it.""" - self.check_singularity('day_comment', 'boo') + self.assertEqual(Day.by_date_range_filled(self.db_conn, + 'today', 'today'), + [today]) class TestsWithServer(TestCaseWithServer): """Tests against our HTTP server/handler (and database).""" + def test_get_json(self) -> None: + """Test /day for JSON response.""" + self.conn.request('GET', '/day?date=2024-01-01') + response = self.conn.getresponse() + self.assertEqual(response.status, 200) + expected = {'day': {'id': '2024-01-01', + 'comment': '', + 'todos': []}, + 'top_nodes': [], + 'make_type': '', + 'enablers_for': {}, + 'disablers_for': {}, + 'conditions_present': [], + 'processes': []} + retrieved = json_loads(response.read().decode()) + self.assertEqual(expected, retrieved) + def test_do_GET(self) -> None: """Test /day and /calendar response codes, and / redirect.""" self.check_get('/day', 200) @@ -119,8 +105,8 @@ class TestsWithServer(TestCaseWithServer): def test_do_POST_day(self) -> None: """Test POST /day.""" - form_data = {'day_comment': ''} + form_data = {'day_comment': '', 'make_type': 'full'} self.check_post(form_data, '/day', 400) self.check_post(form_data, '/day?date=foo', 400) - self.check_post(form_data, '/day?date=2024-01-01', 302) + self.check_post(form_data, '/day?date=2024-01-01&make_type=full', 302) self.check_post({'foo': ''}, '/day?date=2024-01-01', 400)