Skip to content

Commit ab4c2d2

Browse files
committed
dump_load_assert -> assert_dump_load (etc)
1 parent ddee485 commit ab4c2d2

File tree

1 file changed

+21
-21
lines changed

1 file changed

+21
-21
lines changed

tests/test_make.py

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,19 @@ def dataclass_param(request):
3838
return request.param
3939

4040

41-
def _load_assert(schema, loaded, dumped):
41+
def _assert_load(schema, loaded, dumped):
4242
assert schema.load(dumped) == loaded
4343

4444

45-
def _dump_assert(schema, loaded, dumped):
45+
def _assert_dump(schema, loaded, dumped):
4646
assert schema.dump(loaded) == dumped
4747

4848

49-
def _dump_load_assert(schema, loaded, dumped):
49+
def _assert_dump_load(schema, loaded, dumped):
5050
assert schema.loads(schema.dumps(loaded)) == loaded
5151

5252

53-
def _load_dump_assert(schema, loaded, dumped):
53+
def _assert_load_dump(schema, loaded, dumped):
5454
assert schema.dump(schema.load(dumped)) == dumped
5555

5656

@@ -66,13 +66,13 @@ def fixture(request):
6666
return fixture
6767

6868

69-
_dump_load_assert = fixture_from_dict(
70-
name='dump_load_assert',
69+
_assert_dump_load = fixture_from_dict(
70+
name='assert_dump_load',
7171
id_to_value={
72-
'load': _load_assert,
73-
'dump': _dump_assert,
74-
'dump load': _dump_load_assert,
75-
'load dump': _load_dump_assert,
72+
'load': _assert_load,
73+
'dump': _assert_dump,
74+
'dump load': _assert_dump_load,
75+
'load dump': _assert_load_dump,
7676
},
7777
)
7878

@@ -262,7 +262,7 @@ class A:
262262

263263

264264
@pytest.mark.parametrize(argnames=['value'], argvalues=[["X"], [5]])
265-
def test_union(module, value, dump_load_assert):
265+
def test_union(module, value, assert_dump_load):
266266
"""Deserialize one of several types."""
267267

268268
@module.dataclass
@@ -274,10 +274,10 @@ class A:
274274
dumped = {"x": value}
275275
loaded = A(value)
276276

277-
dump_load_assert(schema=schema, loaded=loaded, dumped=dumped)
277+
assert_dump_load(schema=schema, loaded=loaded, dumped=dumped)
278278

279279

280-
def test_enum(module, dump_load_assert):
280+
def test_enum(module, assert_dump_load):
281281
"""Deserialize an enum object."""
282282

283283
class Color(enum.Enum):
@@ -292,10 +292,10 @@ class A:
292292
dumped = {"x": "RED"}
293293
loaded = A(Color.RED)
294294

295-
dump_load_assert(schema=schema, loaded=loaded, dumped=dumped)
295+
assert_dump_load(schema=schema, loaded=loaded, dumped=dumped)
296296

297297

298-
def test_tuple(module, dump_load_assert):
298+
def test_tuple(module, assert_dump_load):
299299
"""Round trip a tuple.
300300
301301
The tuple is converted to list only for dumps(), not during dump().
@@ -309,7 +309,7 @@ class A:
309309
dumped = {"x": (1, False)}
310310
loaded = A(x=(1, False))
311311

312-
dump_load_assert(schema=schema, loaded=loaded, dumped=dumped)
312+
assert_dump_load(schema=schema, loaded=loaded, dumped=dumped)
313313

314314

315315
def test_attr_factory():
@@ -334,7 +334,7 @@ class A:
334334
assert data == A([])
335335

336336

337-
def test_newtype(module, dump_load_assert):
337+
def test_newtype(module, assert_dump_load):
338338
"""An instance of NewType delegates to its supertype."""
339339

340340
MyInt = t.NewType("MyInt", int)
@@ -347,7 +347,7 @@ class A:
347347
dumped = {"x": 1}
348348
loaded = A(x=1)
349349

350-
dump_load_assert(schema=schema, loaded=loaded, dumped=dumped)
350+
assert_dump_load(schema=schema, loaded=loaded, dumped=dumped)
351351

352352

353353
@pytest.mark.xfail(
@@ -357,7 +357,7 @@ class A:
357357
+ "See https://github.com/lovasoa/marshmallow_dataclass/issues/13"
358358
),
359359
)
360-
def test_forward_reference(module, dump_load_assert):
360+
def test_forward_reference(module, assert_dump_load):
361361
"""Build schemas from classes that are defined below their containing class."""
362362

363363
@module.dataclass
@@ -372,7 +372,7 @@ class B:
372372
dumped = {"x": {"y": 1}}
373373
loaded = A((B(1)))
374374

375-
dump_load_assert(schema=schema, loaded=loaded, dumped=dumped)
375+
assert_dump_load(schema=schema, loaded=loaded, dumped=dumped)
376376

377377

378378
def test_forward_reference_module_scope():
@@ -459,7 +459,7 @@ class A:
459459

460460
actually_dumped = {"x": [1, 2, 3]}
461461

462-
# TODO: how to use dump_load_assert?
462+
# TODO: how to use assert_dump_load?
463463
assert schema.load(dumped) == loaded
464464
assert schema.dump(loaded) == actually_dumped
465465
assert schema.loads(schema.dumps(loaded)) == loaded

0 commit comments

Comments
 (0)