add check for directory label

gdcc · Apr 17, 2024 · c4b40bc · c4b40bc
1 parent 61fc630
commit c4b40bc
Showing 1 changed file with 24 additions and 14 deletions.
diff --git a/tests/integration/test_native_upload.py b/tests/integration/test_native_upload.py
@@ -1,4 +1,5 @@
 from io import BytesIO
+import json
 import tempfile
 
 import pytest
@@ -42,17 +43,18 @@ def test_native_upload(
             )
 
             # Assert
-            expected_files = [
-                "small_file.txt",
-                "mid_file.txt",
-                "large_file.txt",
-            ]
             files = retrieve_dataset_files(
                 dataverse_url=BASE_URL,
                 persistent_id=pid,
                 api_token=API_TOKEN,
             )
 
+            expected_files = [
+                "small_file.txt",
+                "mid_file.txt",
+                "large_file.txt",
+            ]
+
             assert len(files) == 3
             assert sorted([file["label"] for file in files]) == sorted(expected_files)
 
@@ -89,17 +91,18 @@ def test_forced_native_upload(
             )
 
             # Assert
-            expected_files = [
-                "small_file.txt",
-                "mid_file.txt",
-                "large_file.txt",
-            ]
             files = retrieve_dataset_files(
                 dataverse_url=BASE_URL,
                 persistent_id=pid,
                 api_token=API_TOKEN,
             )
 
+            expected_files = [
+                "small_file.txt",
+                "mid_file.txt",
+                "large_file.txt",
+            ]
+
             assert len(files) == 3
             assert sorted([file["label"] for file in files]) == sorted(expected_files)
 
@@ -134,15 +137,22 @@ def test_native_upload_by_handler(
         )
 
         # Assert
-        expected_files = [
-            "file.txt",
-            "biggerfile.txt",
+        expected = [
+            ("", "biggerfile.txt"),
+            ("subdir", "file.txt"),
         ]
+
         files = retrieve_dataset_files(
             dataverse_url=BASE_URL,
             persistent_id=pid,
             api_token=API_TOKEN,
         )
 
         assert len(files) == 2
-        assert sorted([file["label"] for file in files]) == sorted(expected_files)
+
+        for ex_dir, ex_f in expected:
+
+            file = next(file for file in files if file["label"] == ex_f)
+
+            assert file["label"] == ex_f, f"File label does not match for file {json.dumps(file)}"
+            assert file.get("directoryLabel", "") == ex_dir, f"Directory label does not match for file {json.dumps(file)}"