Skip to content

Issue 53055: Check for multiple values in single value column #2456

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
labkey-nicka merged 1 commit into from
May 23, 2025
Merged

Issue 53055: Check for multiple values in single value column #2456

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions src/org/labkey/test/util/TestDataGenerator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -713,10 +713,15 @@ public String rowToString(List<String> fieldNames, Map<String, Object> row)
* @return TSV formatted representation of generated rows
*/
public String writeTsvContents()
{
return writeTsvContents(true);
}

public String writeTsvContents(boolean includeHeaders)
{
List<String> fieldNames = new ArrayList<>(_columns.keySet());
fieldNames.removeAll(_autoGeneratedFields);
StringBuilder builder = writeTsvHeaders();
StringBuilder builder = includeHeaders ? writeTsvHeaders() : new StringBuilder();

for (Map<String, Object> row : _rows)
{
Expand All @@ -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<String> fieldNames = new ArrayList<>(_columns.keySet());
fieldNames.removeAll(_autoGeneratedFields);
Expand All @@ -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);
Expand Down
3 changes: 1 addition & 2 deletions src/org/labkey/test/util/exp/SampleTypeAPIHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}
}

Expand Down