Fix tests

MIPLabCH · Apr 18, 2023 · 09a74bd · 09a74bd
1 parent 520f78e
commit 09a74bd
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 10 deletions.
diff --git a/nigsp/io.py b/nigsp/io.py
@@ -408,10 +408,7 @@ def export_nifti(data, img, fname):
             "Please see install instructions."
         )
 
-    for e in EXT_NIFTI:
-        has_ext, fname, ext = check_ext(e, fname, remove=True)
-        if has_ext:
-            break
+    has_ext, fname, ext = check_ext(EXT_NIFTI, fname, remove=True)
 
     if ext is None:
         ext = ".nii.gz"
@@ -452,7 +449,7 @@ def export_txt(data, fname, ext=None):
         else:
             ext = ext_check
     else:
-        if ext_check is None:
+        if ext is None:
             LGR.warning("Extension not specified. Forcing export in TSV.GZ format.")
             ext = ".tsv.gz"
 

diff --git a/nigsp/tests/test_blocks.py b/nigsp/tests/test_blocks.py
@@ -70,14 +70,14 @@ def test_export_metrics_nifti(sc_mtx, atlas, sdi, testdir):
     scgraph = SCGraph(mtx, ts, atlas=atlas_in, sdi=sdi_in)
     blocks.export_metric(scgraph, ".nii.gz", join(testdir, "molly_"))
 
-    assert isfile(join(testdir, "molly_sdi.tsv"))
+    assert isfile(join(testdir, "molly_sdi.tsv.gz"))
 
     sys.modules["nibabel"] = None
     scgraph = SCGraph(mtx, ts, atlas=atlas_in, img=img, sdi=sdi_in)
     blocks.export_metric(scgraph, ".nii.gz", join(testdir, "molly_"))
     sys.modules["nibabel"] = nibabel
 
-    assert isfile(join(testdir, "molly_sdi.tsv"))
+    assert isfile(join(testdir, "molly_sdi.tsv.gz"))
     shutil.rmtree(testdir)
     remove(sc_mtx)
     remove(atlas)

diff --git a/nigsp/tests/test_io.py b/nigsp/tests/test_io.py
@@ -48,7 +48,7 @@ def test_check_ext():
 
         assert has_ext is False
         assert fname_out == fname
-        assert ext_out == ""
+        assert ext_out == None
 
 
 @mark.parametrize("data", [(rand(3, 4)), (rand(3, 4, 1)), (rand(3, 1, 4))])
@@ -135,7 +135,7 @@ def test_export_nifti(atlas):
         (".1D", ".1D"),
         (".csv", ".csv"),
         (".tsv", ".tsv"),
-        ("", ".csv"),
+        ("", ".tsv.gz"),
         (".mat", ".mat"),
     ],
 )
@@ -147,7 +147,7 @@ def test_export_mtx(ext_in, ext_out):
 
     if ext_out in [".csv"]:
         data_in = genfromtxt(f"serenity{ext_out}", delimiter=",")
-    if ext_out in [".tsv", ".1D"]:
+    if ext_out in [".tsv", ".tsv.gz", ".1D"]:
         data_in = genfromtxt(f"serenity{ext_out}")
 
     if ext_out in [".mat"]: