Skip to content

Commit df93794

Browse files
asvetlovasvetlov
authored
Fix wrong types in tests (#1156)
1 parent 72f3fce commit df93794

2 files changed

Lines changed: 45 additions & 35 deletions

File tree

‎tests/test_multidict_benchmarks.py‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -255,8 +255,9 @@ def _run() -> None:
255255
def test_multidict_getall_str_hit(
256256
benchmark: BenchmarkFixture, any_multidict_class: Type[MultiDict[str]]
257257
) -> None:
258-
md = any_multidict_class((f"key{j}", str(f"{i}-{j}"))
259-
for i in range(20) for j in range(5))
258+
md = any_multidict_class(
259+
(f"key{j}", str(f"{i}-{j}")) for i in range(20) for j in range(5)
260+
)
260261

261262
@benchmark
262263
def _run() -> None:
@@ -266,8 +267,9 @@ def _run() -> None:
266267
def test_multidict_getall_str_miss(
267268
benchmark: BenchmarkFixture, any_multidict_class: Type[MultiDict[str]]
268269
) -> None:
269-
md = any_multidict_class((f"key{j}", str(f"{i}-{j}"))
270-
for i in range(20) for j in range(5))
270+
md = any_multidict_class(
271+
(f"key{j}", str(f"{i}-{j}")) for i in range(20) for j in range(5)
272+
)
271273

272274
@benchmark
273275
def _run() -> None:
@@ -279,8 +281,9 @@ def test_cimultidict_getall_istr_hit(
279281
case_insensitive_multidict_class: Type[CIMultiDict[istr]],
280282
) -> None:
281283
all_istr = istr("key3")
282-
md = case_insensitive_multidict_class((f"key{j}", istr(f"{i}-{j}"))
283-
for i in range(20) for j in range(5))
284+
md = case_insensitive_multidict_class(
285+
(f"key{j}", istr(f"{i}-{j}")) for i in range(20) for j in range(5)
286+
)
284287

285288
@benchmark
286289
def _run() -> None:
@@ -292,8 +295,9 @@ def test_cimultidict_getall_istr_miss(
292295
case_insensitive_multidict_class: Type[CIMultiDict[istr]],
293296
) -> None:
294297
miss_istr = istr("miss")
295-
md = case_insensitive_multidict_class((istr(f"key{j}"), istr(f"{i}-{j}"))
296-
for i in range(20) for j in range(5))
298+
md = case_insensitive_multidict_class(
299+
(istr(f"key{j}"), istr(f"{i}-{j}")) for i in range(20) for j in range(5)
300+
)
297301

298302
@benchmark
299303
def _run() -> None:

‎tests/test_mutable_multidict.py‎

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,19 @@
44

55
import pytest
66

7-
from multidict import CIMultiDict, CIMultiDictProxy, MultiDictProxy, istr
7+
from multidict import (
8+
CIMultiDict,
9+
CIMultiDictProxy,
10+
MultiDict,
11+
MultiDictProxy,
12+
istr,
13+
)
814

915

1016
class TestMutableMultiDict:
1117
def test_copy(
1218
self,
13-
case_sensitive_multidict_class: type[CIMultiDict[str]],
19+
case_sensitive_multidict_class: type[MultiDict[str]],
1420
) -> None:
1521
d1 = case_sensitive_multidict_class(key="value", a="b")
1622

@@ -20,7 +26,7 @@ def test_copy(
2026

2127
def test__repr__(
2228
self,
23-
case_sensitive_multidict_class: type[CIMultiDict[str]],
29+
case_sensitive_multidict_class: type[MultiDict[str]],
2430
) -> None:
2531
d = case_sensitive_multidict_class()
2632
assert str(d) == "<%s()>" % case_sensitive_multidict_class.__name__
@@ -35,7 +41,7 @@ def test__repr__(
3541

3642
def test_getall(
3743
self,
38-
case_sensitive_multidict_class: type[CIMultiDict[str]],
44+
case_sensitive_multidict_class: type[MultiDict[str]],
3945
) -> None:
4046
d = case_sensitive_multidict_class([("key", "value1")], key="value2")
4147
assert len(d) == 2
@@ -50,7 +56,7 @@ def test_getall(
5056

5157
def test_add(
5258
self,
53-
case_sensitive_multidict_class: type[CIMultiDict[str]],
59+
case_sensitive_multidict_class: type[MultiDict[str]],
5460
) -> None:
5561
d = case_sensitive_multidict_class()
5662

@@ -73,7 +79,7 @@ def test_add(
7379

7480
def test_extend(
7581
self,
76-
case_sensitive_multidict_class: type[CIMultiDict[Union[str, int]]],
82+
case_sensitive_multidict_class: type[MultiDict[Union[str, int]]],
7783
) -> None:
7884
d = case_sensitive_multidict_class()
7985
assert d == {}
@@ -105,7 +111,7 @@ def test_extend(
105111

106112
def test_extend_from_proxy(
107113
self,
108-
case_sensitive_multidict_class: type[CIMultiDict[str]],
114+
case_sensitive_multidict_class: type[MultiDict[str]],
109115
case_sensitive_multidict_proxy_class: type[MultiDictProxy[str]],
110116
) -> None:
111117
d = case_sensitive_multidict_class([("a", "a"), ("b", "b")])
@@ -118,7 +124,7 @@ def test_extend_from_proxy(
118124

119125
def test_clear(
120126
self,
121-
case_sensitive_multidict_class: type[CIMultiDict[str]],
127+
case_sensitive_multidict_class: type[MultiDict[str]],
122128
) -> None:
123129
d = case_sensitive_multidict_class([("key", "one")], key="two", foo="bar")
124130

@@ -128,7 +134,7 @@ def test_clear(
128134

129135
def test_del(
130136
self,
131-
case_sensitive_multidict_class: type[CIMultiDict[str]],
137+
case_sensitive_multidict_class: type[MultiDict[str]],
132138
) -> None:
133139
d = case_sensitive_multidict_class([("key", "one"), ("key", "two")], foo="bar")
134140
assert list(d.keys()) == ["key", "key", "foo"]
@@ -142,7 +148,7 @@ def test_del(
142148

143149
def test_set_default(
144150
self,
145-
case_sensitive_multidict_class: type[CIMultiDict[str]],
151+
case_sensitive_multidict_class: type[MultiDict[str]],
146152
) -> None:
147153
d = case_sensitive_multidict_class([("key", "one"), ("key", "two")], foo="bar")
148154
assert "one" == d.setdefault("key", "three")
@@ -152,7 +158,7 @@ def test_set_default(
152158

153159
def test_popitem(
154160
self,
155-
case_sensitive_multidict_class: type[CIMultiDict[str]],
161+
case_sensitive_multidict_class: type[MultiDict[str]],
156162
) -> None:
157163
d = case_sensitive_multidict_class()
158164
d.add("key", "val1")
@@ -163,7 +169,7 @@ def test_popitem(
163169

164170
def test_popitem_empty_multidict(
165171
self,
166-
case_sensitive_multidict_class: type[CIMultiDict[str]],
172+
case_sensitive_multidict_class: type[MultiDict[str]],
167173
) -> None:
168174
d = case_sensitive_multidict_class()
169175

@@ -172,7 +178,7 @@ def test_popitem_empty_multidict(
172178

173179
def test_pop(
174180
self,
175-
case_sensitive_multidict_class: type[CIMultiDict[str]],
181+
case_sensitive_multidict_class: type[MultiDict[str]],
176182
) -> None:
177183
d = case_sensitive_multidict_class()
178184
d.add("key", "val1")
@@ -183,7 +189,7 @@ def test_pop(
183189

184190
def test_pop2(
185191
self,
186-
case_sensitive_multidict_class: type[CIMultiDict[str]],
192+
case_sensitive_multidict_class: type[MultiDict[str]],
187193
) -> None:
188194
d = case_sensitive_multidict_class()
189195
d.add("key", "val1")
@@ -195,7 +201,7 @@ def test_pop2(
195201

196202
def test_pop_default(
197203
self,
198-
case_sensitive_multidict_class: type[CIMultiDict[str]],
204+
case_sensitive_multidict_class: type[MultiDict[str]],
199205
) -> None:
200206
d = case_sensitive_multidict_class(other="val")
201207

@@ -204,7 +210,7 @@ def test_pop_default(
204210

205211
def test_pop_raises(
206212
self,
207-
case_sensitive_multidict_class: type[CIMultiDict[str]],
213+
case_sensitive_multidict_class: type[MultiDict[str]],
208214
) -> None:
209215
d = case_sensitive_multidict_class(other="val")
210216

@@ -215,7 +221,7 @@ def test_pop_raises(
215221

216222
def test_replacement_order(
217223
self,
218-
case_sensitive_multidict_class: type[CIMultiDict[str]],
224+
case_sensitive_multidict_class: type[MultiDict[str]],
219225
) -> None:
220226
d = case_sensitive_multidict_class()
221227
d.add("key1", "val1")
@@ -231,15 +237,15 @@ def test_replacement_order(
231237

232238
def test_nonstr_key(
233239
self,
234-
case_sensitive_multidict_class: type[CIMultiDict[str]],
240+
case_sensitive_multidict_class: type[MultiDict[str]],
235241
) -> None:
236242
d = case_sensitive_multidict_class()
237243
with pytest.raises(TypeError):
238244
d[1] = "val" # type: ignore[index]
239245

240246
def test_istr_key(
241247
self,
242-
case_sensitive_multidict_class: type[CIMultiDict[str]],
248+
case_sensitive_multidict_class: type[MultiDict[str]],
243249
case_insensitive_str_class: type[str],
244250
) -> None:
245251
d = case_sensitive_multidict_class()
@@ -248,7 +254,7 @@ def test_istr_key(
248254

249255
def test_str_derived_key(
250256
self,
251-
case_sensitive_multidict_class: type[CIMultiDict[str]],
257+
case_sensitive_multidict_class: type[MultiDict[str]],
252258
) -> None:
253259
class A(str):
254260
pass
@@ -259,7 +265,7 @@ class A(str):
259265

260266
def test_istr_key_add(
261267
self,
262-
case_sensitive_multidict_class: type[CIMultiDict[str]],
268+
case_sensitive_multidict_class: type[MultiDict[str]],
263269
case_insensitive_str_class: type[str],
264270
) -> None:
265271
d = case_sensitive_multidict_class()
@@ -268,7 +274,7 @@ def test_istr_key_add(
268274

269275
def test_str_derived_key_add(
270276
self,
271-
case_sensitive_multidict_class: type[CIMultiDict[str]],
277+
case_sensitive_multidict_class: type[MultiDict[str]],
272278
) -> None:
273279
class A(str):
274280
pass
@@ -279,7 +285,7 @@ class A(str):
279285

280286
def test_popall(
281287
self,
282-
case_sensitive_multidict_class: type[CIMultiDict[str]],
288+
case_sensitive_multidict_class: type[MultiDict[str]],
283289
) -> None:
284290
d = case_sensitive_multidict_class()
285291
d.add("key1", "val1")
@@ -291,22 +297,22 @@ def test_popall(
291297

292298
def test_popall_default(
293299
self,
294-
case_sensitive_multidict_class: type[CIMultiDict[str]],
300+
case_sensitive_multidict_class: type[MultiDict[str]],
295301
) -> None:
296302
d = case_sensitive_multidict_class()
297303
assert "val" == d.popall("key", "val")
298304

299305
def test_popall_key_error(
300306
self,
301-
case_sensitive_multidict_class: type[CIMultiDict[str]],
307+
case_sensitive_multidict_class: type[MultiDict[str]],
302308
) -> None:
303309
d = case_sensitive_multidict_class()
304310
with pytest.raises(KeyError, match="key"):
305311
d.popall("key")
306312

307313
def test_large_multidict_resizing(
308314
self,
309-
case_sensitive_multidict_class: type[CIMultiDict[int]],
315+
case_sensitive_multidict_class: type[MultiDict[int]],
310316
) -> None:
311317
SIZE = 1024
312318
d = case_sensitive_multidict_class()
@@ -320,7 +326,7 @@ def test_large_multidict_resizing(
320326

321327
def test_update(
322328
self,
323-
case_sensitive_multidict_class: type[CIMultiDict[Union[str, int]]],
329+
case_sensitive_multidict_class: type[MultiDict[Union[str, int]]],
324330
) -> None:
325331
d = case_sensitive_multidict_class()
326332
assert d == {}

0 commit comments

Comments
 (0)