Refactored TRK file. Removed unnecessary classmethod in TractogramFile

Author: MarcCote

nibabel/streamlines/tests/test_streamlines.py

@@ -85,15 +85,15 @@ def test_is_supported_detect_format():
     # Valid file without extension
     for tfile_cls in nib.streamlines.FORMATS.values():
         f = BytesIO()
-        f.write(tfile_cls.get_magic_number())
+        f.write(tfile_cls.MAGIC_NUMBER)
         f.seek(0, os.SEEK_SET)
         assert_true(nib.streamlines.is_supported(f))
         assert_true(nib.streamlines.detect_format(f) is tfile_cls)
 
     # Wrong extension but right magic number
     for tfile_cls in nib.streamlines.FORMATS.values():
         with tempfile.TemporaryFile(mode="w+b", suffix=".txt") as f:
-            f.write(tfile_cls.get_magic_number())
+            f.write(tfile_cls.MAGIC_NUMBER)
             f.seek(0, os.SEEK_SET)
             assert_true(nib.streamlines.is_supported(f))
             assert_true(nib.streamlines.detect_format(f) is tfile_cls)
@@ -169,11 +169,12 @@ def test_load_complex_file(self):
 
                 tractogram = Tractogram(DATA['streamlines'])
 
-                if tfile.support_data_per_point():
+                if tfile.SUPPORTS_DATA_PER_POINT:
                     tractogram.data_per_point = DATA['data_per_point']
 
-                if tfile.support_data_per_streamline():
-                    tractogram.data_per_streamline = DATA['data_per_streamline']
+                if tfile.SUPPORTS_DATA_PER_STREAMLINE:
+                    data = DATA['data_per_streamline']
+                    tractogram.data_per_streamline = data
 
                 assert_tractogram_equal(tfile.tractogram,
                                         tractogram)
@@ -236,18 +237,19 @@ def test_save_complex_file(self):
                     # If streamlines format does not support saving data
                     # per point or data per streamline, a warning message
                     # should be issued.
-                    if not (cls.support_data_per_point() and
-                            cls.support_data_per_streamline()):
+                    if not (cls.SUPPORTS_DATA_PER_POINT and
+                            cls.SUPPORTS_DATA_PER_STREAMLINE):
                         assert_equal(len(w), 1)
                         assert_true(issubclass(w[0].category, Warning))
 
                     tractogram = Tractogram(DATA['streamlines'])
 
-                    if cls.support_data_per_point():
+                    if cls.SUPPORTS_DATA_PER_POINT:
                         tractogram.data_per_point = DATA['data_per_point']
 
-                    if cls.support_data_per_streamline():
-                        tractogram.data_per_streamline = DATA['data_per_streamline']
+                    if cls.SUPPORTS_DATA_PER_STREAMLINE:
+                        data = DATA['data_per_streamline']
+                        tractogram.data_per_streamline = data
 
                     tfile = nib.streamlines.load(filename, lazy_load=False)
                     assert_tractogram_equal(tfile.tractogram, tractogram)

nibabel/streamlines/tests/test_tractogram_file.py

@@ -8,18 +8,6 @@ def test_subclassing_tractogram_file():
 
     # Missing 'save' method
     class DummyTractogramFile(TractogramFile):
-        @classmethod
-        def get_magic_number(cls):
-            return False
-
-        @classmethod
-        def support_data_per_point(cls):
-            return False
-
-        @classmethod
-        def support_data_per_streamline(cls):
-            return False
-
         @classmethod
         def is_correct_format(cls, fileobj):
             return False
@@ -32,18 +20,6 @@ def load(cls, fileobj, lazy_load=True):
 
     # Missing 'load' method
     class DummyTractogramFile(TractogramFile):
-        @classmethod
-        def get_magic_number(cls):
-            return False
-
-        @classmethod
-        def support_data_per_point(cls):
-            return False
-
-        @classmethod
-        def support_data_per_streamline(cls):
-            return False
-
         @classmethod
         def is_correct_format(cls, fileobj):
             return False
@@ -55,26 +31,11 @@ def save(self, fileobj):
 
 
 def test_tractogram_file():
-    assert_raises(NotImplementedError, TractogramFile.get_magic_number)
     assert_raises(NotImplementedError, TractogramFile.is_correct_format, "")
-    assert_raises(NotImplementedError, TractogramFile.support_data_per_point)
-    assert_raises(NotImplementedError, TractogramFile.support_data_per_streamline)
     assert_raises(NotImplementedError, TractogramFile.load, "")
 
     # Testing calling the 'save' method of `TractogramFile` object.
     class DummyTractogramFile(TractogramFile):
-        @classmethod
-        def get_magic_number(cls):
-            return False
-
-        @classmethod
-        def support_data_per_point(cls):
-            return False
-
-        @classmethod
-        def support_data_per_streamline(cls):
-            return False
-
         @classmethod
         def is_correct_format(cls, fileobj):
             return False

nibabel/streamlines/tests/test_trk.py

@@ -6,7 +6,7 @@
 from nibabel.externals.six import BytesIO
 
 from nibabel.testing import suppress_warnings, clear_and_catch_warnings
-from nibabel.testing import assert_arrays_equal, check_iteration
+from nibabel.testing import assert_arrays_equal
 from nose.tools import assert_equal, assert_raises, assert_true
 from numpy.testing import assert_array_equal
 
@@ -431,13 +431,3 @@ def test_write_scalars_and_properties_name_too_long(self):
     def test_str(self):
         trk = TrkFile.load(self.complex_trk_filename)
         str(trk)  # Simply test it's not failing when called.
-
-    def test_read_buffer_size(self):
-        tmp = TrkFile.READ_BUFFER_SIZE
-        TrkFile.READ_BUFFER_SIZE = 1
-
-        for lazy_load in [False, True]:
-            trk = TrkFile.load(self.complex_trk_filename, lazy_load=lazy_load)
-            assert_tractogram_equal(trk.tractogram, self.complex_tractogram)
-
-        TrkFile.READ_BUFFER_SIZE = tmp

nibabel/streamlines/tractogram_file.py

@@ -64,21 +64,6 @@ def get_affine(self):
         """ Returns vox -> rasmm affine. """
         return self.affine
 
-    @abstractclassmethod
-    def get_magic_number(cls):
-        """ Returns streamlines file's magic number. """
-        raise NotImplementedError()
-
-    @abstractclassmethod
-    def support_data_per_point(cls):
-        """ Tells if this format supports saving data per point. """
-        raise NotImplementedError()
-
-    @abstractclassmethod
-    def support_data_per_streamline(cls):
-        """ Tells if this format supports saving data per streamline. """
-        raise NotImplementedError()
-
     @abstractclassmethod
     def is_correct_format(cls, fileobj):
         """ Checks if the file has the right streamlines file format.