Skip to content

Commit 11cd96d

Browse files
authored
Merge pull request #17 from FancyNeuron/15-homogenize-pytest-function-names_
Use more consistent pytest function names
2 parents 82f0c80 + 9a0335b commit 11cd96d

File tree

5 files changed

+83
-83
lines changed

5 files changed

+83
-83
lines changed

tests/test_events/test_bi_events.py

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
OneRequiredOneDefaultParameterObserver, TwoParametersObserver, TwoDefaultParametersObserver
55

66

7-
def test_bi_event_observe_and_call_no_parameters_mock_observer():
7+
def test_bi_event_observe_no_parameters_mock_observer():
88
event = BiEvent[str, int]()
99
observer = NoParametersObserver()
1010

@@ -14,7 +14,7 @@ def test_bi_event_observe_and_call_no_parameters_mock_observer():
1414
observer.assert_called_once_with()
1515

1616

17-
def test_bi_event_observe_and_call_one_parameter_mock_observer():
17+
def test_bi_event_observe_one_parameter_mock_observer():
1818
event = BiEvent[str, int]()
1919
observer = OneParameterObserver()
2020

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

2626

27-
def test_bi_event_observe_and_call_one_default_parameter_mock_observer():
27+
def test_bi_event_observe_one_default_parameter_mock_observer():
2828
event = BiEvent[str, int]()
2929
observer = OneDefaultParameterObserver()
3030

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

3636

37-
def test_bi_event_observe_and_call_one_required_one_default_parameter_mock_observer():
37+
def test_bi_event_observe_one_required_one_default_parameter_mock_observer():
3838
event = BiEvent[str, int]()
3939
observer = OneRequiredOneDefaultParameterObserver()
4040

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

4646

47-
def test_bi_event_observe_and_call_two_parameters_mock_observer():
47+
def test_bi_event_observe_two_parameters_mock_observer():
4848
event = BiEvent[str, int]()
4949
observer = TwoParametersObserver()
5050

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

5656

57-
def test_bi_event_observe_and_call_two_default_parameters_mock_observer():
57+
def test_bi_event_observe_two_default_parameters_mock_observer():
5858
event = BiEvent[str, int]()
5959
observer = TwoDefaultParametersObserver()
6060

@@ -75,7 +75,7 @@ def test_bi_event_unobserve_mock_observer():
7575
observer.assert_not_called()
7676

7777

78-
def test_bi_event_multiple_mock_observers():
78+
def test_bi_event_call_multiple_mock_observers():
7979
event = BiEvent[str, int]()
8080
observer0 = NoParametersObserver()
8181
observer1 = OneParameterObserver()
@@ -91,7 +91,7 @@ def test_bi_event_multiple_mock_observers():
9191
observer2.assert_called_once_with("hello", 123)
9292

9393

94-
def test_bi_event_function_observer_with_too_many_parameters():
94+
def test_bi_event_observe_function_observer_too_many_parameters_fails():
9595
event = BiEvent[str, int]()
9696

9797
def bad_observer(param0, param1, param2):
@@ -101,7 +101,7 @@ def bad_observer(param0, param1, param2):
101101
event.observe(bad_observer)
102102

103103

104-
def test_bi_event_observe_and_call_lambda_no_parameters():
104+
def test_bi_event_observe_lambda_no_parameters():
105105
event = BiEvent[str, int]()
106106
called = []
107107

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

113113

114-
def test_bi_event_observe_and_call_lambda_one_parameter():
114+
def test_bi_event_observe_lambda_one_parameter():
115115
event = BiEvent[str, int]()
116116
calls = []
117117

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

123123

124-
def test_bi_event_observe_and_call_lambda_two_parameters():
124+
def test_bi_event_observe_lambda_two_parameters():
125125
event = BiEvent[str, int]()
126126
calls = []
127127

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

133133

134-
def test_bi_event_unobserve_lambda():
134+
def test_bi_event_unobserve_lambda_observer():
135135
event = BiEvent[str, int]()
136136
calls = []
137137
observer = lambda value0, value1: calls.append((value0, value1))
@@ -144,36 +144,36 @@ def test_bi_event_unobserve_lambda():
144144
assert calls == [("test0", 0)]
145145

146146

147-
def test_bi_event_lambda_with_too_many_parameters():
147+
def test_bi_event_observe_lambda_observer_too_many_parameters_fails():
148148
event = BiEvent[str, int]()
149149

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

153153

154-
def test_bi_event_call_with_one_parameter():
154+
def test_bi_event_call_with_one_parameter_fails():
155155
event = BiEvent[str, int]()
156156

157157
with pytest.raises(TypeError):
158158
event("param0")
159159

160160

161-
def test_bi_event_call_with_three_parameters():
161+
def test_bi_event_call_with_three_parameters_fails():
162162
event = BiEvent[str, int]()
163163

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

167167

168-
def test_bi_event_unobserve_non_existent_observer():
168+
def test_bi_event_unobserve_nonexistent_mock_observer_fails():
169169
event = BiEvent[str, int]()
170170
observer = TwoParametersObserver()
171171

172172
with pytest.raises(ValueError):
173173
event.unobserve(observer)
174174

175175

176-
def test_bi_event_observe_same_observer_multiple_times():
176+
def test_bi_event_observe_same_mock_observer_multiple_times():
177177
event = BiEvent[str, int]()
178178
observer = TwoParametersObserver()
179179

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

192192

193-
def test_bi_event_observers_called_in_order():
193+
def test_bi_event_call_lambda_observers_in_order():
194194
event = BiEvent[str, int]()
195195
call_order = []
196196

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

205205

206-
def test_bi_event_call_with_none_values():
206+
def test_bi_event_call_mock_observer_with_none_values():
207207
event = BiEvent[str | None, int | None]()
208208
observer = TwoParametersObserver()
209209

tests/test_events/test_events.py

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,12 @@
44
from pybind.event import Event
55

66

7-
def test_event_initialization():
7+
def test_event_initialization_empty_subscriptions():
88
event = Event()
99
assert event._subscriptions == []
1010

1111

12-
def test_mock_observe_adds_observer():
12+
def test_event_observe_mock_observer_adds_subscription():
1313
event = Event()
1414
observer = NoParametersObserver()
1515

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

2020

21-
def test_mock_observe_validates_parameter_count():
21+
def test_event_observe_mock_observer_too_many_parameters_fails():
2222
event = Event()
2323

2424
with pytest.raises(ValueError):
2525
event.observe(OneParameterObserver())
2626

2727

28-
def test_mock_unobserve_removes_observer():
28+
def test_event_unobserve_mock_observer_removes_subscription():
2929
event = Event()
3030
observer = NoParametersObserver()
3131
event.observe(observer)
@@ -35,14 +35,14 @@ def test_mock_unobserve_removes_observer():
3535
assert not event.is_observed(observer)
3636

3737

38-
def test_mock_unobserve_nonexistent_observer_raises():
38+
def test_event_unobserve_nonexistent_mock_observer_fails():
3939
event = Event()
4040

4141
with pytest.raises(ValueError):
4242
event.unobserve(NoParametersObserver())
4343

4444

45-
def test_mock_unobserved_observer_not_called():
45+
def test_event_call_unobserved_mock_observer_not_invoked():
4646
event = Event()
4747
observer = NoParametersObserver()
4848
event.observe(observer)
@@ -53,7 +53,7 @@ def test_mock_unobserved_observer_not_called():
5353
observer.assert_not_called()
5454

5555

56-
def test_mock_call_invokes_all_observers():
56+
def test_event_call_invokes_all_mock_observers():
5757
event = Event()
5858
observer0 = NoParametersObserver()
5959
observer1 = NoParametersObserver()
@@ -66,7 +66,7 @@ def test_mock_call_invokes_all_observers():
6666
observer1.assert_called_once_with()
6767

6868

69-
def test_mock_observer_with_default_parameter():
69+
def test_event_observe_mock_observer_with_default_parameter():
7070
event = Event()
7171
observer = OneDefaultParameterObserver()
7272

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

7878

79-
def test_call_with_no_observers():
79+
def test_event_call_with_no_observers():
8080
event = Event()
8181
event()
8282

8383

84-
def test_function_observer_with_default_parameter():
84+
def test_event_observe_function_observer_with_default_parameter():
8585
event = Event()
8686

8787
calls = []
@@ -94,7 +94,7 @@ def observer_with_default(param="default"):
9494
assert calls == ["default"]
9595

9696

97-
def test_lambda_observer():
97+
def test_event_observe_lambda_observer():
9898
event = Event()
9999
calls = []
100100

tests/test_events/test_events_weak_observe.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
from pybind.event import Event
77

88

9-
def test_weak_observe_adds_observer():
9+
def test_event_weak_observe_mock_observer_adds_subscription():
1010
event = Event()
1111
observer = NoParametersObserver()
1212

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

1717

18-
def test_weak_observe_validates_parameter_count():
18+
def test_event_weak_observe_mock_observer_too_many_parameters_fails():
1919
event = Event()
2020

2121
with pytest.raises(ValueError):
2222
event.weak_observe(OneParameterObserver())
2323

2424

25-
def test_weak_observe_calls_observer():
25+
def test_event_weak_observe_mock_observer_called():
2626
event = Event()
2727
observer = NoParametersObserver()
2828
event.weak_observe(observer)
@@ -32,7 +32,7 @@ def test_weak_observe_calls_observer():
3232
observer.assert_called_once_with()
3333

3434

35-
def test_weak_observe_unobserve_removes_observer():
35+
def test_event_weak_observe_unobserve_mock_observer_removes_subscription():
3636
event = Event()
3737
observer = NoParametersObserver()
3838
event.weak_observe(observer)
@@ -42,7 +42,7 @@ def test_weak_observe_unobserve_removes_observer():
4242
assert not event.is_observed(observer)
4343

4444

45-
def test_weak_observe_unobserve_twice_removes_observer():
45+
def test_event_weak_observe_unobserve_twice_mock_observer_removes_subscription():
4646
event = Event()
4747
observer = NoParametersObserver()
4848
event.weak_observe(observer)
@@ -54,7 +54,7 @@ def test_weak_observe_unobserve_twice_removes_observer():
5454
assert not event.is_observed(observer)
5555

5656

57-
def test_weak_observe_twice_unobserve_once_still_observer():
57+
def test_event_weak_observe_twice_unobserve_once_mock_observer_still_subscribed():
5858
event = Event()
5959
observer = NoParametersObserver()
6060
event.weak_observe(observer)
@@ -65,7 +65,7 @@ def test_weak_observe_twice_unobserve_once_still_observer():
6565
assert event.is_observed(observer)
6666

6767

68-
def test_weak_observe_auto_cleanup():
68+
def test_event_weak_observe_mock_observer_auto_cleanup():
6969
event = Event()
7070
observer = NoParametersObserver()
7171
event.weak_observe(observer)
@@ -78,7 +78,7 @@ def test_weak_observe_auto_cleanup():
7878
assert len(event._subscriptions) == 0
7979

8080

81-
def test_weak_observe_with_function():
81+
def test_event_weak_observe_function_observer():
8282
event = Event()
8383
calls = []
8484

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

9393

94-
def test_mixed_weak_and_strong_observers():
94+
def test_event_mixed_weak_strong_mock_observers():
9595
event = Event()
9696
strong_observer = NoParametersObserver()
9797
weak_observer = NoParametersObserver()
@@ -105,7 +105,7 @@ def test_mixed_weak_and_strong_observers():
105105
weak_observer.assert_called_once_with()
106106

107107

108-
def test_weak_observe_method_auto_cleanup():
108+
def test_event_weak_observe_mock_observer_method_auto_cleanup():
109109
event = Event()
110110

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

121121

122-
def test_weak_observe_method_before_cleanup():
122+
def test_event_weak_observe_mock_observer_method_before_cleanup():
123123
event = Event()
124124

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

133133

134-
def test_weak_lambda_cleaned_immediately_observer():
134+
def test_event_weak_observe_lambda_observer_cleaned_immediately():
135135
event = Event()
136136
calls = []
137137

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

143143

144-
def test_weak_lambda_cleanup():
144+
def test_event_weak_observe_lambda_observer_cleanup():
145145
event = Event()
146146
calls = []
147147

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

159159

160-
def test_weak_lambda_unobserve():
160+
def test_event_weak_observe_unobserve_lambda_observer():
161161
event = Event()
162162
calls = []
163163

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

173173

174-
def test_call_order_mixed_weak_strong():
174+
def test_event_call_mixed_weak_strong_lambda_observers_in_order():
175175
event = Event()
176176
calls = []
177177

0 commit comments

Comments
 (0)