TEST: Update expected warnings, test new deprecations

Author: effigies

nibabel/gifti/tests/test_gifti.py

@@ -57,7 +57,7 @@ def test_gifti_image():
     # arguments.
     gi = GiftiImage()
     assert gi.darrays == []
-    assert gi.meta.metadata == {}
+    assert gi.meta == {}
     assert gi.labeltable.labels == []
     arr = np.zeros((2, 3))
     gi.darrays.append(arr)
@@ -125,7 +125,7 @@ def test_dataarray_empty():
     assert null_da.coordsys.xformspace == 0
     assert_array_equal(null_da.coordsys.xform, np.eye(4))
     assert null_da.ind_ord == 1
-    assert null_da.meta.metadata == {}
+    assert null_da.meta == {}
     assert null_da.ext_fname == ''
     assert null_da.ext_offset == 0
 
@@ -174,9 +174,9 @@ def test_dataarray_init():
     pytest.raises(KeyError, gda, ordering='not an ordering')
     # metadata
     meta_dict=dict(one=1, two=2)
-    assert gda(meta=GiftiMetaData.from_dict(meta_dict)).meta.metadata == meta_dict
-    assert gda(meta=meta_dict).meta.metadata == meta_dict
-    assert gda(meta=None).meta.metadata == {}
+    assert gda(meta=GiftiMetaData(meta_dict)).meta == meta_dict
+    assert gda(meta=meta_dict).meta == meta_dict
+    assert gda(meta=None).meta == {}
     # ext_fname and ext_offset
     assert gda(ext_fname='foo').ext_fname == 'foo'
     assert gda(ext_offset=12).ext_offset == 12
@@ -246,17 +246,29 @@ def test_labeltable():
 
 
 def test_metadata():
+    md = GiftiMetaData(key='value')
+    # Old initialization methods
     nvpair = GiftiNVPairs('key', 'value')
-    md = GiftiMetaData(nvpair=nvpair)
-    assert md.data[0].name == 'key'
-    assert md.data[0].value == 'value'
+    with pytest.warns(FutureWarning) as w:
+        md2 = GiftiMetaData(nvpair=nvpair)
+    assert len(w) == 1
+    with pytest.warns(DeprecationWarning) as w:
+        md3 = GiftiMetaData.from_dict({'key': 'value'})
+    assert md == md2 == md3 == {'key': 'value'}
+    # .data as a list of NVPairs is going away
+    with pytest.warns(FutureWarning) as w:
+        assert md.data[0].name == 'key'
+        assert md.data[0].value == 'value'
+    assert len(w) == 2
     # Test deprecation
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('always', category=DeprecationWarning)
         assert md.get_metadata() == dict(key='value')
         assert len(w) == 1
-        assert len(GiftiDataArray().get_metadata()) == 0
+        assert md.metadata == dict(key='value')
         assert len(w) == 2
+        assert len(GiftiDataArray().get_metadata()) == 0
+        assert len(w) == 3
 
 
 def test_gifti_label_rgba():

nibabel/gifti/tests/test_parse_gifti_fast.py

@@ -26,7 +26,7 @@
 from numpy.testing import assert_array_almost_equal
 
 import pytest
-from ...testing import clear_and_catch_warnings
+from ...testing import clear_and_catch_warnings, suppress_warnings
 
 
 IO_DATA_PATH = pjoin(dirname(__file__), 'data')
@@ -126,11 +126,13 @@
 def assert_default_types(loaded):
     default = loaded.__class__()
     for attr in dir(default):
-        defaulttype = type(getattr(default, attr))
+        with suppress_warnings():
+            defaulttype = type(getattr(default, attr))
         # Optional elements may have default of None
         if defaulttype is type(None):
             continue
-        loadedtype = type(getattr(loaded, attr))
+        with suppress_warnings():
+            loadedtype = type(getattr(loaded, attr))
         assert loadedtype == defaulttype, (
             f"Type mismatch for attribute: {attr} ({loadedtype} != {defaulttype})")
 
@@ -143,9 +145,10 @@ def test_default_types():
         assert_default_types(img)
         # GiftiMetaData
         assert_default_types(img.meta)
-        # GiftiNVPairs
-        for nvpair in img.meta.data:
-            assert_default_types(nvpair)
+        # GiftiNVPairs - Remove in NIB6
+        with pytest.warns(FutureWarning):
+            for nvpair in img.meta.data:
+                assert_default_types(nvpair)
         # GiftiLabelTable
         assert_default_types(img.labeltable)
         # GiftiLabel elements can be None or float; skip
@@ -156,9 +159,10 @@ def test_default_types():
             assert_default_types(darray.coordsys)
             # GiftiMetaData
             assert_default_types(darray.meta)
-            # GiftiNVPairs
-            for nvpair in darray.meta.data:
-                assert_default_types(nvpair)
+            # GiftiNVPairs - Remove in NIB6
+            with pytest.warns(FutureWarning):
+                for nvpair in darray.meta.data:
+                    assert_default_types(nvpair)
 
 
 def test_read_ordering():
@@ -204,7 +208,7 @@ def test_load_dataarray1():
     for img in (img1, bimg):
         assert_array_almost_equal(img.darrays[0].data, DATA_FILE1_darr1)
         assert_array_almost_equal(img.darrays[1].data, DATA_FILE1_darr2)
-        me = img.darrays[0].meta.metadata
+        me = img.darrays[0].meta
         assert 'AnatomicalStructurePrimary' in me
         assert 'AnatomicalStructureSecondary' in me
         me['AnatomicalStructurePrimary'] == 'CortexLeft'
@@ -301,14 +305,13 @@ def test_modify_darray():
 
 def test_write_newmetadata():
     img = gi.GiftiImage()
-    attr = gi.GiftiNVPairs(name='mykey', value='val1')
-    newmeta = gi.GiftiMetaData(attr)
+    newmeta = gi.GiftiMetaData(mykey='val1')
     img.meta = newmeta
-    myme = img.meta.metadata
+    myme = img.meta
     assert 'mykey' in myme
-    newmeta = gi.GiftiMetaData.from_dict({'mykey1': 'val2'})
+    newmeta = gi.GiftiMetaData({'mykey1': 'val2'})
     img.meta = newmeta
-    myme = img.meta.metadata
+    myme = img.meta
     assert 'mykey1' in myme
     assert 'mykey' not in myme