Skip to content

BiologicsAssayFilesTest to optionally add a no-op transform script to assay designs to test import with and without them #2759

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
cnathe merged 6 commits into from
Oct 29, 2025
Merged

BiologicsAssayFilesTest to optionally add a no-op transform script to assay designs to test import with and without them #2759

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
98d9743
make TestDataGenerator.randomBoolean() static
cnathe Oct 24, 2025
6324de7
BiologicsAssayFilesTest to optionally add a no-op transform script to…
cnathe Oct 24, 2025
310c0d1
Merge branch 'develop' into fb_assayTransformTest53590
cnathe Oct 27, 2025
bda673e
Merge branch 'develop' into fb_assayTransformTest53590
cnathe Oct 27, 2025
0c7fcb7
replace Rlabkey package usage
cnathe Oct 27, 2025
d3f46b1
noopTransform.R to quote and escape column headers in output
cnathe Oct 28, 2025
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
9 changes: 9 additions & 0 deletions data/qc/noopTransform.R
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
all.lines = readLines("${runInfo}")
runDataFile.line = grep("^runDataFile", all.lines, value = TRUE);
runDataFile.props <- strsplit(runDataFile.line, "\t")[[1]]
run.data.file = runDataFile.props[2];
run.output.file = runDataFile.props[4];

run.data = read.delim(run.data.file, header=TRUE, sep="\t", quote="", check.names=FALSE);
run.data$TransformType = "${transformOperation}";
write.table(run.data, file=run.output.file, sep="\t", na="", row.names=FALSE, quote=TRUE, qmethod="double");
2 changes: 1 addition & 1 deletion src/org/labkey/test/tests/component/GridPanelTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ private void createSmallSampleType() throws IOException, CommandException
FILTER_INT_COL.getName(), TestDataGenerator.randomInt(1, INT_MAX),
FILTER_STRING_COL.getName(), stringSets.get(setIndex++),
FILTER_DATE_COL.getName(), sampleSetDataGenerator.randomDateString(DateUtils.addWeeks(new Date(), -25), new Date()),
FILTER_BOOL_COL.getName(), sampleSetDataGenerator.randomBoolean())
FILTER_BOOL_COL.getName(), TestDataGenerator.randomBoolean())
);
}

Expand Down
4 changes: 2 additions & 2 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 @@ -469,7 +469,7 @@ private Supplier<Object> getDefaultDataSupplier(PropertyDescriptor propertyDescr
case "double":
return () -> randomDouble(0, 20);
case "boolean":
return this::randomBoolean;
return TestDataGenerator::randomBoolean;
case "date":
case "datetime":
return () -> randomDateString(DateUtils.addWeeks(new Date(), -39), new Date());
Expand Down Expand Up @@ -797,7 +797,7 @@ public String randomDateString(String dateFormat, Date min, Date max)
return new SimpleDateFormat(dateFormat).format(date);
}

public boolean randomBoolean()
public static boolean randomBoolean()
{
return ThreadLocalRandom.current().nextBoolean();
}
Expand Down