Ask for file_path as parameter of remote fetching functions instead of both dirname and filename

Modify remote fetching test

1 files changed, 33 insertions, 61 deletions

diff --git a/src/python/test/test_remote_datasets.py b/src/python/test/test_remote_datasets.py
index c44ac22b..5d0d397d 100644
--- a/src/python/test/test_remote_datasets.py
+++ b/src/python/test/test_remote_datasets.py
@@ -9,76 +9,48 @@
 
 from gudhi.datasets import remote
 
-import re
 import shutil
 import io
 import sys
 import pytest
 
-from os.path import isfile, isdir, expanduser
-from os import makedirs
+from os.path import isdir, expanduser, exists
+from os import remove
 
-def _check_dir_file_names(path_file_dw, filename, dirname):
-    assert isfile(path_file_dw)
+def test_data_home():
+    # Test get_data_home and clear_data_home on new empty folder
+    empty_data_home = remote.get_data_home(data_home="empty_folder_for_test")
+    assert isdir(empty_data_home)
 
-    names_dw = re.split(r' |/|\\', path_file_dw)
-    # Case where inner directories are created in "test_gudhi_data/"; e.g: "test_gudhi_data/bunny"
-    if len(names_dw) >= 3:
-        for i in range(len(names_dw)-1):
-            assert re.split(r' |/|\\', dirname)[i] == names_dw[i]
-        assert filename == names_dw[i+1]
-    else:
-        assert dirname == names_dw[0]
-        assert filename == names_dw[1]
+    remote.clear_data_home(data_home=empty_data_home)
+    assert not isdir(empty_data_home)
 
-def _check_fetch_output(url, filename, dirname = "test_gudhi_data", file_checksum = None):
-    makedirs(dirname, exist_ok=True)
-    path_file_dw = remote._fetch_remote(url, filename, dirname, file_checksum)
-    _check_dir_file_names(path_file_dw, filename, dirname)
+def test_fetch_remote():
+    # Test fetch with a wrong checksum
+    with pytest.raises(OSError):
+        remote._fetch_remote("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/spiral_2d/spiral_2d.npy", "tmp_spiral_2d.npy", file_checksum = 'XXXXXXXXXX')
+    assert not exists("tmp_spiral_2d.npy")
 
 def _get_bunny_license_print(accept_license = False):
     capturedOutput = io.StringIO()
     # Redirect stdout
     sys.stdout = capturedOutput
 
-    makedirs("test_gudhi_data/bunny", exist_ok=True)
+    bunny_arr = remote.fetch_bunny("./tmp_for_test/bunny.npy", accept_license)
+    assert bunny_arr.shape == (35947, 3)
+    remove("./tmp_for_test/bunny.npy")
 
-    remote._fetch_remote("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/bunny/bunny.npy", "bunny.npy", "test_gudhi_data/bunny",
-                 '13f7842ebb4b45370e50641ff28c88685703efa5faab14edf0bb7d113a965e1b', accept_license)
     # Reset redirect
     sys.stdout = sys.__stdout__
     return capturedOutput
 
-def test_fetch_remote_datasets():
-    # Test fetch with a wrong checksum
-    with pytest.raises(OSError):
-        _check_fetch_output("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/spiral_2d/spiral_2d.npy", "spiral_2d.npy", file_checksum = 'XXXXXXXXXX')
-
-    # Test files download from given urls with checksums provided
-    _check_fetch_output("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/spiral_2d/spiral_2d.npy", "spiral_2d.npy",
-                                file_checksum = '88312ffd6df2e2cb2bde9c0e1f962d7d644c6f58dc369c7b377b298dacdc4eaf')
-
-    _check_fetch_output("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/sphere3D_pts_on_grid.off", "sphere3D_pts_on_grid.off",
-                                file_checksum = '32f96d2cafb1177f0dd5e0a019b6ff5658e14a619a7815ae55ad0fc5e8bd3f88')
-
-    # Test files download from given urls without checksums
-    _check_fetch_output("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/spiral_2d/spiral_2d.npy", "spiral_2d.npy")
-
-    _check_fetch_output("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/sphere3D_pts_on_grid.off", "sphere3D_pts_on_grid.off")
-
-    # Test printing existing LICENSE file when fetching bunny.npy with accept_license = False (default)
-    # Fetch LICENSE file
-    makedirs("test_gudhi_data/bunny", exist_ok=True)
-    remote._fetch_remote("https://raw.githubusercontent.com/GUDHI/gudhi-data/main/points/bunny/LICENSE", "LICENSE", "test_gudhi_data/bunny",
-                 'b763dbe1b2fc6015d05cbf7bcc686412a2eb100a1f2220296e3b4a644c69633a')
-    with open("test_gudhi_data/bunny/LICENSE") as f:
-        assert f.read().rstrip("\n") == _get_bunny_license_print().getvalue().rstrip("\n")
-
+def test_print_bunny_license():
     # Test not printing bunny.npy LICENSE when accept_license = True
     assert "" == _get_bunny_license_print(accept_license = True).getvalue()
-
-    # Remove "test_gudhi_data" directory and all its content
-    shutil.rmtree("test_gudhi_data")
+    # Test printing bunny.LICENSE file when fetching bunny.npy with accept_license = False (default)
+    with open("./tmp_for_test/bunny.LICENSE") as f:
+        assert f.read().rstrip("\n") == _get_bunny_license_print().getvalue().rstrip("\n")
+    shutil.rmtree("./tmp_for_test")
 
 def test_fetch_remote_datasets_wrapped():
     # Check if gudhi_data default dir exists already
@@ -93,27 +65,27 @@ def test_fetch_remote_datasets_wrapped():
 
     # Check that default dir was created
     assert isdir(expanduser("~/gudhi_data"))
+    # Check downloaded files
+    assert exists(expanduser("~/gudhi_data/points/spiral_2d/spiral_2d.npy"))
+    assert exists(expanduser("~/gudhi_data/points/bunny/bunny.npy"))
+    assert exists(expanduser("~/gudhi_data/points/bunny/bunny.LICENSE"))
 
     # Test fetch_spiral_2d and fetch_bunny wrapping functions with data directory different from default
-    spiral_2d_arr = remote.fetch_spiral_2d(dirname = "./another_fetch_folder_for_test")
+    spiral_2d_arr = remote.fetch_spiral_2d("./another_fetch_folder_for_test/spiral_2d.npy")
     assert spiral_2d_arr.shape == (114562, 2)
 
-    bunny_arr = remote.fetch_bunny(dirname = "./another_fetch_folder_for_test")
+    bunny_arr = remote.fetch_bunny("./another_fetch_folder_for_test/bunny.npy")
     assert bunny_arr.shape == (35947, 3)
 
-    assert isdir(expanduser("./another_fetch_folder_for_test"))
+    assert isdir("./another_fetch_folder_for_test")
+    # Check downloaded files
+    assert exists("./another_fetch_folder_for_test/spiral_2d.npy")
+    assert exists("./another_fetch_folder_for_test/bunny.npy")
+    assert exists("./another_fetch_folder_for_test/bunny.LICENSE")
 
     # Remove test folders
     del spiral_2d_arr
     del bunny_arr
     if to_be_removed:
         shutil.rmtree(expanduser("~/gudhi_data"))
-    shutil.rmtree(expanduser("./another_fetch_folder_for_test"))
-
-def test_data_home():
-    # Test get_data_home and clear_data_home on new empty folder
-    empty_data_home = remote.get_data_home(data_home="empty_folder_for_test")
-    assert isdir(empty_data_home)
-
-    remote.clear_data_home(data_home=empty_data_home)
-    assert not isdir(empty_data_home)
+    shutil.rmtree("./another_fetch_folder_for_test")