Test identifier updates for -fileUpload suffix revert

Author: cnathe

src/org/labkey/test/components/ui/entities/EntityBulkUpdateDialog.java

@@ -245,7 +245,8 @@ public String getDateField(CharSequence fieldIdentifier)
      */
     public FileAttachmentContainer getFileField(CharSequence fieldIdentifier)
     {
-        return enableAndWait(fieldIdentifier, elementCache().fileUploadField(fieldIdentifier));
+        String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString());
+        return enableAndWait(identifier, elementCache().fileUploadField(identifier));
     }
 
     /**
@@ -271,7 +272,8 @@ public EntityBulkUpdateDialog removeFile(CharSequence fieldIdentifier)
 
     public FileUploadField getExistingFileField(String fieldIdentifier)
     {
-        return enableAndWait(fieldIdentifier, elementCache().fileField(fieldIdentifier));
+        String identifier = FileAttachmentContainer.fileUploadIdentifier(fieldIdentifier.toString());
+        return enableAndWait(identifier, elementCache().fileField(identifier));
     }
 
     /**

src/org/labkey/test/components/ui/files/FileAttachmentContainer.java

@@ -195,6 +195,10 @@ protected class ElementCache extends Component<?>.ElementCache
         public Locator fileUploadScrollFooterLoc = Locator.tagWithClass("div", "file-upload__scroll-footer");
     }
 
+    public static String fileUploadIdentifier(String fieldIdentifier)
+    {
+        return fieldIdentifier + "-fileUpload"; // Issue 53394
+    }
 
     public static class FileAttachmentContainerFinder extends WebDriverComponentFinder<FileAttachmentContainer, FileAttachmentContainerFinder>
     {