Skip to content

Commit f4cd961

Browse files
authored
26.3 Fix for export tests (#2898)
#### Rationale Fix for export tests, changed the " " symbol processing. #### Related Pull Requests - [https://github.com/LabKey/limsModules/pull/2017](https://github.com/LabKey/limsModules/pull/2017)
1 parent c7a5cae commit f4cd961

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

src/org/labkey/test/components/domain/DomainFieldRow.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -769,6 +769,8 @@ public DomainFieldRow clickRemoveOntologyConcept()
769769

770770
public void setAllowMultipleSelections(Boolean allowMultipleSelections)
771771
{
772+
WebDriverWrapper.waitFor(() -> elementCache().allowMultipleSelectionsCheckbox.isDisplayed(),
773+
"Allow Multiple Selections checkbox did not become visible", 2000);
772774
elementCache().allowMultipleSelectionsCheckbox.set(allowMultipleSelections);
773775
}
774776

src/org/labkey/test/util/data/TestDataUtils.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -581,14 +581,13 @@ public static List<List<String>> readRowsFromFile(File file, CSVFormat format) t
581581
public static List<String> parseMultiValueText(String multiValueString) throws IOException
582582
{
583583
CSVFormat format = CSVFormat.RFC4180.builder()
584-
.setIgnoreSurroundingSpaces(true).get();
584+
.setIgnoreSurroundingSpaces(true).setTrim(true).get();
585585
try (CSVParser parser = format.parse(new StringReader(multiValueString)))
586586
{
587587
List<CSVRecord> records = parser.getRecords();
588-
List<List<String>> list = records.stream().map(CSVRecord::toList).toList();
589-
if (list.size() != 1)
588+
if (records.size() != 1)
590589
throw new IllegalArgumentException("Invalid multi-value text string: " + multiValueString);
591-
return list.getFirst();
590+
return records.getFirst().toList();
592591
}
593592
}
594593

0 commit comments

Comments
 (0)