From 1c51b34502e6fbf4fa4f91046688358c27cdb4c2 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 24 Jan 2025 12:35:54 -0800 Subject: [PATCH 1/4] Fix error during ensureSignedInAsPrimaryTestUser --- test/src/org/labkey/test/tests/cds/CDSLoginTest.java | 3 ++- test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java index 2db72777d..2fe736aa7 100644 --- a/test/src/org/labkey/test/tests/cds/CDSLoginTest.java +++ b/test/src/org/labkey/test/tests/cds/CDSLoginTest.java @@ -44,7 +44,6 @@ public class CDSLoginTest extends CDSReadOnlyTest { private static final String CDS_LOGIN_TESTUSER = "user_passwordtest@cds.test"; - private final CDSHelper cds = new CDSHelper(this); @Before public void preTest() @@ -154,6 +153,8 @@ public void testPasswordStrength() changePasswordDialog.setReEnterPassword(strongPwd); changePasswordDialog.submit(); waitFor(() -> getCurrentUser().equals(CDS_LOGIN_TESTUSER), "login failed for " + CDS_LOGIN_TESTUSER, defaultWaitForPage); + + goToHome(); // 'ensureSignedInAsPrimaryTestUser' can be interrupted by CDS session timeout page } @Override diff --git a/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java b/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java index 512aebe2b..4d7bacae7 100644 --- a/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java +++ b/test/src/org/labkey/test/tests/cds/CDSReadOnlyTest.java @@ -52,7 +52,7 @@ public List getAssociatedModules() @BeforeClass public static void doSetup() throws Exception { - CDSReadOnlyTest initTest = (CDSReadOnlyTest)getCurrentTest(); + CDSReadOnlyTest initTest = getCurrentTest(); if (initTest.needsSetup()) { CDSInitializer _initializer = new CDSInitializer(initTest); From 5f51cb38e281f076314696eeb1513035899f4eae Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Fri, 24 Jan 2025 13:01:14 -0800 Subject: [PATCH 2/4] Dump threads after schema browser fails to load --- test/src/org/labkey/test/util/cds/CDSHelper.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/src/org/labkey/test/util/cds/CDSHelper.java b/test/src/org/labkey/test/util/cds/CDSHelper.java index e5d04d4e1..d36314e1f 100644 --- a/test/src/org/labkey/test/util/cds/CDSHelper.java +++ b/test/src/org/labkey/test/util/cds/CDSHelper.java @@ -30,6 +30,7 @@ import org.labkey.test.pages.cds.LearnGrid; import org.labkey.test.pages.cds.LearnGrid.LearnTab; import org.labkey.test.util.ApiPermissionsHelper; +import org.labkey.test.util.ArtifactCollector; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.Ext4Helper; import org.labkey.test.util.LabKeyExpectedConditions; @@ -2026,8 +2027,17 @@ public int createReport(RReportHelper rReportHelper, String queryUrl, @Nullable _test.beginAt(queryUrl); if (!skipViewData) { - _test.waitForElement(Locator.linkWithText("view data")); - _test.click(Locator.linkWithText("view data")); + try + { + _test.waitForElement(Locator.linkWithText("view data")); + _test.clickAndWait(Locator.linkWithText("view data")); + } + catch (NoSuchElementException threadDump) + { + // TODO: remove after debugging + ArtifactCollector.dumpThreads(); + throw threadDump; + } } // Check to see if the report already exists. If it does, then just ignore this test. From ad364b45a674d0ec40f0dcab340d39810ff1e74c Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 27 Jan 2025 10:15:34 -0800 Subject: [PATCH 3/4] Remove debug code --- test/src/org/labkey/test/util/cds/CDSHelper.java | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/test/src/org/labkey/test/util/cds/CDSHelper.java b/test/src/org/labkey/test/util/cds/CDSHelper.java index d36314e1f..e5d04d4e1 100644 --- a/test/src/org/labkey/test/util/cds/CDSHelper.java +++ b/test/src/org/labkey/test/util/cds/CDSHelper.java @@ -30,7 +30,6 @@ import org.labkey.test.pages.cds.LearnGrid; import org.labkey.test.pages.cds.LearnGrid.LearnTab; import org.labkey.test.util.ApiPermissionsHelper; -import org.labkey.test.util.ArtifactCollector; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.Ext4Helper; import org.labkey.test.util.LabKeyExpectedConditions; @@ -2027,17 +2026,8 @@ public int createReport(RReportHelper rReportHelper, String queryUrl, @Nullable _test.beginAt(queryUrl); if (!skipViewData) { - try - { - _test.waitForElement(Locator.linkWithText("view data")); - _test.clickAndWait(Locator.linkWithText("view data")); - } - catch (NoSuchElementException threadDump) - { - // TODO: remove after debugging - ArtifactCollector.dumpThreads(); - throw threadDump; - } + _test.waitForElement(Locator.linkWithText("view data")); + _test.click(Locator.linkWithText("view data")); } // Check to see if the report already exists. If it does, then just ignore this test. From 40b3969cd8a9128ac37ca298ab1fd8a9f0a4bc38 Mon Sep 17 00:00:00 2001 From: labkey-tchad Date: Mon, 27 Jan 2025 11:21:36 -0800 Subject: [PATCH 4/4] Remove deprecated reference --- test/src/org/labkey/test/util/cds/CDSHelper.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/test/src/org/labkey/test/util/cds/CDSHelper.java b/test/src/org/labkey/test/util/cds/CDSHelper.java index e5d04d4e1..6ffcca763 100644 --- a/test/src/org/labkey/test/util/cds/CDSHelper.java +++ b/test/src/org/labkey/test/util/cds/CDSHelper.java @@ -29,6 +29,7 @@ import org.labkey.test.pages.cds.GroupDetailsPage; import org.labkey.test.pages.cds.LearnGrid; import org.labkey.test.pages.cds.LearnGrid.LearnTab; +import org.labkey.test.pages.reports.ScriptReportPage.StandardReportOption; import org.labkey.test.util.ApiPermissionsHelper; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.Ext4Helper; @@ -2048,7 +2049,7 @@ public int createReport(RReportHelper rReportHelper, String queryUrl, @Nullable _test.setCodeEditorValue("script-report-editor", reportScript); if (shareReport) - rReportHelper.selectOption(RReportHelper.ReportOption.shareReport); + rReportHelper.selectOption(StandardReportOption.shareReport); _test.waitForElement(Locator.tagWithText("span", "Save")); rReportHelper.saveReport(reportName);