44import base64
55
66
7- from nose .tools import eq_ as eq , assert_is_none , assert_raises
87import numpy as np
8+ import pytest
99
1010
1111from zarr .compat import binary_type , text_type , PY2
1515from zarr .codecs import Delta , Zlib , Blosc
1616
1717
18- def assert_json_eq (expect , actual ):
18+ def assert_json_equal (expect , actual ):
1919 if isinstance (expect , binary_type ): # pragma: py3 no cover
2020 expect = text_type (expect , 'ascii' )
2121 if isinstance (actual , binary_type ):
2222 actual = text_type (actual , 'ascii' )
2323 ej = json .loads (expect )
2424 aj = json .loads (actual )
25- eq ( ej , aj )
25+ assert ej == aj
2626
2727
2828def test_encode_decode_array_1 ():
@@ -50,18 +50,18 @@ def test_encode_decode_array_1():
5050
5151 # test encoding
5252 meta_enc = encode_array_metadata (meta )
53- assert_json_eq (meta_json , meta_enc )
53+ assert_json_equal (meta_json , meta_enc )
5454
5555 # test decoding
5656 meta_dec = decode_array_metadata (meta_enc )
57- eq ( ZARR_FORMAT , meta_dec ['zarr_format' ])
58- eq ( meta ['shape' ], meta_dec ['shape' ])
59- eq ( meta ['chunks' ], meta_dec ['chunks' ])
60- eq ( meta ['dtype' ], meta_dec ['dtype' ])
61- eq ( meta ['compressor' ], meta_dec ['compressor' ])
62- eq ( meta ['order' ], meta_dec ['order' ])
63- assert_is_none ( meta_dec ['fill_value' ])
64- assert_is_none ( meta_dec ['filters' ])
57+ assert ZARR_FORMAT == meta_dec ['zarr_format' ]
58+ assert meta ['shape' ] == meta_dec ['shape' ]
59+ assert meta ['chunks' ] == meta_dec ['chunks' ]
60+ assert meta ['dtype' ] == meta_dec ['dtype' ]
61+ assert meta ['compressor' ] == meta_dec ['compressor' ]
62+ assert meta ['order' ] == meta_dec ['order' ]
63+ assert meta_dec ['fill_value' ] is None
64+ assert meta_dec ['filters' ] is None
6565
6666
6767def test_encode_decode_array_2 ():
@@ -100,19 +100,19 @@ def test_encode_decode_array_2():
100100
101101 # test encoding
102102 meta_enc = encode_array_metadata (meta )
103- assert_json_eq (meta_json , meta_enc )
103+ assert_json_equal (meta_json , meta_enc )
104104
105105 # test decoding
106106 meta_dec = decode_array_metadata (meta_enc )
107- eq ( ZARR_FORMAT , meta_dec ['zarr_format' ])
108- eq ( meta ['shape' ], meta_dec ['shape' ])
109- eq ( meta ['chunks' ], meta_dec ['chunks' ])
110- eq ( meta ['dtype' ], meta_dec ['dtype' ])
111- eq ( meta ['compressor' ], meta_dec ['compressor' ])
112- eq ( meta ['order' ], meta_dec ['order' ])
107+ assert ZARR_FORMAT == meta_dec ['zarr_format' ]
108+ assert meta ['shape' ] == meta_dec ['shape' ]
109+ assert meta ['chunks' ] == meta_dec ['chunks' ]
110+ assert meta ['dtype' ] == meta_dec ['dtype' ]
111+ assert meta ['compressor' ] == meta_dec ['compressor' ]
112+ assert meta ['order' ] == meta_dec ['order' ]
113113 np_fill_value = np .array (meta ['fill_value' ], dtype = meta ['dtype' ])[()]
114- eq ( np_fill_value , meta_dec ['fill_value' ])
115- eq ( [df .get_config ()], meta_dec ['filters' ])
114+ assert np_fill_value == meta_dec ['fill_value' ]
115+ assert [df .get_config ()] == meta_dec ['filters' ]
116116
117117
118118def test_encode_decode_fill_values_nan ():
@@ -148,7 +148,7 @@ def test_encode_decode_fill_values_nan():
148148
149149 # test encoding
150150 meta_enc = encode_array_metadata (meta )
151- assert_json_eq (meta_json , meta_enc )
151+ assert_json_equal (meta_json , meta_enc )
152152
153153 # test decoding
154154 meta_dec = decode_array_metadata (meta_enc )
@@ -191,13 +191,13 @@ def test_encode_decode_fill_values_bytes():
191191 }''' % (s , ZARR_FORMAT )
192192
193193 # test encoding
194- assert_json_eq (meta_json , meta_enc )
194+ assert_json_equal (meta_json , meta_enc )
195195
196196 # test decoding
197197 meta_dec = decode_array_metadata (meta_enc )
198198 actual = meta_dec ['fill_value' ]
199199 expect = np .array (v , dtype = dtype )[()]
200- eq ( expect , actual )
200+ assert expect == actual
201201
202202
203203def test_decode_array_unsupported_format ():
@@ -212,7 +212,7 @@ def test_decode_array_unsupported_format():
212212 "fill_value": null,
213213 "order": "C"
214214 }''' % (ZARR_FORMAT - 1 )
215- with assert_raises (MetadataError ):
215+ with pytest . raises (MetadataError ):
216216 decode_array_metadata (meta_json )
217217
218218
@@ -222,7 +222,7 @@ def test_decode_array_missing_fields():
222222 meta_json = '''{
223223 "zarr_format": %s
224224 }''' % ZARR_FORMAT
225- with assert_raises (MetadataError ):
225+ with pytest . raises (MetadataError ):
226226 decode_array_metadata (meta_json )
227227
228228
@@ -233,7 +233,7 @@ def test_encode_decode_dtype():
233233 s = json .dumps (e ) # check JSON serializable
234234 o = json .loads (s )
235235 d = decode_dtype (o )
236- eq ( np .dtype (dt ), d )
236+ assert np .dtype (dt ) == d
237237
238238
239239def test_decode_group ():
@@ -243,11 +243,11 @@ def test_decode_group():
243243 "zarr_format": %s
244244 }''' % ZARR_FORMAT
245245 meta = decode_group_metadata (b )
246- eq ( ZARR_FORMAT , meta ['zarr_format' ])
246+ assert ZARR_FORMAT == meta ['zarr_format' ]
247247
248248 # unsupported format
249249 b = '''{
250250 "zarr_format": %s
251251 }''' % (ZARR_FORMAT - 1 )
252- with assert_raises (MetadataError ):
252+ with pytest . raises (MetadataError ):
253253 decode_group_metadata (b )
0 commit comments