From 0f2748570f19f3aa67944934f6a659274616cfc9 Mon Sep 17 00:00:00 2001 From: labkey-danield Date: Tue, 16 Dec 2025 08:39:23 -0800 Subject: [PATCH] Account for the AssayID column being present. --- src/org/labkey/test/tests/InlineImagesAssayTest.java | 2 +- src/org/labkey/test/tests/TextChoiceTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/InlineImagesAssayTest.java b/src/org/labkey/test/tests/InlineImagesAssayTest.java index 8463434684..da2b40ddb4 100644 --- a/src/org/labkey/test/tests/InlineImagesAssayTest.java +++ b/src/org/labkey/test/tests/InlineImagesAssayTest.java @@ -207,7 +207,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", "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)); + ExcelHelper.getColumnData(workbook.getSheetAt(workbook.getActiveSheetIndex()), 8)); } log("Remove the 'File' (last) column from the batch and see that things still work."); diff --git a/src/org/labkey/test/tests/TextChoiceTest.java b/src/org/labkey/test/tests/TextChoiceTest.java index 245912a65f..ed830de0d8 100644 --- a/src/org/labkey/test/tests/TextChoiceTest.java +++ b/src/org/labkey/test/tests/TextChoiceTest.java @@ -248,6 +248,7 @@ protected void verifyRunResultsTable(Map expectedRowData, String Map expectedData = Map.of(RESULT_SAMPLE_FIELD, entry.getKey(), RESULT_TC_FIELD, entry.getValue(), + "Run/Name", ASSAY_RUN_ID, String.format("Run/Batch/%s", BATCH_TC_FIELD), BATCH_VALUE, String.format("Run/%s", RUN_TC_FIELD), expectedRunValue);