home
·
contact
·
privacy
projects
/
plomtask
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Overhaul caching.
[plomtask]
/
tests
/
processes.py
diff --git
a/tests/processes.py
b/tests/processes.py
index e374c3b0fb28f2343e4e3c0fd6fdc8c4b6fed1fb..34f6427e4d06152a17f035672061757cce203cac 100644
(file)
--- a/
tests/processes.py
+++ b/
tests/processes.py
@@
-58,7
+58,6
@@
class TestsWithDB(TestCaseWithDB):
def test_Process_conditions_saving(self) -> None:
"""Test .save/.save_core."""
p, set1, set2, set3 = self.p_of_conditions()
def test_Process_conditions_saving(self) -> None:
"""Test .save/.save_core."""
p, set1, set2, set3 = self.p_of_conditions()
- p.uncache()
r = Process.by_id(self.db_conn, p.id_)
self.assertEqual(sorted(r.conditions), sorted(set1))
self.assertEqual(sorted(r.enables), sorted(set2))
r = Process.by_id(self.db_conn, p.id_)
self.assertEqual(sorted(r.conditions), sorted(set1))
self.assertEqual(sorted(r.enables), sorted(set2))
@@
-75,7
+74,6
@@
class TestsWithDB(TestCaseWithDB):
assert isinstance(p.id_, int)
for row in self.db_conn.row_where(self.checked_class.table_name,
'id', p.id_):
assert isinstance(p.id_, int)
for row in self.db_conn.row_where(self.checked_class.table_name,
'id', p.id_):
- # pylint: disable=no-member
r = Process.from_table_row(self.db_conn, row)
self.assertEqual(sorted(r.conditions), sorted(set1))
self.assertEqual(sorted(r.enables), sorted(set2))
r = Process.from_table_row(self.db_conn, row)
self.assertEqual(sorted(r.conditions), sorted(set1))
self.assertEqual(sorted(r.enables), sorted(set2))
@@
-116,7
+114,8
@@
class TestsWithDB(TestCaseWithDB):
s_p2_to_p1_first = ProcessStep(None, p1.id_, p2.id_, s_p3_to_p1.id_)
steps_p1 += [s_p2_to_p1_first]
p1.set_steps(self.db_conn, steps_p1)
s_p2_to_p1_first = ProcessStep(None, p1.id_, p2.id_, s_p3_to_p1.id_)
steps_p1 += [s_p2_to_p1_first]
p1.set_steps(self.db_conn, steps_p1)
- seen_3 = ProcessStepsNode(p3, None, False, {}, True)
+ seen_3 = ProcessStepsNode(p3, None, False, {}, False)
+ p1_dict[1].steps[3].seen = True
p1_dict[2].steps[4] = ProcessStepsNode(p2, s_p3_to_p1.id_, True,
{3: seen_3})
self.assertEqual(p1.get_steps(self.db_conn, None), p1_dict)
p1_dict[2].steps[4] = ProcessStepsNode(p2, s_p3_to_p1.id_, True,
{3: seen_3})
self.assertEqual(p1.get_steps(self.db_conn, None), p1_dict)
@@
-150,9
+149,9
@@
class TestsWithDB(TestCaseWithDB):
s_p3_to_p2_first = ProcessStep(None, p2.id_, p3.id_, s_p3_to_p2.id_)
steps_p2 += [s_p3_to_p2_first]
p2.set_steps(self.db_conn, steps_p2)
s_p3_to_p2_first = ProcessStep(None, p2.id_, p3.id_, s_p3_to_p2.id_)
steps_p2 += [s_p3_to_p2_first]
p2.set_steps(self.db_conn, steps_p2)
- p1_dict[1].steps[3].steps[7] = ProcessStepsNode(p3, 3, False, {})
+ p1_dict[1].steps[3].steps[7] = ProcessStepsNode(p3, 3, False, {}
, True
)
p1_dict[2].steps[4].steps[3].steps[7] = ProcessStepsNode(p3, 3, False,
p1_dict[2].steps[4].steps[3].steps[7] = ProcessStepsNode(p3, 3, False,
- {},
Tru
e)
+ {},
Fals
e)
self.assertEqual(p1.get_steps(self.db_conn, None), p1_dict)
# ensure suppressed step nodes are hidden
assert isinstance(s_p3_to_p2.id_, int)
self.assertEqual(p1.get_steps(self.db_conn, None), p1_dict)
# ensure suppressed step nodes are hidden
assert isinstance(s_p3_to_p2.id_, int)
@@
-208,17
+207,19
@@
class TestsWithDB(TestCaseWithDB):
assert isinstance(p3.id_, int)
step = ProcessStep(None, p2.id_, p1.id_, None)
p2.set_steps(self.db_conn, [step])
assert isinstance(p3.id_, int)
step = ProcessStep(None, p2.id_, p1.id_, None)
p2.set_steps(self.db_conn, [step])
+ step_id = step.id_
with self.assertRaises(HandledException):
p1.remove(self.db_conn)
p2.set_steps(self.db_conn, [])
with self.assertRaises(NotFoundException):
with self.assertRaises(HandledException):
p1.remove(self.db_conn)
p2.set_steps(self.db_conn, [])
with self.assertRaises(NotFoundException):
- ProcessStep.by_id(self.db_conn, step
.id_
)
+ ProcessStep.by_id(self.db_conn, step
_id
)
p1.remove(self.db_conn)
step = ProcessStep(None, p2.id_, p3.id_, None)
p1.remove(self.db_conn)
step = ProcessStep(None, p2.id_, p3.id_, None)
+ step_id = step.id_
p2.set_steps(self.db_conn, [step])
p2.remove(self.db_conn)
with self.assertRaises(NotFoundException):
p2.set_steps(self.db_conn, [step])
p2.remove(self.db_conn)
with self.assertRaises(NotFoundException):
- ProcessStep.by_id(self.db_conn, step
.id_
)
+ ProcessStep.by_id(self.db_conn, step
_id
)
todo = Todo(None, p3, False, '2024-01-01')
todo.save(self.db_conn)
with self.assertRaises(HandledException):
todo = Todo(None, p3, False, '2024-01-01')
todo.save(self.db_conn)
with self.assertRaises(HandledException):
@@
-233,13
+234,16
@@
class TestsWithDBForProcessStep(TestCaseWithDB):
default_init_kwargs = {'owner_id': 2, 'step_process_id': 3,
'parent_step_id': 4}
default_init_kwargs = {'owner_id': 2, 'step_process_id': 3,
'parent_step_id': 4}
- def test_ProcessStep_from_table_row(self) -> None:
- """Test .from_table_row() properly reads in class from DB"""
- self.check_from_table_row(2, 3, None)
+ def setUp(self) -> None:
+ super().setUp()
+ p = Process(1)
+ p.save(self.db_conn)
+ p = Process(2)
+ p.save(self.db_conn)
- def test_
ProcessStep_singularity
(self) -> None:
- """Test
pointers made for single object keep pointing to it
."""
- self.check_s
ingularity('parent_step_id', 1, 2, 3, None
)
+ def test_
saving_and_caching
(self) -> None:
+ """Test
storage and initialization of instances and attributes
."""
+ self.check_s
aving_and_caching(id_=1, **self.default_init_kwargs
)
def test_ProcessStep_remove(self) -> None:
"""Test .remove and unsetting of owner's .explicit_steps entry."""
def test_ProcessStep_remove(self) -> None:
"""Test .remove and unsetting of owner's .explicit_steps entry."""
@@
-297,6
+301,7
@@
class TestsWithServer(TestCaseWithServer):
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 1)
retrieved_step = retrieved_process.explicit_steps[0]
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 1)
retrieved_step = retrieved_process.explicit_steps[0]
+ retrieved_step_id = retrieved_step.id_
self.assertEqual(retrieved_step.step_process_id, 2)
self.assertEqual(retrieved_step.owner_id, 1)
self.assertEqual(retrieved_step.parent_step_id, None)
self.assertEqual(retrieved_step.step_process_id, 2)
self.assertEqual(retrieved_step.owner_id, 1)
self.assertEqual(retrieved_step.parent_step_id, None)
@@
-307,7
+312,7
@@
class TestsWithServer(TestCaseWithServer):
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(retrieved_process.explicit_steps, [])
with self.assertRaises(NotFoundException):
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(retrieved_process.explicit_steps, [])
with self.assertRaises(NotFoundException):
- ProcessStep.by_id(self.db_conn, retrieved_step
.id_
)
+ ProcessStep.by_id(self.db_conn, retrieved_step
_id
)
# post new first (top_level) step of process 3 to process 1
form_data_1['new_top_step'] = [3]
self.post_process(1, form_data_1)
# post new first (top_level) step of process 3 to process 1
form_data_1['new_top_step'] = [3]
self.post_process(1, form_data_1)
@@
-324,14
+329,14
@@
class TestsWithServer(TestCaseWithServer):
self.assertEqual(retrieved_process.explicit_steps, [])
# post to process empty steps list but keep, expect 400
form_data_1['steps'] = []
self.assertEqual(retrieved_process.explicit_steps, [])
# post to process empty steps list but keep, expect 400
form_data_1['steps'] = []
- form_data_1['keep_step'] = [retrieved_step
.id_
]
+ form_data_1['keep_step'] = [retrieved_step
_id
]
self.check_post(form_data_1, '/process?id=1', 400, '/process?id=1')
# post to process steps list with keep on non-created step, expect 400
self.check_post(form_data_1, '/process?id=1', 400, '/process?id=1')
# post to process steps list with keep on non-created step, expect 400
- form_data_1['steps'] = [retrieved_step
.id_
]
- form_data_1['keep_step'] = [retrieved_step
.id_
]
+ form_data_1['steps'] = [retrieved_step
_id
]
+ form_data_1['keep_step'] = [retrieved_step
_id
]
self.check_post(form_data_1, '/process?id=1', 400, '/process?id=1')
# post to process steps list with keep and process ID, expect 200
self.check_post(form_data_1, '/process?id=1', 400, '/process?id=1')
# post to process steps list with keep and process ID, expect 200
- form_data_1[f'step_{retrieved_step
.id_
}_process_id'] = [2]
+ form_data_1[f'step_{retrieved_step
_id
}_process_id'] = [2]
self.post_process(1, form_data_1)
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 1)
self.post_process(1, form_data_1)
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 1)
@@
-357,11
+362,11
@@
class TestsWithServer(TestCaseWithServer):
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 2)
retrieved_step_0 = retrieved_process.explicit_steps[0]
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 2)
retrieved_step_0 = retrieved_process.explicit_steps[0]
- self.assertEqual(retrieved_step_0.step_process_id,
2
)
+ self.assertEqual(retrieved_step_0.step_process_id,
3
)
self.assertEqual(retrieved_step_0.owner_id, 1)
self.assertEqual(retrieved_step_0.parent_step_id, None)
retrieved_step_1 = retrieved_process.explicit_steps[1]
self.assertEqual(retrieved_step_0.owner_id, 1)
self.assertEqual(retrieved_step_0.parent_step_id, None)
retrieved_step_1 = retrieved_process.explicit_steps[1]
- self.assertEqual(retrieved_step_1.step_process_id,
3
)
+ self.assertEqual(retrieved_step_1.step_process_id,
2
)
self.assertEqual(retrieved_step_1.owner_id, 1)
self.assertEqual(retrieved_step_1.parent_step_id, None)
# post to process steps list with keeps etc., but trigger recursion
self.assertEqual(retrieved_step_1.owner_id, 1)
self.assertEqual(retrieved_step_1.parent_step_id, None)
# post to process steps list with keeps etc., but trigger recursion
@@
-382,9
+387,9
@@
class TestsWithServer(TestCaseWithServer):
self.assertEqual(retrieved_step_1.step_process_id, 3)
self.assertEqual(retrieved_step_1.owner_id, 1)
self.assertEqual(retrieved_step_1.parent_step_id, None)
self.assertEqual(retrieved_step_1.step_process_id, 3)
self.assertEqual(retrieved_step_1.owner_id, 1)
self.assertEqual(retrieved_step_1.parent_step_id, None)
- form_data_1[f'step_{retrieved_step_1.id_}_process_id'] = [3]
# post sub-step to step
# post sub-step to step
- form_data_1[f'new_step_to_{retrieved_step_1.id_}'] = [3]
+ form_data_1[f'step_{retrieved_step_0.id_}_process_id'] = [3]
+ form_data_1[f'new_step_to_{retrieved_step_0.id_}'] = [3]
self.post_process(1, form_data_1)
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 3)
self.post_process(1, form_data_1)
retrieved_process = Process.by_id(self.db_conn, 1)
self.assertEqual(len(retrieved_process.explicit_steps), 3)