From c56d27f424c68f9639366b3a991dd6bce8ca7359 Mon Sep 17 00:00:00 2001 From: XingY Date: Tue, 14 Oct 2025 18:35:11 -0700 Subject: [PATCH 1/3] Issue 54062: Strip folder name from displayed name a file field --- src/org/labkey/test/tests/AttachmentFieldTest.java | 4 ++-- .../labkey/test/tests/FileAttachmentColumnTest.java | 4 ++-- src/org/labkey/test/tests/InlineImagesAssayTest.java | 11 ++++------- .../tests/core/admin/AllowedFileExtensionTest.java | 2 +- 4 files changed, 9 insertions(+), 12 deletions(-) diff --git a/src/org/labkey/test/tests/AttachmentFieldTest.java b/src/org/labkey/test/tests/AttachmentFieldTest.java index 6ccf85af4b..dfe316e6f7 100644 --- a/src/org/labkey/test/tests/AttachmentFieldTest.java +++ b/src/org/labkey/test/tests/AttachmentFieldTest.java @@ -91,9 +91,9 @@ public void testFileFieldInSampleType() clickAndWait(Locator.tagWithText("a", "S1")); clickAndWait(Locator.tagWithClass("a", "labkey-text-link").withText("edit")); - waitForElement(Locator.tagContainingText("div", "sampletype/jpg_sample.jpg")); + waitForElement(Locator.tagContainingText("div", "jpg_sample.jpg")); // Issue 53200: Update form incorrectly shows that a file is not available - assertTextNotPresent("sampletype/jpg_sample.jpg (unavailable)"); + assertTextNotPresent("jpg_sample.jpg (unavailable)"); clickButton("Cancel"); log("Verifying view in browser works"); diff --git a/src/org/labkey/test/tests/FileAttachmentColumnTest.java b/src/org/labkey/test/tests/FileAttachmentColumnTest.java index ca935d5f8c..6a2f817e01 100644 --- a/src/org/labkey/test/tests/FileAttachmentColumnTest.java +++ b/src/org/labkey/test/tests/FileAttachmentColumnTest.java @@ -613,7 +613,7 @@ private void validateAssayRun(String assayName, String folderPath, String runNam checker().withScreenshot("unexpected_run_file_links") .wrapAssertion(()-> Assertions.assertThat(runFileTexts.stream().map(String::trim).toList()) .as("expect complete run files") - .containsOnly(String.format("assaydata%s%s", File.separatorChar, runFile.getName())) + .containsOnly(runFile.getName()) .hasSize(5)); } @@ -637,7 +637,7 @@ private void validateDatasetData(String datasetName, String folderPath, List optionalFileLink = Locator.linkContainingText(String.format("datasetdata%s%s", File.separatorChar, file.getName())) + Optional optionalFileLink = Locator.linkContainingText(file.getName()) .findOptionalElement(dataRegionTable); checker().withScreenshot("unexpected_file_state") .awaiting(Duration.ofSeconds(2), diff --git a/src/org/labkey/test/tests/InlineImagesAssayTest.java b/src/org/labkey/test/tests/InlineImagesAssayTest.java index 84ead2a935..2c240bfd73 100644 --- a/src/org/labkey/test/tests/InlineImagesAssayTest.java +++ b/src/org/labkey/test/tests/InlineImagesAssayTest.java @@ -182,10 +182,7 @@ public final void testAssayInlineImages() throws Exception customizeView.addColumn(FieldKey.fromParts("Run", "RowId")); customizeView.addColumn(FieldKey.fromParts("Run", "Protocol", "RowId")); customizeView.applyCustomView(); - var protocolId = list.getDataAsText(0, "Run/Protocol/RowId"); - var runId = list.getDataAsText(0, "Run/RowId"); - String helpJpgFilePath = String.format("AssayId_%s%sRunId_%s%s%s", protocolId, File.separatorChar, - runId, File.separatorChar, HELP_JPG_FILE.getName()); + String helpJpgFilePath = HELP_JPG_FILE.getName(); log("Validate that two links to this image file are now present."); assertElementPresent("Did not find the expected number of icons for images for " + PNG01_FILE.getName() + " from the runs.", Locator.xpath("//img[contains(@title, '" + PNG01_FILE.getName() + "')]"), 3); @@ -206,8 +203,8 @@ public final void testAssayInlineImages() throws Exception log("Validate that the 'File' (last) column is as expected."); assertEquals("Values in 'File' column not exported as expected [" + exportedFile.getName() + "]", - Arrays.asList("Batch File Field", "assaydata" + File.separator + XLS_FILE.getName(), "assaydata" + File.separator + XLS_FILE.getName(), "assaydata" + File.separator + XLS_FILE.getName()), - ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 7)); + Arrays.asList("Batch File Field", XLS_FILE.getName(), XLS_FILE.getName(), XLS_FILE.getName()), + ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 7));// } log("Remove the 'File' (last) column from the batch and see that things still work."); @@ -286,7 +283,7 @@ private void validateExcelExport(File exportedFile, Workbook workbook, String he exportedColumn = ExcelHelper.getColumnData(sheet, 5); assertEquals("Values in 'File' column not exported as expected [" + exportedFile.getName() + "]", - Arrays.asList("Run File Field", "assaydata" + File.separator + PNG01_FILE.getName(), "assaydata" + File.separator + PNG01_FILE.getName(), "assaydata" + File.separator + PNG01_FILE.getName()), + Arrays.asList("Run File Field", PNG01_FILE.getName(), PNG01_FILE.getName(), PNG01_FILE.getName()), exportedColumn); } diff --git a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java index 509cb9b5c2..fa2df123b2 100644 --- a/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java +++ b/src/org/labkey/test/tests/core/admin/AllowedFileExtensionTest.java @@ -383,7 +383,7 @@ public void testAllowedFileExtensionsInSampleType() { fieldMap = Map.of("Name", String.format("S-%d", i), stFileField, fileMap.get(allowedType).getAbsolutePath()); sampleTypeHelper.insertRow(fieldMap); - expectedValues.add(String.format(" sampletype%s%s", File.separator, fileMap.get(allowedType).getName())); + expectedValues.add(String.format(" %s", fileMap.get(allowedType).getName())); i++; } From 3dd2360e7fa5e8bb2467e86e47ade2ca827ae753 Mon Sep 17 00:00:00 2001 From: XingY Date: Wed, 15 Oct 2025 09:02:07 -0700 Subject: [PATCH 2/3] fix more tests --- src/org/labkey/test/tests/assay/AssayTransformWarningTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java index c85d967a4e..949f22c58b 100644 --- a/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java +++ b/src/org/labkey/test/tests/assay/AssayTransformWarningTest.java @@ -182,7 +182,7 @@ public void testRTransformWarning() clickAndWait(Locator.linkWithText(runName), longWaitForPage); // Verify file uploaded - assertTextPresent("assaydata" + File.separator + JAVA_TRANSFORM_SCRIPT.getName(), 1); + assertTextPresent(JAVA_TRANSFORM_SCRIPT.getName(), 1); DataRegionTable table = new DataRegionTable("Data", this); assertEquals(1, table.getDataRowCount()); From 6c553bbf3c59eef0ea37a7b20377f1abee511ca9 Mon Sep 17 00:00:00 2001 From: XingY Date: Thu, 16 Oct 2025 12:29:33 -0700 Subject: [PATCH 3/3] clean --- src/org/labkey/test/tests/InlineImagesAssayTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/InlineImagesAssayTest.java b/src/org/labkey/test/tests/InlineImagesAssayTest.java index 2c240bfd73..7512bdc002 100644 --- a/src/org/labkey/test/tests/InlineImagesAssayTest.java +++ b/src/org/labkey/test/tests/InlineImagesAssayTest.java @@ -204,7 +204,7 @@ public final void testAssayInlineImages() throws Exception log("Validate that the 'File' (last) column is as expected."); assertEquals("Values in 'File' column not exported as expected [" + exportedFile.getName() + "]", Arrays.asList("Batch File Field", XLS_FILE.getName(), XLS_FILE.getName(), XLS_FILE.getName()), - ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 7));// + ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 7)); } log("Remove the 'File' (last) column from the batch and see that things still work.");