From ae8b4388af34dd170050426b602a83d0104f41c1 Mon Sep 17 00:00:00 2001
From: Leonid Andreev <leonid@hmdc.harvard.edu>
Date: Wed, 24 May 2023 14:47:57 -0400
Subject: [PATCH] A better test for the persistent id. #8889

---
 src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
index 0b9ae8a77d4..52a6b28b324 100644
--- a/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
+++ b/src/test/java/edu/harvard/iq/dataverse/api/FilesIT.java
@@ -13,6 +13,7 @@
 import static edu.harvard.iq.dataverse.api.AccessIT.apiToken;
 import edu.harvard.iq.dataverse.settings.SettingsServiceBean;
 import edu.harvard.iq.dataverse.util.BundleUtil;
+import edu.harvard.iq.dataverse.util.StringUtil;
 import edu.harvard.iq.dataverse.util.SystemConfig;
 import java.io.File;
 import java.io.IOException;
@@ -2019,6 +2020,8 @@ public void testDeleteFile() {
                 .statusCode(OK.getStatusCode());
     }
     
+    // The following specifically tests file-level PIDs configuration in 
+    // individual collections (#8889/#9614)
     @Test
     public void testFilePIDsBehavior() {
         // Create user
@@ -2057,7 +2060,8 @@ public void testFilePIDsBehavior() {
         String fileInfoResponseString = fileInfoResponse.body().asString();
         msg(fileInfoResponseString);
         
-        assertNotNull(JsonPath.from(fileInfoResponseString).getString("data.dataFile.persistentId"));
+        String origFilePersistentId = JsonPath.from(fileInfoResponseString).getString("data.dataFile.persistentId");
+        assertTrue("The file did not get a persistent identifier assigned (check that file PIDs are enabled instance-wide!)", StringUtil.nonEmpty(origFilePersistentId));
 
         // Now change the file PIDs registration configuration for the collection: