TEST: Do not directly import unittest TestCases to avoid duplicating tests

Author: effigies

nibabel/cifti2/tests/test_cifti2io_header.py

@@ -18,7 +18,7 @@
 
 from nibabel.tmpdirs import InTemporaryDirectory
 from nibabel.tests.nibabel_data import get_nibabel_data, needs_nibabel_data
-from nibabel.tests.test_nifti2 import TestNifti2SingleHeader
+from nibabel.tests import test_nifti2 as tn2
 
 from numpy.testing import assert_array_almost_equal
 import pytest
@@ -405,7 +405,7 @@ def test_read_labels():
             assert named_map.label_table[index].rgba == rgba
 
 
-class TestCifti2SingleHeader(TestNifti2SingleHeader):
+class TestCifti2SingleHeader(tn2.TestNifti2SingleHeader):
     header_class = _Cifti2AsNiftiHeader
     _pixdim_message = 'pixdim[1,2,3] should be zero or positive'
 

nibabel/freesurfer/tests/test_mghformat.py

@@ -31,7 +31,7 @@
 from ...testing import data_path
 
 from ...tests import test_spatialimages as tsi
-from ...tests.test_wrapstruct import _TestLabeledWrapStruct
+from ...tests import test_wrapstruct as tws
 
 MGZ_FNAME = os.path.join(data_path, 'test.mgz')
 
@@ -395,7 +395,7 @@ def check_dtypes(self, expected, actual):
         assert expected.newbyteorder('>') == actual
 
 
-class TestMGHHeader(_TestLabeledWrapStruct):
+class TestMGHHeader(tws._TestLabeledWrapStruct):
     header_class = MGHHeader
 
     def _set_something_into_hdr(self, hdr):

nibabel/tests/test_analyze.py

@@ -38,7 +38,7 @@
 from ..testing import (data_path, suppress_warnings, assert_dt_equal,
                        bytesio_filemap, bytesio_round_trip)
 
-from .test_wrapstruct import _TestLabeledWrapStruct
+from . import test_wrapstruct as tws
 from . import test_spatialimages as tsi
 
 HAVE_ZSTD = optional_package("pyzstd")[1]
@@ -56,7 +56,7 @@ def add_intp(supported_np_types):
             supported_np_types.add(np_type)
 
 
-class TestAnalyzeHeader(_TestLabeledWrapStruct):
+class TestAnalyzeHeader(tws._TestLabeledWrapStruct):
     header_class = AnalyzeHeader
     example_file = header_file
     sizeof_hdr = AnalyzeHeader.sizeof_hdr

nibabel/tests/test_ecat.py

@@ -24,13 +24,13 @@
 from ..testing import data_path, suppress_warnings
 from ..tmpdirs import InTemporaryDirectory
 
-from .test_wrapstruct import _TestWrapStructBase
+from . import test_wrapstruct as tws
 from .test_fileslice import slicer_samples
 
 ecat_file = os.path.join(data_path, 'tinypet.v')
 
 
-class TestEcatHeader(_TestWrapStructBase):
+class TestEcatHeader(tws._TestWrapStructBase):
     header_class = EcatHeader
     example_file = ecat_file
 

nibabel/tests/test_nifti2.py

@@ -16,8 +16,7 @@
                       Nifti1Extensions)
 from ..nifti2 import (Nifti2Header, Nifti2PairHeader, Nifti2Image, Nifti2Pair)
 
-from .test_nifti1 import (TestNifti1PairHeader, TestNifti1SingleHeader,
-                          TestNifti1Pair, TestNifti1Image, TestNifti1General)
+from . import test_nifti1 as tn1
 
 from numpy.testing import assert_array_equal
 
@@ -59,27 +58,27 @@ def test_eol_check(self):
                 'setting EOL check to 13, 10, 26, 10')
 
 
-class TestNifti2PairHeader(_Nifti2Mixin, TestNifti1PairHeader):
+class TestNifti2PairHeader(_Nifti2Mixin, tn1.TestNifti1PairHeader):
     header_class = Nifti2PairHeader
     example_file = header_file
 
 
-class TestNifti2SingleHeader(_Nifti2Mixin, TestNifti1SingleHeader):
+class TestNifti2SingleHeader(_Nifti2Mixin, tn1.TestNifti1SingleHeader):
     header_class = Nifti2Header
     example_file = header_file
 
 
-class TestNifti2Image(TestNifti1Image):
+class TestNifti2Image(tn1.TestNifti1Image):
     # Run analyze-flavor spatialimage tests
     image_class = Nifti2Image
 
 
-class TestNifti2Pair(TestNifti1Pair):
+class TestNifti2Pair(tn1.TestNifti1Pair):
     # Run analyze-flavor spatialimage tests
     image_class = Nifti2Pair
 
 
-class TestNifti2General(TestNifti1General):
+class TestNifti2General(tn1.TestNifti1General):
     """ Test class to test nifti2 in general
 
     Tests here which mix the pair and the single type, and that should only be