TST+BF: fix up duplicate test names; extend tests

Fix up a couple of duplicate test names.

Remove test of setting string to DataArray - it's not allowed in the
spec.

Add tests for dataarray initialization.

Author: matthew-brett

nibabel/gifti/tests/test_gifti.py

@@ -1,13 +1,15 @@
 """ Testing gifti objects
 """
 import warnings
+import sys
 
 import numpy as np
 
 import nibabel as nib
 from nibabel.externals.six import string_types
 from nibabel.gifti import (GiftiImage, GiftiDataArray, GiftiLabel,
-                           GiftiLabelTable, GiftiMetaData, GiftiNVPairs)
+                           GiftiLabelTable, GiftiMetaData, GiftiNVPairs,
+                           GiftiCoordSystem)
 from nibabel.gifti.gifti import data_tag
 from nibabel.nifti1 import data_type_codes
 
@@ -24,6 +26,8 @@ def test_gifti_image():
     # arguments.
     gi = GiftiImage()
     assert_equal(gi.darrays, [])
+    assert_equal(gi.meta.metadata, {})
+    assert_equal(gi.labeltable.labels, [])
     arr = np.zeros((2, 3))
     gi.darrays.append(arr)
     # Now check we didn't overwrite the default arg
@@ -45,13 +49,6 @@ def test_gifti_image():
     gi.remove_gifti_data_array(0)
     assert_equal(gi.numDA, 0)
 
-    # Test from string
-    da = GiftiDataArray.from_array('zzzzz')
-    gi.add_gifti_data_array(da)
-    assert_equal(gi.numDA, 1)
-    assert_array_equal(gi.darrays[0].data, data)
-
-
     # Remove from empty
     gi = GiftiImage()
     gi.remove_gifti_data_array_by_intent(0)
@@ -69,7 +66,93 @@ def test_gifti_image():
     assert_equal(gi.numDA, 0)
 
 
-def test_dataarray():
+def test_gifti_image_bad_inputs():
+    img = GiftiImage()
+    # Try to set a non-data-array
+    assert_raises(TypeError, img.add_gifti_data_array, 'not-a-data-array')
+
+    # Try to set to non-table
+    def assign_labeltable(val):
+        img.labeltable = val
+    assert_raises(TypeError, assign_labeltable, 'not-a-table')
+
+    # Try to set to non-table
+    def assign_metadata(val):
+        img.meta = val
+    assert_raises(TypeError, assign_metadata, 'not-a-meta')
+
+
+def test_dataarray_empty():
+    # Test default initialization of DataArray
+    null_da = GiftiDataArray()
+    assert_equal(null_da.data, None)
+    assert_equal(null_da.intent, 0)
+    assert_equal(null_da.datatype, 0)
+    assert_equal(null_da.encoding, 3)
+    assert_equal(null_da.endian, 2 if sys.byteorder == 'little' else 1)
+    assert_equal(null_da.coordsys.dataspace, 0)
+    assert_equal(null_da.coordsys.xformspace, 0)
+    assert_array_equal(null_da.coordsys.xform, np.eye(4))
+    assert_equal(null_da.ind_ord, 1)
+    assert_equal(null_da.meta.metadata, {})
+    assert_equal(null_da.ext_fname, '')
+    assert_equal(null_da.ext_offset, 0)
+
+
+def test_dataarray_init():
+    # Test non-default dataarray initialization
+    gda = GiftiDataArray  # shortcut
+    assert_equal(gda(None).data, None)
+    arr = np.arange(12, dtype=np.float32).reshape((3, 4))
+    assert_array_equal(gda(arr).data, arr)
+    # Intents
+    assert_raises(KeyError, gda, intent=1)  # Invalid code
+    assert_raises(KeyError, gda, intent='not an intent')  # Invalid string
+    assert_equal(gda(intent=2).intent, 2)
+    assert_equal(gda(intent='correlation').intent, 2)
+    assert_equal(gda(intent='NIFTI_INTENT_CORREL').intent, 2)
+    # Datatype
+    assert_equal(gda(datatype=2).datatype, 2)
+    assert_equal(gda(datatype='uint8').datatype, 2)
+    assert_raises(KeyError, gda, datatype='not_datatype')
+    # Float32 datatype comes from array if datatype not set
+    assert_equal(gda(arr).datatype, 16)
+    # Can be overriden by init
+    assert_equal(gda(arr, datatype='uint8').datatype, 2)
+    # Encoding
+    assert_equal(gda(encoding=1).encoding, 1)
+    assert_equal(gda(encoding='ASCII').encoding, 1)
+    assert_equal(gda(encoding='GIFTI_ENCODING_ASCII').encoding, 1)
+    assert_raises(KeyError, gda, encoding='not an encoding')
+    # Endian
+    assert_equal(gda(endian=1).endian, 1)
+    assert_equal(gda(endian='big').endian, 1)
+    assert_equal(gda(endian='GIFTI_ENDIAN_BIG').endian, 1)
+    assert_raises(KeyError, gda, endian='not endian code')
+    # CoordSys
+    aff = np.diag([2, 3, 4, 1])
+    cs = GiftiCoordSystem(1, 2, aff)
+    da = gda(coordsys=cs)
+    assert_equal(da.coordsys.dataspace, 1)
+    assert_equal(da.coordsys.xformspace, 2)
+    assert_array_equal(da.coordsys.xform, aff)
+    # Ordering
+    assert_equal(gda(ordering=2).ind_ord, 2)
+    assert_equal(gda(ordering='F').ind_ord, 2)
+    assert_equal(gda(ordering='ColumnMajorOrder').ind_ord, 2)
+    assert_raises(KeyError, gda, ordering='not an ordering')
+    # metadata
+    meta_dict=dict(one=1, two=2)
+    assert_equal(gda(meta=GiftiMetaData.from_dict(meta_dict)).meta.metadata,
+                 meta_dict)
+    assert_equal(gda(meta=meta_dict).meta.metadata, meta_dict)
+    assert_equal(gda(meta=None).meta.metadata, {})
+    # ext_fname and ext_offset
+    assert_equal(gda(ext_fname='foo').ext_fname, 'foo')
+    assert_equal(gda(ext_offset=12).ext_offset, 12)
+
+
+def test_dataarray_from_array():
     for dt_code in data_type_codes.value_set():
         data_type = data_type_codes.type[dt_code]
         if data_type is np.void:  # not supported
@@ -104,25 +187,16 @@ def test_labeltable():
 
 
 def test_metadata():
+    nvpair = GiftiNVPairs('key', 'value')
+    da = GiftiMetaData(nvpair=nvpair)
+    assert_equal(da.data[0].name, 'key')
+    assert_equal(da.data[0].value, 'value')
     # Test deprecation
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('always', category=DeprecationWarning)
         assert_equal(len(GiftiDataArray().get_metadata()), 0)
         assert_equal(len(w), 1)
 
-    # Test deprecation
-    with clear_and_catch_warnings() as w:
-        warnings.filterwarnings('once', category=DeprecationWarning)
-        assert_equal(len(GiftiMetaData().get_metadata()), 0)
-        assert_equal(len(w), 1)
-
-
-def test_metadata():
-    nvpair = GiftiNVPairs('key', 'value')
-    da = GiftiMetaData(nvpair=nvpair)
-    assert_equal(da.data[0].name, 'key')
-    assert_equal(da.data[0].value, 'value')
-
 
 def test_gifti_label_rgba():
     rgba = np.random.rand(4)
@@ -177,26 +251,6 @@ def test_gifti_coord():
     gcs.to_xml()
 
 
-def test_gifti_image():
-    img = GiftiImage()
-    assert_true(img.darrays is not None)
-    assert_true(img.meta is not None)
-    assert_true(img.labeltable is not None)
-
-    # Try to set a non-data-array
-    assert_raises(TypeError, img.add_gifti_data_array, 'not-a-data-array')
-
-    # Try to set to non-table
-    def assign_labeltable(val):
-        img.labeltable = val
-    assert_raises(TypeError, assign_labeltable, 'not-a-table')
-
-    # Try to set to non-table
-    def assign_metadata(val):
-        img.meta = val
-    assert_raises(TypeError, assign_metadata, 'not-a-meta')
-
-
 def test_data_tag_deprecated():
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('once', category=DeprecationWarning)