Refactor models' .by_id().

[plomtask] / tests / days.py

diff --git a/tests/days.py b/tests/days.py
index 2e2ef50cbe85ae6ff9fd01edd802417a7122598f..895f59d163d5b2d1ce025a73fd0b71e0df1be256 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -35,46 +35,50 @@ class TestsSansDB(TestCase):
 class TestsWithDB(TestCaseWithDB):
     """Tests requiring DB, but not server setup."""
 
-    def test_Day_by_date(self) -> None:
-        """Test Day.by_date()."""
+    def test_Day_by_id(self) -> None:
+        """Test Day.by_id()."""
         with self.assertRaises(NotFoundException):
-            Day.by_date(self.db_conn, '2024-01-01')
+            Day.by_id(self.db_conn, '2024-01-01')
         Day('2024-01-01').save(self.db_conn)
         self.assertEqual(Day('2024-01-01'),
-                         Day.by_date(self.db_conn, '2024-01-01'))
+                         Day.by_id(self.db_conn, '2024-01-01'))
         with self.assertRaises(NotFoundException):
-            Day.by_date(self.db_conn, '2024-01-02')
+            Day.by_id(self.db_conn, '2024-01-02')
         self.assertEqual(Day('2024-01-02'),
-                         Day.by_date(self.db_conn, '2024-01-02', create=True))
+                         Day.by_id(self.db_conn, '2024-01-02', create=True))
 
     def test_Day_all(self) -> None:
         """Test Day.all(), especially in regards to date range filtering."""
-        day1 = Day('2024-01-01')
-        day2 = Day('2024-01-02')
-        day3 = Day('2024-01-03')
+        date1 = '2024-01-01'
+        date2 = '2024-01-02'
+        date3 = '2024-01-03'
+        day1 = Day(date1)
+        day2 = Day(date2)
+        day3 = Day(date3)
         day1.save(self.db_conn)
         day2.save(self.db_conn)
         day3.save(self.db_conn)
-        self.assertEqual(Day.all(self.db_conn), [day1, day2, day3])
+        self.assertEqual(Day.all(self.db_conn),
+                         [day1, day2, day3])
         self.assertEqual(Day.all(self.db_conn, ('', '')),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-01', '2024-01-03')),
+        self.assertEqual(Day.all(self.db_conn, (date1, date3)),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-02', '2024-01-03')),
+        self.assertEqual(Day.all(self.db_conn, (date2, date3)),
                          [day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '')),
+        self.assertEqual(Day.all(self.db_conn, (date3, '')),
                          [day3])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-01', '')),
+        self.assertEqual(Day.all(self.db_conn, (date1, '')),
                          [day1, day2, day3])
-        self.assertEqual(Day.all(self.db_conn, ('', '2024-01-02')),
+        self.assertEqual(Day.all(self.db_conn, ('', date2)),
                          [day1, day2])
-        self.assertEqual(Day.all(self.db_conn, ('2024-01-03', '2024-01-01')),
+        self.assertEqual(Day.all(self.db_conn, (date3, date1)),
                          [])
         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, ('2024-01-02', '2024-01-07'),
+        self.assertEqual(Day.all(self.db_conn, (date2, '2024-01-07'),
                                  fill_gaps=True),
                          [day2, day3, day4, day5, day6])
         today = Day(todays_date())
@@ -90,7 +94,7 @@ class TestsWithDB(TestCaseWithDB):
         """Test pointers made for single object keep pointing to it."""
         day = Day('2024-01-01')
         day.save(self.db_conn)
-        retrieved_day = Day.by_date(self.db_conn, '2024-01-01')
+        retrieved_day = Day.by_id(self.db_conn, '2024-01-01')
         day.comment = 'foo'
         self.assertEqual(retrieved_day.comment, 'foo')