Test updates

Author: labkey-nicka

api/src/org/labkey/api/data/AbstractFileDisplayColumn.java

@@ -286,7 +286,7 @@ public void renderInputHtml(RenderContext ctx, HtmlWriter out, Object value)
             if (null != filename)
             {
                 // Existing value, so tell the user the file name, allow the file to be removed, and a new file uploaded
-                renderThumbnailAndRemoveLink(out, ctx, formFieldName, filename, value, input);
+                renderThumbnailAndRemoveLink(out, ctx, getBoundColumn(), filename, value, input);
             }
             else
             {
@@ -307,14 +307,14 @@ protected String getRemovalWarningText(String filename)
         return "Previous file " + filename + " will be removed.";
     }
 
-    private void renderThumbnailAndRemoveLink(HtmlWriter out, RenderContext ctx, String fieldName, String filename, Object value, InputBuilder<?> filePicker)
+    private void renderThumbnailAndRemoveLink(HtmlWriter out, RenderContext ctx, ColumnInfo column, String filename, Object value, InputBuilder<?> filePicker)
     {
         String divId = GUID.makeGUID();
         String linkId = "remove" + divId;
 
         DIV(
             id(divId)
-                .data("fieldName", fieldName)
+                .data("fieldName", column.getName())
                 .cl("lk-remove-file"),
             (Renderable) ret -> {
                 renderIconAndFilename(ctx, out, value instanceof String s ? s : filename, false, false);

assay/test/src/org/labkey/test/tests/assay/AssayReimportIndexTest.java

@@ -166,8 +166,8 @@ public void testFileFieldValuesRetainedRunReimport()
         var row = new AssayRunsPage(getDriver())
             .getTable()
             .getRowDataAsMap("Name", runName);
-        reimportBatchFileValue = StringUtils.trimToNull(row.get("Batch/" + BATCH_FILE_FIELD.getName()));
-        reimportRunFileValue = StringUtils.trimToNull(row.get(RUN_FILE_FIELD.getName()));
+        reimportBatchFileValue = StringUtils.trimToNull(row.get("Batch/" + BATCH_FILE_FIELD.getFieldKey()));
+        reimportRunFileValue = StringUtils.trimToNull(row.get(RUN_FILE_FIELD.getFieldKey().toString()));
 
         checker().verifyEquals("Expected batch file to appear in data", batchFile.getName(), reimportBatchFileValue);
         checker().verifyEquals("Expected run file to appear in data", runFile.getName(), reimportRunFileValue);