From 2139159fec0f9518fdadd494881c5c6c9d976846 Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Mon, 18 May 2026 10:33:15 -0700 Subject: [PATCH 1/2] checker with await --- src/org/labkey/test/tests/SampleTypeTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/SampleTypeTest.java b/src/org/labkey/test/tests/SampleTypeTest.java index bd10a1d59a..5d697e1563 100644 --- a/src/org/labkey/test/tests/SampleTypeTest.java +++ b/src/org/labkey/test/tests/SampleTypeTest.java @@ -16,6 +16,7 @@ package org.labkey.test.tests; +import org.apache.commons.csv.CSVFormat; import org.apache.commons.io.FileUtils; import org.apache.poi.ss.usermodel.Sheet; import org.assertj.core.api.Assertions; @@ -966,10 +967,10 @@ public void testUpdateAndDeleteWithCommentsAndFlags() throws IOException } List fileData = new ArrayList<>(); - fileData.add(String.format("%s\t%s", "Name", field01.getLabel())); + fileData.add(CSVFormat.TDF.format("Name", field01.getLabel())); for(Map sample : sampleData) { - fileData.add(String.format("%s\t%s", sample.get("Name"), sample.get(field01.getName()))); + fileData.add(CSVFormat.TDF.format(sample.get("Name"), sample.get(field01.getName()))); } String fileName = "SampleTypeTest_UpdateSamples.tsv"; From cf12c99e8432b2447bcd199d731c855a4960566e Mon Sep 17 00:00:00 2001 From: Daria Bodiakova <70635654+DariaBod@users.noreply.github.com> Date: Tue, 19 May 2026 12:49:34 -0700 Subject: [PATCH 2/2] fix using TestDataUtils --- src/org/labkey/test/tests/SampleTypeTest.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/org/labkey/test/tests/SampleTypeTest.java b/src/org/labkey/test/tests/SampleTypeTest.java index 5d697e1563..2ec6f70b0f 100644 --- a/src/org/labkey/test/tests/SampleTypeTest.java +++ b/src/org/labkey/test/tests/SampleTypeTest.java @@ -966,17 +966,17 @@ public void testUpdateAndDeleteWithCommentsAndFlags() throws IOException sample.replace(field01.getName(), fieldValue.toUpperCase()); } - List fileData = new ArrayList<>(); - fileData.add(CSVFormat.TDF.format("Name", field01.getLabel())); + List> fileData = new ArrayList<>(); + fileData.add(List.of("Name", field01.getLabel())); for(Map sample : sampleData) { - fileData.add(CSVFormat.TDF.format(sample.get("Name"), sample.get(field01.getName()))); + fileData.add(List.of(sample.get("Name"), sample.get(field01.getName()))); } String fileName = "SampleTypeTest_UpdateSamples.tsv"; if (!TestFileUtils.getTestTempDir().exists()) TestFileUtils.getTestTempDir().mkdirs(); - File importFile = TestFileUtils.writeTempFile(fileName, String.join(System.lineSeparator(), fileData)); + File importFile = TestDataUtils.writeRowsToFile(fileName, fileData); sampleHelper.mergeImport(importFile);