diff --git a/unittests/test_yaml_model_parser.py b/unittests/test_yaml_model_parser.py index 17c382285a47b75b9408ad5e4793c2df35b18a82..6cdea7922a8503be082e8947edecd7e8c849730b 100644 --- a/unittests/test_yaml_model_parser.py +++ b/unittests/test_yaml_model_parser.py @@ -32,6 +32,14 @@ def has_property(el, name): return False +def has_parent(el, name): + for p in el.get_parents(): + if p.name == name: + return True + + return False + + class TwiceTest(unittest.TestCase): def test_defined_once(self): string = """ @@ -140,16 +148,16 @@ RT4: RT5: """ model = parse_model_from_yaml(to_file(string)) - assert model["RT1"].has_parent("RT2", retrieve=False) + assert has_parent(model["RT1"], "RT2") assert (model["RT1"].get_parent( "RT2")._flags["inheritance"] == db.SUGGESTED) - assert model["RT1"].has_parent("RT3", retrieve=False) + assert has_parent(model["RT1"], "RT3") assert (model["RT1"].get_parent( "RT3")._flags["inheritance"] == db.RECOMMENDED) - assert model["RT1"].has_parent("RT4", retrieve=False) + assert has_parent(model["RT1"], "RT4") assert (model["RT1"].get_parent( "RT4")._flags["inheritance"] == db.OBLIGATORY) - assert model["RT1"].has_parent("RT5", retrieve=False) + assert has_parent(model["RT1"], "RT5") assert (model["RT1"].get_parent( "RT5")._flags["inheritance"] == db.OBLIGATORY) @@ -501,5 +509,5 @@ R3: assert isinstance(r3, db.RecordType) for par in ["R1", "R2"]: # Until removal, both do the same - assert r3.has_parent(par, retrieve=False) + assert has_parent(r3, par) assert r3.get_parent(par)._flags["inheritance"] == db.OBLIGATORY