From 3f49009d07afcf94629337b421256dd839801f4c Mon Sep 17 00:00:00 2001 From: labkey-nicka Date: Mon, 19 May 2025 16:05:09 -0700 Subject: [PATCH] Add tests --- src/org/labkey/test/util/TestDataGenerator.java | 11 ++++++++--- src/org/labkey/test/util/exp/SampleTypeAPIHelper.java | 3 +-- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index b624fa2555..86da97976d 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -713,10 +713,15 @@ public String rowToString(List fieldNames, Map row) * @return TSV formatted representation of generated rows */ public String writeTsvContents() + { + return writeTsvContents(true); + } + + public String writeTsvContents(boolean includeHeaders) { List fieldNames = new ArrayList<>(_columns.keySet()); fieldNames.removeAll(_autoGeneratedFields); - StringBuilder builder = writeTsvHeaders(); + StringBuilder builder = includeHeaders ? writeTsvHeaders() : new StringBuilder(); for (Map row : _rows) { @@ -731,7 +736,7 @@ public File writeGeneratedDataToFile(int numberOfRowsToGenerate, String fileName File file = new File(TestFileUtils.getTestTempDir(), fileName); FileUtils.forceMkdirParent(file); - try(PrintWriter stream = PrintWriters.getPrintWriter(file)) + try (PrintWriter stream = PrintWriters.getPrintWriter(file)) { List fieldNames = new ArrayList<>(_columns.keySet()); fieldNames.removeAll(_autoGeneratedFields); @@ -752,7 +757,7 @@ public File writeGeneratedDataToExcel(int numberOfRowsToGenerate, String sheetNa File file = new File(TestFileUtils.getTestTempDir(), fileName); FileUtils.forceMkdirParent(file); - try(SXSSFWorkbook workbook = new SXSSFWorkbook(1000); // only holds 1000 rows in memory + try (SXSSFWorkbook workbook = new SXSSFWorkbook(1000); // only holds 1000 rows in memory FileOutputStream out = new FileOutputStream(file)) { var sheet = workbook.createSheet(sheetName); diff --git a/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java b/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java index 3c0b6cfd21..a34266513a 100644 --- a/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java +++ b/src/org/labkey/test/util/exp/SampleTypeAPIHelper.java @@ -16,7 +16,6 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Arrays; -import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; @@ -49,7 +48,7 @@ public static TestDataGenerator createEmptySampleType(String containerPath, Samp } catch (CommandException | IOException e) { - throw new RuntimeException("Failed to create sample type.", e); + throw new RuntimeException(String.format("Failed to create sample type. %s", e.getMessage()), e); } }