Always check if item is saved before removal attempt.

[plomtask] / tests / days.py

diff --git a/tests/days.py b/tests/days.py
index 3da78ee0bc71b0dda15e87d7af609a50d55e5c74..ffc2ab2a59e66d4a82a8bc0fd6f0364f4865d79a 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -3,7 +3,8 @@ from unittest import TestCase
 from datetime import datetime
 from tests.utils import TestCaseWithDB, TestCaseWithServer
 from plomtask.days import Day, todays_date
-from plomtask.exceptions import BadFormatException, NotFoundException
+from plomtask.exceptions import (BadFormatException, NotFoundException,
+                                 HandledException)
 
 
 class TestsSansDB(TestCase):
@@ -40,24 +41,43 @@ class TestsSansDB(TestCase):
 class TestsWithDB(TestCaseWithDB):
     """Tests requiring DB, but not server setup."""
 
+    def check_storage(self, content: list[Day]) -> None:
+        """Test cache and DB equal content."""
+        expected_cache = {}
+        for item in content:
+            expected_cache[item.id_] = item
+        self.assertEqual(Day.get_cache(), expected_cache)
+        db_found: list[Day] = []
+        for item in content:
+            assert isinstance(item.id_, str)
+            for row in self.db_conn.row_where(Day.table_name, 'id', item.id_):
+                db_found += [Day.from_table_row(self.db_conn, row)]
+        self.assertEqual(sorted(content), sorted(db_found))
+
     def test_Day_saving_and_caching(self) -> None:
         """Test .save/.save_core."""
         date = '2024-01-01'
         comment = 'comment'
         day = Day(date, comment)
         # check object init itself doesn't store anything yet
-        self.assertEqual({}, Day.get_cache())
-        self.assertEqual([], Day.all(self.db_conn))
+        self.check_storage([])
         # check saving stores in cache and DB
         day.save(self.db_conn)
-        assert isinstance(day.id_, str)
-        for row in self.db_conn.row_where(Day.table_name, 'id', day.id_):
-            self.assertEqual(day, Day.from_table_row(self.db_conn, row))
-        self.assertEqual({day.id_: day}, Day.get_cache())
+        self.check_storage([day])
         # check attributes set properly (and not unset by saving)
         self.assertEqual(day.id_, date)
         self.assertEqual(day.comment, comment)
 
+    def test_Day_from_table_row(self) -> None:
+        """Test .from_table_row() properly reads in class from DB"""
+        day = Day('2024-01-01')
+        day.save(self.db_conn)
+        assert isinstance(day.id_, str)
+        for row in self.db_conn.row_where(Day.table_name, 'id', day.id_):
+            retrieved = Day.from_table_row(self.db_conn, row)
+            self.assertEqual(day, retrieved)
+            self.assertEqual({day.id_: day}, Day.get_cache())
+
     def test_Day_by_id(self) -> None:
         """Test .by_id()."""
         date1 = '2024-01-01'
@@ -72,8 +92,7 @@ class TestsWithDB(TestCaseWithDB):
         # check create=True acts like normal instantiation (sans saving)
         by_id_created = Day.by_id(self.db_conn, date2, create=True)
         self.assertEqual(Day(date2), by_id_created)
-        self.assertEqual({day1.id_: day1}, Day.get_cache())
-        self.assertEqual([day1], Day.all(self.db_conn))
+        self.check_storage([day1])
 
     def test_Day_all(self) -> None:
         """Test Day.all(), especially in regards to date range filtering."""
@@ -83,9 +102,11 @@ class TestsWithDB(TestCaseWithDB):
         day1 = Day(date1)
         day2 = Day(date2)
         day3 = Day(date3)
+        # check pre-save .all() returns empty list
+        self.assertEqual(Day.all(self.db_conn), [])
+        # check that all() shows all saved, but no unsaved items
         day1.save(self.db_conn)
         day3.save(self.db_conn)
-        # check that all() shows all saved, but no unsaved items
         self.assertEqual(Day.all(self.db_conn),
                          [day1, day3])
         day2.save(self.db_conn)
@@ -94,7 +115,7 @@ class TestsWithDB(TestCaseWithDB):
         # check empty date range values show everything
         self.assertEqual(Day.all(self.db_conn, ('', '')),
                          [day1, day2, day3])
-        # check date range is open interval
+        # check date range is a closed interval
         self.assertEqual(Day.all(self.db_conn, (date1, date3)),
                          [day1, day2, day3])
         # check first date range value excludes what's earlier
@@ -117,14 +138,7 @@ class TestsWithDB(TestCaseWithDB):
         self.assertEqual(Day.all(self.db_conn, (date2, '2024-01-07'),
                                  fill_gaps=True),
                          [day2, day3, day4, day5, day6])
-        self.assertEqual(Day.get_cache().keys(),
-                         {date1, date2, date3, day6.date})
-        assert isinstance(day4.id_, str)
-        assert isinstance(day5.id_, str)
-        self.assertEqual(self.db_conn.row_where(Day.table_name,
-                                                'id', day4.id_), [])
-        self.assertEqual(self.db_conn.row_where(Day.table_name,
-                                                'id', day5.id_), [])
+        self.check_storage([day1, day2, day3, day6])
         # check 'today' is interpreted as today's date
         today = Day(todays_date())
         today.save(self.db_conn)
@@ -134,12 +148,11 @@ class TestsWithDB(TestCaseWithDB):
         """Test .remove() effects on DB and cache."""
         date = '2024-01-01'
         day = Day(date)
+        with self.assertRaises(HandledException):
+            day.remove(self.db_conn)
         day.save(self.db_conn)
         day.remove(self.db_conn)
-        assert isinstance(day.id_, str)
-        self.assertEqual(self.db_conn.row_where(Day.table_name,
-                                                'id', day.id_), [])
-        self.assertEqual(Day.get_cache(), {})
+        self.check_storage([])
 
     def test_Day_singularity(self) -> None:
         """Test pointers made for single object keep pointing to it."""