Add tests for rgba, clean code.

Author: Ben Cipollini

nibabel/gifti/gifti.py

@@ -153,11 +153,7 @@ def rgba(self, rgba):
         """
         if len(rgba) != 4:
             raise ValueError('rgba must be length 4.')
-        self.red = rgba[0]
-        self.green = rgba[1]
-        self.blue = rgba[2]
-        self.alpha = rgba[3]
-
+        self.red, self.green, self.blue, self.alpha = rgba
 
 def _arr2txt(arr, elem_fmt):
     arr = np.asarray(arr)
@@ -438,7 +434,7 @@ def meta(self, meta):
         if not isinstance(meta, GiftiMetaData):
             raise ValueError("Not a valid GiftiMetaData instance")
         self._meta = meta
- 
+
     @np.deprecate_with_doc("Use the gifti_img.labeltable property instead.")
     def set_metadata(self, meta):
         self.meta = meta

nibabel/gifti/tests/test_gifti.py

@@ -4,14 +4,13 @@
 
 import numpy as np
 
-from .. import giftiio as gi
 from ..gifti import (GiftiImage, GiftiDataArray, GiftiLabel, GiftiLabelTable,
                      GiftiMetaData)
 from ...nifti1 import data_type_codes, intent_codes
 
 from numpy.testing import (assert_array_almost_equal,
                            assert_array_equal)
-from nose.tools import assert_true, assert_equal, assert_raises
+from nose.tools import (assert_true, assert_false, assert_equal, assert_raises)
 from ...testing import clear_and_catch_warnings
 
 
@@ -100,25 +99,31 @@ def test_gifti_label_rgba():
     rgba = np.random.rand(4)
     kwargs = dict(zip(['red', 'green', 'blue', 'alpha'], rgba))
 
-    gl = GiftiLabel(**kwargs)
-    assert_equal(kwargs['red'], gl.rgba[0])
-    assert_equal(kwargs['green'], gl.rgba[1])
-    assert_equal(kwargs['blue'], gl.rgba[2])
-    assert_equal(kwargs['alpha'], gl.rgba[3])
+    gl1 = GiftiLabel(**kwargs)
+    assert_array_equal(rgba, gl1.rgba)
 
-    gl = GiftiLabel()
-    gl.rgba = rgba
-    assert_equal(kwargs['red'], gl.rgba[0])
-    assert_equal(kwargs['green'], gl.rgba[1])
-    assert_equal(kwargs['blue'], gl.rgba[2])
-    assert_equal(kwargs['alpha'], gl.rgba[3])
+    gl1.red = 2 * gl1.red
+    assert_false(np.allclose(rgba, gl1.rgba))  # don't just store the list!
 
-    def assign_rgba(val):
+    gl2 = GiftiLabel()
+    gl2.rgba = rgba
+    assert_array_equal(rgba, gl2.rgba)
+
+    gl2.blue = 2 * gl2.blue
+    assert_false(np.allclose(rgba, gl2.rgba))  # don't just store the list!
+
+    def assign_rgba(gl, val):
         gl.rgba = val
-    assert_raises(ValueError, assign_rgba, rgba[:2])
-    assert_raises(ValueError, assign_rgba, rgba.tolist() + rgba.tolist())
+    gl3 = GiftiLabel(**kwargs)
+    assert_raises(ValueError, assign_rgba, gl3, rgba[:2])
+    assert_raises(ValueError, assign_rgba, gl3, rgba.tolist() + rgba.tolist())
 
     # Test deprecation
     with clear_and_catch_warnings() as w:
         warnings.filterwarnings('once', category=DeprecationWarning)
-        assert_equal(kwargs['red'], gl.get_rgba()[0])
+        assert_equal(kwargs['red'], gl3.get_rgba()[0])
+
+    # Test default value
+    gl4 = GiftiLabel()
+    assert_equal(len(gl4.rgba), 4)
+    assert_true(np.all([elem is None for elem in gl4.rgba]))

nibabel/gifti/tests/test_giftiio.py

@@ -41,8 +41,8 @@
 DATA_FILE6 = pjoin(IO_DATA_PATH, 'rh.aparc.annot.gii')
 
 datafiles = [DATA_FILE1, DATA_FILE2, DATA_FILE3, DATA_FILE4, DATA_FILE5, DATA_FILE6]
-numda = [2, 1, 1, 1, 2, 1]
- 
+numDA = [2, 1, 1, 1, 2, 1]
+
 DATA_FILE1_darr1 = np.array(
        [[-16.07201 , -66.187515,  21.266994],
        [-16.705893, -66.054337,  21.232786],
@@ -113,7 +113,7 @@ def test_load_metadata():
     for i, dat in enumerate(datafiles):
         img = gi.read(dat)
         me = img.meta
-        assert_equal(numda[i], img.numDA)
+        assert_equal(numDA[i], img.numDA)
         assert_equal(img.version,'1.0')