Account for the AssayID column being present.

Author: labkey-danield

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.");

src/org/labkey/test/tests/TextChoiceTest.java

@@ -248,6 +248,7 @@ protected void verifyRunResultsTable(Map<String, String> expectedRowData, String
 
             Map<String, String> 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);