Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
38 changes: 19 additions & 19 deletions tests/test_events/test_bi_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
OneRequiredOneDefaultParameterObserver, TwoParametersObserver, TwoDefaultParametersObserver


def test_bi_event_observe_and_call_no_parameters_mock_observer():
def test_bi_event_observe_no_parameters_mock_observer():
event = BiEvent[str, int]()
observer = NoParametersObserver()

Expand All @@ -14,7 +14,7 @@ def test_bi_event_observe_and_call_no_parameters_mock_observer():
observer.assert_called_once_with()


def test_bi_event_observe_and_call_one_parameter_mock_observer():
def test_bi_event_observe_one_parameter_mock_observer():
event = BiEvent[str, int]()
observer = OneParameterObserver()

Expand All @@ -24,7 +24,7 @@ def test_bi_event_observe_and_call_one_parameter_mock_observer():
observer.assert_called_once_with("test_value")


def test_bi_event_observe_and_call_one_default_parameter_mock_observer():
def test_bi_event_observe_one_default_parameter_mock_observer():
event = BiEvent[str, int]()
observer = OneDefaultParameterObserver()

Expand All @@ -34,7 +34,7 @@ def test_bi_event_observe_and_call_one_default_parameter_mock_observer():
observer.assert_called_once_with("test_value")


def test_bi_event_observe_and_call_one_required_one_default_parameter_mock_observer():
def test_bi_event_observe_one_required_one_default_parameter_mock_observer():
event = BiEvent[str, int]()
observer = OneRequiredOneDefaultParameterObserver()

Expand All @@ -44,7 +44,7 @@ def test_bi_event_observe_and_call_one_required_one_default_parameter_mock_obser
observer.assert_called_once_with("test_value", 42)


def test_bi_event_observe_and_call_two_parameters_mock_observer():
def test_bi_event_observe_two_parameters_mock_observer():
event = BiEvent[str, int]()
observer = TwoParametersObserver()

Expand All @@ -54,7 +54,7 @@ def test_bi_event_observe_and_call_two_parameters_mock_observer():
observer.assert_called_once_with("test_value", 42)


def test_bi_event_observe_and_call_two_default_parameters_mock_observer():
def test_bi_event_observe_two_default_parameters_mock_observer():
event = BiEvent[str, int]()
observer = TwoDefaultParametersObserver()

Expand All @@ -75,7 +75,7 @@ def test_bi_event_unobserve_mock_observer():
observer.assert_not_called()


def test_bi_event_multiple_mock_observers():
def test_bi_event_call_multiple_mock_observers():
event = BiEvent[str, int]()
observer0 = NoParametersObserver()
observer1 = OneParameterObserver()
Expand All @@ -91,7 +91,7 @@ def test_bi_event_multiple_mock_observers():
observer2.assert_called_once_with("hello", 123)


def test_bi_event_function_observer_with_too_many_parameters():
def test_bi_event_observe_function_observer_too_many_parameters_fails():
event = BiEvent[str, int]()

def bad_observer(param0, param1, param2):
Expand All @@ -101,7 +101,7 @@ def bad_observer(param0, param1, param2):
event.observe(bad_observer)


def test_bi_event_observe_and_call_lambda_no_parameters():
def test_bi_event_observe_lambda_no_parameters():
event = BiEvent[str, int]()
called = []

Expand All @@ -111,7 +111,7 @@ def test_bi_event_observe_and_call_lambda_no_parameters():
assert called == [True]


def test_bi_event_observe_and_call_lambda_one_parameter():
def test_bi_event_observe_lambda_one_parameter():
event = BiEvent[str, int]()
calls = []

Expand All @@ -121,7 +121,7 @@ def test_bi_event_observe_and_call_lambda_one_parameter():
assert calls == ["test_value"]


def test_bi_event_observe_and_call_lambda_two_parameters():
def test_bi_event_observe_lambda_two_parameters():
event = BiEvent[str, int]()
calls = []

Expand All @@ -131,7 +131,7 @@ def test_bi_event_observe_and_call_lambda_two_parameters():
assert calls == [("test_value", 42)]


def test_bi_event_unobserve_lambda():
def test_bi_event_unobserve_lambda_observer():
event = BiEvent[str, int]()
calls = []
observer = lambda value0, value1: calls.append((value0, value1))
Expand All @@ -144,36 +144,36 @@ def test_bi_event_unobserve_lambda():
assert calls == [("test0", 0)]


def test_bi_event_lambda_with_too_many_parameters():
def test_bi_event_observe_lambda_observer_too_many_parameters_fails():
event = BiEvent[str, int]()

with pytest.raises(ValueError):
event.observe(lambda param0, param1, param2: None)


def test_bi_event_call_with_one_parameter():
def test_bi_event_call_with_one_parameter_fails():
event = BiEvent[str, int]()

with pytest.raises(TypeError):
event("param0")


def test_bi_event_call_with_three_parameters():
def test_bi_event_call_with_three_parameters_fails():
event = BiEvent[str, int]()

with pytest.raises(TypeError):
event("param0", 42, "param2")


def test_bi_event_unobserve_non_existent_observer():
def test_bi_event_unobserve_nonexistent_mock_observer_fails():
event = BiEvent[str, int]()
observer = TwoParametersObserver()

with pytest.raises(ValueError):
event.unobserve(observer)


def test_bi_event_observe_same_observer_multiple_times():
def test_bi_event_observe_same_mock_observer_multiple_times():
event = BiEvent[str, int]()
observer = TwoParametersObserver()

Expand All @@ -190,7 +190,7 @@ def test_bi_event_call_with_no_observers():
event("test_value", 42) # Should not raise


def test_bi_event_observers_called_in_order():
def test_bi_event_call_lambda_observers_in_order():
event = BiEvent[str, int]()
call_order = []

Expand All @@ -203,7 +203,7 @@ def test_bi_event_observers_called_in_order():
assert call_order == ["first", "second", "third"]


def test_bi_event_call_with_none_values():
def test_bi_event_call_mock_observer_with_none_values():
event = BiEvent[str | None, int | None]()
observer = TwoParametersObserver()

Expand Down
22 changes: 11 additions & 11 deletions tests/test_events/test_events.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,12 @@
from pybind.event import Event


def test_event_initialization():
def test_event_initialization_empty_subscriptions():
event = Event()
assert event._subscriptions == []


def test_mock_observe_adds_observer():
def test_event_observe_mock_observer_adds_subscription():
event = Event()
observer = NoParametersObserver()

Expand All @@ -18,14 +18,14 @@ def test_mock_observe_adds_observer():
assert event.is_observed(observer)


def test_mock_observe_validates_parameter_count():
def test_event_observe_mock_observer_too_many_parameters_fails():
event = Event()

with pytest.raises(ValueError):
event.observe(OneParameterObserver())


def test_mock_unobserve_removes_observer():
def test_event_unobserve_mock_observer_removes_subscription():
event = Event()
observer = NoParametersObserver()
event.observe(observer)
Expand All @@ -35,14 +35,14 @@ def test_mock_unobserve_removes_observer():
assert not event.is_observed(observer)


def test_mock_unobserve_nonexistent_observer_raises():
def test_event_unobserve_nonexistent_mock_observer_fails():
event = Event()

with pytest.raises(ValueError):
event.unobserve(NoParametersObserver())


def test_mock_unobserved_observer_not_called():
def test_event_call_unobserved_mock_observer_not_invoked():
event = Event()
observer = NoParametersObserver()
event.observe(observer)
Expand All @@ -53,7 +53,7 @@ def test_mock_unobserved_observer_not_called():
observer.assert_not_called()


def test_mock_call_invokes_all_observers():
def test_event_call_invokes_all_mock_observers():
event = Event()
observer0 = NoParametersObserver()
observer1 = NoParametersObserver()
Expand All @@ -66,7 +66,7 @@ def test_mock_call_invokes_all_observers():
observer1.assert_called_once_with()


def test_mock_observer_with_default_parameter():
def test_event_observe_mock_observer_with_default_parameter():
event = Event()
observer = OneDefaultParameterObserver()

Expand All @@ -76,12 +76,12 @@ def test_mock_observer_with_default_parameter():
observer.assert_called_once_with("default")


def test_call_with_no_observers():
def test_event_call_with_no_observers():
event = Event()
event()


def test_function_observer_with_default_parameter():
def test_event_observe_function_observer_with_default_parameter():
event = Event()

calls = []
Expand All @@ -94,7 +94,7 @@ def observer_with_default(param="default"):
assert calls == ["default"]


def test_lambda_observer():
def test_event_observe_lambda_observer():
event = Event()
calls = []

Expand Down
30 changes: 15 additions & 15 deletions tests/test_events/test_events_weak_observe.py
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
from pybind.event import Event


def test_weak_observe_adds_observer():
def test_event_weak_observe_mock_observer_adds_subscription():
event = Event()
observer = NoParametersObserver()

Expand All @@ -15,14 +15,14 @@ def test_weak_observe_adds_observer():
assert event.is_observed(observer)


def test_weak_observe_validates_parameter_count():
def test_event_weak_observe_mock_observer_too_many_parameters_fails():
event = Event()

with pytest.raises(ValueError):
event.weak_observe(OneParameterObserver())


def test_weak_observe_calls_observer():
def test_event_weak_observe_mock_observer_called():
event = Event()
observer = NoParametersObserver()
event.weak_observe(observer)
Expand All @@ -32,7 +32,7 @@ def test_weak_observe_calls_observer():
observer.assert_called_once_with()


def test_weak_observe_unobserve_removes_observer():
def test_event_weak_observe_unobserve_mock_observer_removes_subscription():
event = Event()
observer = NoParametersObserver()
event.weak_observe(observer)
Expand All @@ -42,7 +42,7 @@ def test_weak_observe_unobserve_removes_observer():
assert not event.is_observed(observer)


def test_weak_observe_unobserve_twice_removes_observer():
def test_event_weak_observe_unobserve_twice_mock_observer_removes_subscription():
event = Event()
observer = NoParametersObserver()
event.weak_observe(observer)
Expand All @@ -54,7 +54,7 @@ def test_weak_observe_unobserve_twice_removes_observer():
assert not event.is_observed(observer)


def test_weak_observe_twice_unobserve_once_still_observer():
def test_event_weak_observe_twice_unobserve_once_mock_observer_still_subscribed():
event = Event()
observer = NoParametersObserver()
event.weak_observe(observer)
Expand All @@ -65,7 +65,7 @@ def test_weak_observe_twice_unobserve_once_still_observer():
assert event.is_observed(observer)


def test_weak_observe_auto_cleanup():
def test_event_weak_observe_mock_observer_auto_cleanup():
event = Event()
observer = NoParametersObserver()
event.weak_observe(observer)
Expand All @@ -78,7 +78,7 @@ def test_weak_observe_auto_cleanup():
assert len(event._subscriptions) == 0


def test_weak_observe_with_function():
def test_event_weak_observe_function_observer():
event = Event()
calls = []

Expand All @@ -91,7 +91,7 @@ def observer():
assert calls == [True]


def test_mixed_weak_and_strong_observers():
def test_event_mixed_weak_strong_mock_observers():
event = Event()
strong_observer = NoParametersObserver()
weak_observer = NoParametersObserver()
Expand All @@ -105,7 +105,7 @@ def test_mixed_weak_and_strong_observers():
weak_observer.assert_called_once_with()


def test_weak_observe_method_auto_cleanup():
def test_event_weak_observe_mock_observer_method_auto_cleanup():
event = Event()

observer = NoParametersObserver()
Expand All @@ -119,7 +119,7 @@ def test_weak_observe_method_auto_cleanup():
assert len(event._subscriptions) == 0


def test_weak_observe_method_before_cleanup():
def test_event_weak_observe_mock_observer_method_before_cleanup():
event = Event()

observer = NoParametersObserver()
Expand All @@ -131,7 +131,7 @@ def test_weak_observe_method_before_cleanup():
assert len(event._subscriptions) == 1


def test_weak_lambda_cleaned_immediately_observer():
def test_event_weak_observe_lambda_observer_cleaned_immediately():
event = Event()
calls = []

Expand All @@ -141,7 +141,7 @@ def test_weak_lambda_cleaned_immediately_observer():
assert calls == []


def test_weak_lambda_cleanup():
def test_event_weak_observe_lambda_observer_cleanup():
event = Event()
calls = []

Expand All @@ -157,7 +157,7 @@ def test_weak_lambda_cleanup():
assert calls == []


def test_weak_lambda_unobserve():
def test_event_weak_observe_unobserve_lambda_observer():
event = Event()
calls = []

Expand All @@ -171,7 +171,7 @@ def test_weak_lambda_unobserve():
assert not event.is_observed(observer)


def test_call_order_mixed_weak_strong():
def test_event_call_mixed_weak_strong_lambda_observers_in_order():
event = Event()
calls = []

Expand Down
Loading