From fd373655642abf3c501835b84f5b06b33d5546c3 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 25 Feb 2026 15:52:44 -0600 Subject: [PATCH 1/3] GpatAssayTest to randomlyAddTransformScript for testing GitHub Issue 875 --- src/org/labkey/test/tests/GpatAssayTest.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java index 1770094f38..acfd78213c 100644 --- a/src/org/labkey/test/tests/GpatAssayTest.java +++ b/src/org/labkey/test/tests/GpatAssayTest.java @@ -41,6 +41,7 @@ import org.labkey.test.util.EscapeUtil; import org.labkey.test.util.LogMethod; import org.labkey.test.util.LoggedParam; +import org.labkey.test.util.RReportHelper; import org.labkey.test.util.TestDataGenerator; import org.labkey.test.util.core.webdav.WebDavUploadHelper; import org.openqa.selenium.WebElement; @@ -72,11 +73,13 @@ public class GpatAssayTest extends BaseWebDriverTest private static final String ASSAY_NAME_FNA = "FASTA Assay"; private static final String ASSAY_NAME_FNA_MULTIPLE = "FASTA Assay - Multiple file upload"; private static final String ASSAY_NAME_FNA_MULTIPLE_SINGLE_INPUT = "FASTA Assay - Multiple file single input upload"; + private static final File RTRANSFORM_SCRIPT_FILE_NOOP = TestFileUtils.getSampleData("qc/noopTransform.R"); @BeforeClass public static void doSetup() { GpatAssayTest init = getCurrentTest(); + new RReportHelper(init).ensureRConfig(); init._containerHelper.createProject(init.getProjectName(), "Assay"); init.goToProjectHome(); } @@ -256,6 +259,14 @@ private void importFastaGpatAssay(File fnaFile, String assayName) clickButton("Save and Finish", defaultWaitForPage); } + // GitHub Issue #875: Optionally add transform scripts in GPAT assay design to test code path with and without transform script + private void randomlyAddTransformScript(ReactAssayDesignerPage assayDesignerPage) + { + boolean shouldAddTransformScript = true;//TestDataGenerator.randomBoolean(); + if (shouldAddTransformScript) + assayDesignerPage.addTransformScript(RTRANSFORM_SCRIPT_FILE_NOOP); + } + @LogMethod private ReactAssayDesignerPage startCreateGpatAssay(File dataFile, @LoggedParam String assayName) { @@ -265,9 +276,9 @@ private ReactAssayDesignerPage startCreateGpatAssay(File dataFile, @LoggedParam _fileBrowserHelper.importFile(dataFile.getName(), "Create New Standard Assay Design"); ReactAssayDesignerPage assayDesignerPage = new ReactAssayDesignerPage(getDriver()); - if (assayName != null) assayDesignerPage.setName(assayName); + randomlyAddTransformScript(assayDesignerPage); return assayDesignerPage; } From a6ac46d0777de1b639b5b64f7586f8ca816b11e1 Mon Sep 17 00:00:00 2001 From: cnathe Date: Wed, 25 Feb 2026 15:53:17 -0600 Subject: [PATCH 2/3] remove hardcoded boolean (set for TC testing) --- src/org/labkey/test/tests/GpatAssayTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java index acfd78213c..b8fc02be52 100644 --- a/src/org/labkey/test/tests/GpatAssayTest.java +++ b/src/org/labkey/test/tests/GpatAssayTest.java @@ -262,7 +262,7 @@ private void importFastaGpatAssay(File fnaFile, String assayName) // GitHub Issue #875: Optionally add transform scripts in GPAT assay design to test code path with and without transform script private void randomlyAddTransformScript(ReactAssayDesignerPage assayDesignerPage) { - boolean shouldAddTransformScript = true;//TestDataGenerator.randomBoolean(); + boolean shouldAddTransformScript = TestDataGenerator.randomBoolean(); if (shouldAddTransformScript) assayDesignerPage.addTransformScript(RTRANSFORM_SCRIPT_FILE_NOOP); } From e280a67bedda650b4ff3750e0e69a08d01260268 Mon Sep 17 00:00:00 2001 From: cnathe Date: Thu, 26 Feb 2026 09:33:00 -0600 Subject: [PATCH 3/3] TestDataGenerator.randomBoolean to optionally include a message for logging --- src/org/labkey/test/tests/GpatAssayTest.java | 2 +- src/org/labkey/test/util/TestDataGenerator.java | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/org/labkey/test/tests/GpatAssayTest.java b/src/org/labkey/test/tests/GpatAssayTest.java index b8fc02be52..14b04e28cd 100644 --- a/src/org/labkey/test/tests/GpatAssayTest.java +++ b/src/org/labkey/test/tests/GpatAssayTest.java @@ -262,7 +262,7 @@ private void importFastaGpatAssay(File fnaFile, String assayName) // GitHub Issue #875: Optionally add transform scripts in GPAT assay design to test code path with and without transform script private void randomlyAddTransformScript(ReactAssayDesignerPage assayDesignerPage) { - boolean shouldAddTransformScript = TestDataGenerator.randomBoolean(); + boolean shouldAddTransformScript = TestDataGenerator.randomBoolean("whether to add transform script in assay design"); if (shouldAddTransformScript) assayDesignerPage.addTransformScript(RTRANSFORM_SCRIPT_FILE_NOOP); } diff --git a/src/org/labkey/test/util/TestDataGenerator.java b/src/org/labkey/test/util/TestDataGenerator.java index 854b2d2952..bd0436eab5 100644 --- a/src/org/labkey/test/util/TestDataGenerator.java +++ b/src/org/labkey/test/util/TestDataGenerator.java @@ -799,7 +799,15 @@ public String randomDateString(String dateFormat, Date min, Date max) public static boolean randomBoolean() { - return ThreadLocalRandom.current().nextBoolean(); + return randomBoolean(null); + } + + public static boolean randomBoolean(@Nullable String message) + { + boolean value = ThreadLocalRandom.current().nextBoolean(); + if (message != null) + TestLogger.log("Generated random boolean value for %s: %s".formatted(message, value)); + return value; } private @NotNull List getFieldsForFile()