Minor refactoring of Days tests.

diff --git a/tests/days.py b/tests/days.py
index 59c9f4911b8d6b649d42cb71a9035c811af7e1df..856ce9978dc1d12cb0f8fc1040f02257b21ddedb 100644 (file)
--- a/tests/days.py
+++ b/tests/days.py
@@ -178,17 +178,15 @@ class TestsWithServer(TestCaseWithServer):
         """Test GET /day displaying Processes and Todos."""
         date = '2024-01-01'
         # check Processes get displayed in ['processes'] and ['_library']
         """Test GET /day displaying Processes and Todos."""
         date = '2024-01-01'
         # check Processes get displayed in ['processes'] and ['_library']

-        post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1}
-        post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
-        procs_expected: list[dict[str, object]] = [{}, {}]
-        for i, post in enumerate([post_proc1, post_proc2]):
-            self.post_process(i+1, post)
-            assert isinstance(post['title'], str)
-            assert isinstance(post['description'], str)
-            assert isinstance(post['effort'], float)
-            procs_expected[i] = self.proc_as_dict(i+1, post['title'],
-                                                  post['description'],
-                                                  post['effort'])
+        procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
+                          self.proc_as_dict(2, 'bar', 'rab', 0.9)]
+        for proc in procs_expected:
+            post = {}
+            assert isinstance(proc['_versioned'], dict)
+            for k in ('title', 'description', 'effort'):
+                post[k] = proc['_versioned'][k][0]
+            assert isinstance(proc['id'], int)
+            self.post_process(proc['id'], post)

         self.post_day(f'date={date}')
         expected = self.get_day_dict(date)
         expected['processes'] = self.as_id_list(procs_expected)
         self.post_day(f'date={date}')
         expected = self.get_day_dict(date)
         expected['processes'] = self.as_id_list(procs_expected)


@@ -221,38 +219,33 @@ class TestsWithServer(TestCaseWithServer):
         """Test GET /day displaying Conditions and their relations."""
         # add Process with Conditions and their Todos, check display
         # pylint: disable=too-many-locals
         """Test GET /day displaying Conditions and their relations."""
         # add Process with Conditions and their Todos, check display
         # pylint: disable=too-many-locals

-        post_cond1 = {'title': 'A', 'description': '', 'is_active': False}
-        post_cond2 = {'title': 'B', 'description': '', 'is_active': True}
-        conds: list[dict[str, object]] = [{}, {}]
-        for i, post in enumerate([post_cond1, post_cond2]):
+        conds_expected = [self.cond_as_dict(1, False, ['A'], ['a']),
+                          self.cond_as_dict(2, True, ['B'], ['b'])]
+        for i, cond in enumerate(conds_expected):
+            post = {'is_active': cond['is_active']}
+            assert isinstance(cond['_versioned'], dict)
+            for k in ('title', 'description'):
+                post[k] = cond['_versioned'][k][0]

             self.check_post(post, f'/condition?id={i+1}', 302)
             self.check_post(post, f'/condition?id={i+1}', 302)

-            assert isinstance(post['is_active'], bool)
-            assert isinstance(post['title'], str)
-            assert isinstance(post['description'], str)
-            conds[i] = self.cond_as_dict(i+1, post['is_active'],
-                                         [post['title']],
-                                         [post['description']])
-        post_proc1 = {'title': 'foo', 'description': 'oof', 'effort': 1.1}
-        post_proc2 = {'title': 'bar', 'description': 'rab', 'effort': 0.9}
-        procs: list[dict[str, object]] = [{}, {}]
+        procs_expected = [self.proc_as_dict(1, 'foo', 'oof', 1.1),
+                          self.proc_as_dict(2, 'bar', 'rab', 0.9)]

         cond_names = ('conditions', 'disables', 'blockers', 'enables')
         cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1))
         cond_names = ('conditions', 'disables', 'blockers', 'enables')
         cond_vals = ((1, 1, 2, 2), (2, 2, 1, 1))

-        for i, post in enumerate([post_proc1, post_proc2]):
-            assert isinstance(post['title'], str)
-            assert isinstance(post['description'], str)
-            assert isinstance(post['effort'], float)
-            procs[i] = self.proc_as_dict(i+1, post['title'],
-                                         post['description'], post['effort'])
+        for i, proc in enumerate(procs_expected):
+            post = {}
+            assert isinstance(proc['_versioned'], dict)
+            for k in ('title', 'description', 'effort'):
+                post[k] = proc['_versioned'][k][0]

             for j, cond_name in enumerate(cond_names):
             for j, cond_name in enumerate(cond_names):

-                post[cond_name] = [cond_vals[i][j]]
-                procs[i][cond_name] = [cond_vals[i][j]]
-            self.post_process(i+1, post)
+                post[cond_name] = proc[cond_name] = [cond_vals[i][j]]
+            assert isinstance(proc['id'], int)
+            self.post_process(proc['id'], post)

         date = '2024-01-01'
         expected = self.get_day_dict(date)
         date = '2024-01-01'
         expected = self.get_day_dict(date)

-        expected['processes'] = self.as_id_list(procs)
+        expected['processes'] = self.as_id_list(procs_expected)

         assert isinstance(expected['_library'], dict)
         assert isinstance(expected['_library'], dict)

-        expected['_library']['Process'] = self.as_refs(procs)
-        expected['_library']['Condition'] = self.as_refs(conds)
+        expected['_library']['Process'] = self.as_refs(procs_expected)
+        expected['_library']['Condition'] = self.as_refs(conds_expected)

         self.post_day(f'date={date}')
         self.check_json_get(f'/day?date={date}', expected)
         # add Todos in relation to Conditions, check consequences
         self.post_day(f'date={date}')
         self.check_json_get(f'/day?date={date}', expected)
         # add Todos in relation to Conditions, check consequences


@@ -267,7 +260,7 @@ class TestsWithServer(TestCaseWithServer):
         expected['top_nodes'] = nodes
         expected['disablers_for'] = {'1': [1], '2': [2]}
         expected['enablers_for'] = {'1': [2], '2': [1]}
         expected['top_nodes'] = nodes
         expected['disablers_for'] = {'1': [1], '2': [2]}
         expected['enablers_for'] = {'1': [2], '2': [1]}

-        expected['conditions_present'] = self.as_id_list(conds)
+        expected['conditions_present'] = self.as_id_list(conds_expected)

         self.check_json_get(f'/day?date={date}', expected)
 
     def test_do_GET(self) -> None:
         self.check_json_get(f'/day?date={date}', expected)
 
     def test_do_GET(self) -> None: