Skip to content

Fix NamespaceSet.clear() fires del-hook once per item not per backend #515

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zrgt wants to merge 1 commit into
base: develop
Choose a base branch
from
Open

Fix NamespaceSet.clear() fires del-hook once per item not per backend #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions sdk/basyx/aas/model/base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2075,9 +2075,9 @@ def pop(self) -> _NSO:
return value

def clear(self) -> None:
for attr_name, (backend, case_sensitive) in self._backend.items():
for value in backend.values():
self._execute_item_del_hook(value)
first_backend = next(iter(self._backend.values()))[0]
for value in first_backend.values():
self._execute_item_del_hook(value)
for attr_name, (backend, case_sensitive) in self._backend.items():
backend.clear()

Expand Down
15 changes: 15 additions & 0 deletions sdk/test/model/test_base.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,21 @@ def setUp(self):
self.namespace = self._namespace_class()
self.namespace3 = self._namespace_class_qualifier()

def test_namespaceset_clear_hook_called_once_per_item(self) -> None:
# set1 has two backends (id_short + semantic_id); clear() must call del-hook exactly once per item
del_hook_calls: list = []

def counting_del_hook(item: model.Property) -> None:
del_hook_calls.append(item)

ns = self._namespace_class()
ns.set1.add(self.prop1)
ns.set1.add(self.prop7) # different id_short and semantic_id from prop1
ns.set1._item_id_del_hook = counting_del_hook
ns.set1.clear()
self.assertEqual(0, len(ns.set1))
self.assertEqual(2, len(del_hook_calls), f"del-hook called {len(del_hook_calls)} times, expected 2")

def test_NamespaceSet(self) -> None:
self.namespace.set1.add(self.prop1)
self.assertEqual(1, len(self.namespace.set1))
Expand Down
Loading