@@ -38,19 +38,19 @@ def dataclass_param(request):
38
38
return request .param
39
39
40
40
41
- def _load_assert (schema , loaded , dumped ):
41
+ def _assert_load (schema , loaded , dumped ):
42
42
assert schema .load (dumped ) == loaded
43
43
44
44
45
- def _dump_assert (schema , loaded , dumped ):
45
+ def _assert_dump (schema , loaded , dumped ):
46
46
assert schema .dump (loaded ) == dumped
47
47
48
48
49
- def _dump_load_assert (schema , loaded , dumped ):
49
+ def _assert_dump_load (schema , loaded , dumped ):
50
50
assert schema .loads (schema .dumps (loaded )) == loaded
51
51
52
52
53
- def _load_dump_assert (schema , loaded , dumped ):
53
+ def _assert_load_dump (schema , loaded , dumped ):
54
54
assert schema .dump (schema .load (dumped )) == dumped
55
55
56
56
@@ -66,13 +66,13 @@ def fixture(request):
66
66
return fixture
67
67
68
68
69
- _dump_load_assert = fixture_from_dict (
70
- name = 'dump_load_assert ' ,
69
+ _assert_dump_load = fixture_from_dict (
70
+ name = 'assert_dump_load ' ,
71
71
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 ,
76
76
},
77
77
)
78
78
@@ -262,7 +262,7 @@ class A:
262
262
263
263
264
264
@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 ):
266
266
"""Deserialize one of several types."""
267
267
268
268
@module .dataclass
@@ -274,10 +274,10 @@ class A:
274
274
dumped = {"x" : value }
275
275
loaded = A (value )
276
276
277
- dump_load_assert (schema = schema , loaded = loaded , dumped = dumped )
277
+ assert_dump_load (schema = schema , loaded = loaded , dumped = dumped )
278
278
279
279
280
- def test_enum (module , dump_load_assert ):
280
+ def test_enum (module , assert_dump_load ):
281
281
"""Deserialize an enum object."""
282
282
283
283
class Color (enum .Enum ):
@@ -292,10 +292,10 @@ class A:
292
292
dumped = {"x" : "RED" }
293
293
loaded = A (Color .RED )
294
294
295
- dump_load_assert (schema = schema , loaded = loaded , dumped = dumped )
295
+ assert_dump_load (schema = schema , loaded = loaded , dumped = dumped )
296
296
297
297
298
- def test_tuple (module , dump_load_assert ):
298
+ def test_tuple (module , assert_dump_load ):
299
299
"""Round trip a tuple.
300
300
301
301
The tuple is converted to list only for dumps(), not during dump().
@@ -309,7 +309,7 @@ class A:
309
309
dumped = {"x" : (1 , False )}
310
310
loaded = A (x = (1 , False ))
311
311
312
- dump_load_assert (schema = schema , loaded = loaded , dumped = dumped )
312
+ assert_dump_load (schema = schema , loaded = loaded , dumped = dumped )
313
313
314
314
315
315
def test_attr_factory ():
@@ -334,7 +334,7 @@ class A:
334
334
assert data == A ([])
335
335
336
336
337
- def test_newtype (module , dump_load_assert ):
337
+ def test_newtype (module , assert_dump_load ):
338
338
"""An instance of NewType delegates to its supertype."""
339
339
340
340
MyInt = t .NewType ("MyInt" , int )
@@ -347,7 +347,7 @@ class A:
347
347
dumped = {"x" : 1 }
348
348
loaded = A (x = 1 )
349
349
350
- dump_load_assert (schema = schema , loaded = loaded , dumped = dumped )
350
+ assert_dump_load (schema = schema , loaded = loaded , dumped = dumped )
351
351
352
352
353
353
@pytest .mark .xfail (
@@ -357,7 +357,7 @@ class A:
357
357
+ "See https://github.com/lovasoa/marshmallow_dataclass/issues/13"
358
358
),
359
359
)
360
- def test_forward_reference (module , dump_load_assert ):
360
+ def test_forward_reference (module , assert_dump_load ):
361
361
"""Build schemas from classes that are defined below their containing class."""
362
362
363
363
@module .dataclass
@@ -372,7 +372,7 @@ class B:
372
372
dumped = {"x" : {"y" : 1 }}
373
373
loaded = A ((B (1 )))
374
374
375
- dump_load_assert (schema = schema , loaded = loaded , dumped = dumped )
375
+ assert_dump_load (schema = schema , loaded = loaded , dumped = dumped )
376
376
377
377
378
378
def test_forward_reference_module_scope ():
@@ -459,7 +459,7 @@ class A:
459
459
460
460
actually_dumped = {"x" : [1 , 2 , 3 ]}
461
461
462
- # TODO: how to use dump_load_assert ?
462
+ # TODO: how to use assert_dump_load ?
463
463
assert schema .load (dumped ) == loaded
464
464
assert schema .dump (loaded ) == actually_dumped
465
465
assert schema .loads (schema .dumps (loaded )) == loaded
0 commit comments