Refactor and extend tests.

[plomtask] / tests / conditions.py

diff --git a/tests/conditions.py b/tests/conditions.py
index faaeb8722b8722c4fe88e9c10b5257292338be2e..45c3df7cfff43fe0f365216e7b6555d9299fefb0 100644 (file)
--- a/tests/conditions.py
+++ b/tests/conditions.py
@@ -25,42 +25,22 @@ class TestsWithDB(TestCaseWithDB):
     """Tests requiring DB, but not server setup."""
     checked_class = Condition
 
-    def versioned_condition(self) -> Condition:
-        """Create Condition with some VersionedAttribute values."""
-        c = Condition(None)
-        c.title.set('title1')
-        c.title.set('title2')
-        c.description.set('desc1')
-        c.description.set('desc2')
-        return c
-
     def test_Condition_saving_and_caching(self) -> None:
         """Test .save/.save_core."""
         kwargs = {'id_': 1, 'is_active': False}
         self.check_saving_and_caching(**kwargs)
         # check .id_ set if None, and versioned attributes too
-        c = self.versioned_condition()
+        c = Condition(None)
         c.save(self.db_conn)
         self.assertEqual(c.id_, 2)
-        self.assertEqual(sorted(c.title.history.values()),
-                         ['title1', 'title2'])
-        self.assertEqual(sorted(c.description.history.values()),
-                         ['desc1', 'desc2'])
+        self.check_saving_of_versioned('title', str)
+        self.check_saving_of_versioned('description', str)
 
     def test_Condition_from_table_row(self) -> None:
         """Test .from_table_row() properly reads in class from DB"""
         self.check_from_table_row()
-        c = self.versioned_condition()
-        c.save(self.db_conn)
-        assert isinstance(c.id_, int)
-        for row in self.db_conn.row_where(Condition.table_name, 'id', c.id_):
-            retrieved = Condition.from_table_row(self.db_conn, row)
-            # pylint: disable=no-member
-            self.assertEqual(sorted(retrieved.title.history.values()),
-                             ['title1', 'title2'])
-            # pylint: disable=no-member
-            self.assertEqual(sorted(retrieved.description.history.values()),
-                             ['desc1', 'desc2'])
+        self.check_versioned_from_table_row('title', str)
+        self.check_versioned_from_table_row('description', str)
 
     def test_Condition_by_id(self) -> None:
         """Test .by_id(), including creation."""