"""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
+ d['_versioned']['description'][i] = description
return d
@staticmethod
'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_},
+ '_versioned': {
+ 'title': {0: title},
+ 'description': {0: ''},
+ 'effort': {0: 1.0}
+ },
'conditions': conditions if conditions else [],
'disables': disables if disables else [],
'enables': enables if enables else [],
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': [],
# 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 …
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,
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]
"""Compare JSON on GET path with expected.
To simplify comparison of VersionedAttribute histories, transforms
- keys under "history"-named dicts into bracketed integer strings
- counting upwards in chronology.
+ timestamp keys of VersionedAttribute history keys into integers
+ counting chronologically forward from 0.
"""
def rewrite_history_keys_in(item: Any) -> Any:
if isinstance(item, dict):
- if 'history' in item.keys():
- vals = item['history'].values()
- history = {}
- for i, val in enumerate(vals):
- history[f'[{i}]'] = val
- item['history'] = history
+ if '_versioned' in item.keys():
+ for k in item['_versioned']:
+ vals = item['_versioned'][k].values()
+ history = {}
+ for i, val in enumerate(vals):
+ history[i] = val
+ item['_versioned'][k] = history
for k in list(item.keys()):
rewrite_history_keys_in(item[k])
elif isinstance(item, list):
item[:] = [rewrite_history_keys_in(i) for i in item]
- return item
+ return item
self.conn.request('GET', path)
response = self.conn.getresponse()
self.assertEqual(response.status, 200)