From 8b53707f824b062c21b1ebf089b19044b4c328df Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Thu, 26 Feb 2026 13:59:00 -0800 Subject: [PATCH 1/2] changed the " " symbol processing --- src/org/labkey/test/util/data/TestDataUtils.java | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/org/labkey/test/util/data/TestDataUtils.java b/src/org/labkey/test/util/data/TestDataUtils.java index b7ed252c1a..1be38244b4 100644 --- a/src/org/labkey/test/util/data/TestDataUtils.java +++ b/src/org/labkey/test/util/data/TestDataUtils.java @@ -578,17 +578,16 @@ public static List> readRowsFromFile(File file, CSVFormat format) t } } - public static List parseMultiValueText(String multiValueString) throws IOException + public static String parseMultiValueText(String multiValueString) throws IOException { CSVFormat format = CSVFormat.RFC4180.builder() - .setIgnoreSurroundingSpaces(true).get(); + .setIgnoreSurroundingSpaces(true).setTrim(true).setQuote('"').get(); try (CSVParser parser = format.parse(new StringReader(multiValueString))) { List records = parser.getRecords(); - List> list = records.stream().map(CSVRecord::toList).toList(); - if (list.size() != 1) - throw new IllegalArgumentException("Invalid multi-value text string: " + multiValueString); - return list.getFirst(); + if (records.isEmpty()) + return ""; + return records.getFirst().stream().collect(Collectors.joining(multiValueString.contains(", ") ? ", " : ",")); } } From a58381dd8214a9aa6bac60610d65ced20beaef45 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Fri, 27 Feb 2026 15:50:03 -0800 Subject: [PATCH 2/2] fix for multi choice export test --- src/org/labkey/test/util/data/TestDataUtils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/util/data/TestDataUtils.java b/src/org/labkey/test/util/data/TestDataUtils.java index 1be38244b4..000526aaea 100644 --- a/src/org/labkey/test/util/data/TestDataUtils.java +++ b/src/org/labkey/test/util/data/TestDataUtils.java @@ -581,7 +581,7 @@ public static List> readRowsFromFile(File file, CSVFormat format) t public static String parseMultiValueText(String multiValueString) throws IOException { CSVFormat format = CSVFormat.RFC4180.builder() - .setIgnoreSurroundingSpaces(true).setTrim(true).setQuote('"').get(); + .setIgnoreSurroundingSpaces(true).setTrim(true).get(); try (CSVParser parser = format.parse(new StringReader(multiValueString))) { List records = parser.getRecords();