X-Git-Url: https://plomlompom.com/repos/foo.html?a=blobdiff_plain;f=tests%2Fconditions.py;h=af5f661d809995e26bdcc681c4dcff73f0fdb7a6;hb=b56761522f6ec874fde1eb9d4d69d8093fe70227;hp=53a75b87de137fb2258d7183e94acbb8fab1e158;hpb=8c04dfb85e29c7bb68f1bfafdd3093493a7c5063;p=plomtask

diff --git a/tests/conditions.py b/tests/conditions.py
index 53a75b8..af5f661 100644
--- a/tests/conditions.py
+++ b/tests/conditions.py
@@ -9,7 +9,6 @@ from plomtask.exceptions import HandledException
 class TestsSansDB(TestCaseSansDB):
     """Tests requiring no DB setup."""
     checked_class = Condition
-    do_id_test = True
     versioned_defaults_to_test = {'title': 'UNNAMED', 'description': ''}
 
 
@@ -19,31 +18,9 @@ class TestsWithDB(TestCaseWithDB):
     default_init_kwargs = {'is_active': False}
     test_versioneds = {'title': str, '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()
-        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."""
-        self.check_by_id()
-
-    def test_Condition_all(self) -> None:
-        """Test .all()."""
-        self.check_all()
-
-    def test_Condition_singularity(self) -> None:
-        """Test pointers made for single object keep pointing to it."""
-        self.check_singularity('is_active', True)
-
-    def test_Condition_versioned_attributes_singularity(self) -> None:
-        """Test behavior of VersionedAttributes on saving (with .title)."""
-        self.check_versioned_singularity()
-
-    def test_Condition_remove(self) -> None:
+    def test_remove(self) -> None:
         """Test .remove() effects on DB and cache."""
-        self.check_remove()
+        super().test_remove()
         proc = Process(None)
         proc.save(self.db_conn)
         todo = Todo(None, proc, False, '2024-01-01')
@@ -74,39 +51,18 @@ class TestsWithServer(TestCaseWithServer):
         """Return JSON of Condition to expect."""
         d = {'id': id_,
              'is_active': is_active,
-             'title': {'history': {}, 'parent_id': id_},
-             'description': {'history': {}, 'parent_id': id_}}
+             '_versioned': {
+                 'title': {},
+                 'description': {}
+                 }
+             }
         titles = titles if titles else []
         descriptions = descriptions if descriptions else []
+        assert isinstance(d['_versioned'], dict)
         for i, title in enumerate(titles):
-            assert isinstance(d['title'], dict)
-            d['title']['history'][f'[{i}]'] = title
+            d['_versioned']['title'][i] = title
         for i, description in enumerate(descriptions):
-            assert isinstance(d['description'], dict)
-            d['description']['history'][f'[{i}]'] = description
-        return d
-
-    @staticmethod
-    def proc_as_dict(id_: int = 1,
-                     title: str = 'A',
-                     enables: None | list[dict[str, object]] = None,
-                     disables: None | list[dict[str, object]] = None,
-                     conditions: None | list[dict[str, object]] = None,
-                     blockers: None | list[dict[str, object]] = None
-                     ) -> dict[str, object]:
-        """Return JSON of Process to expect."""
-        # pylint: disable=too-many-arguments
-        d = {'id': id_,
-             'calendarize': False,
-             'suppressed_steps': [],
-             'explicit_steps': [],
-             'title': {'history': {'[0]': title}, 'parent_id': id_},
-             'effort': {'history': {'[0]': 1.0}, 'parent_id': id_},
-             'description': {'history': {'[0]': ''}, 'parent_id': id_},
-             'conditions': conditions if conditions else [],
-             'disables': disables if disables else [],
-             'enables': enables if enables else [],
-             'blockers': blockers if blockers else []}
+            d['_versioned']['description'][i] = description
         return d
 
     def test_do_POST_condition(self) -> None:
@@ -117,7 +73,7 @@ class TestsWithServer(TestCaseWithServer):
         post = {'title': 'foo', 'description': 'oof', 'is_active': False}
         self.check_post(post, '/condition', 302, '/condition?id=1')
         # … single /condition
-        cond = self.cond_as_dict(titles = ['foo'], descriptions = ['oof'])
+        cond = self.cond_as_dict(titles=['foo'], descriptions=['oof'])
         expected_single: dict[str, object]
         expected_single = {'is_new': False,
                            'enabled_processes': [],
@@ -137,7 +93,8 @@ class TestsWithServer(TestCaseWithServer):
         # test effect of POST changing title and activeness
         post = {'title': 'bar', 'description': 'oof', 'is_active': True}
         self.check_post(post, '/condition?id=1', 302)
-        expected_single['condition']['title']['history']['[1]'] = 'bar'
+        assert isinstance(expected_single['condition'], dict)
+        expected_single['condition']['_versioned']['title'][1] = 'bar'
         expected_single['condition']['is_active'] = True
         self.check_json_get('/condition?id=1', expected_single)
         # test deletion POST's effect on …
@@ -162,7 +119,7 @@ class TestsWithServer(TestCaseWithServer):
         proc_2_post = {'title': 'B', 'description': '', 'effort': 1.0,
                        'enables': [1], 'blocker': [1]}
         self.post_process(2, proc_2_post)
-        cond = self.cond_as_dict(titles = ['foo'], descriptions = ['oof'])
+        cond = self.cond_as_dict(titles=['foo'], descriptions=['oof'])
         proc_1 = self.proc_as_dict(conditions=[cond], disables=[cond])
         proc_2 = self.proc_as_dict(2, 'B', blockers=[cond], enables=[cond])
         expected_single = {'is_new': False,
@@ -193,7 +150,7 @@ class TestsWithServer(TestCaseWithServer):
         self.check_post(post_2, '/condition', 302, '/condition?id=2')
         post_3 = {'title': 'baz', 'description': 'zab', 'is_active': True}
         self.check_post(post_3, '/condition', 302, '/condition?id=3')
-        cond_1 = self.cond_as_dict(titles = ['foo'], descriptions = ['oof'])
+        cond_1 = self.cond_as_dict(titles=['foo'], descriptions=['oof'])
         cond_2 = self.cond_as_dict(2, titles=['bar'], descriptions=['rab'])
         cond_3 = self.cond_as_dict(3, True, ['baz'], ['zab'])
         cons = [cond_2, cond_3, cond_1]