From 23f4603890b3be4bccc55ede911ae74b198f6067 Mon Sep 17 00:00:00 2001 From: ankurjuneja Date: Sat, 4 Apr 2026 08:19:18 -0700 Subject: [PATCH 1/2] fix verifyGuideSetRelatedElementsForPlots --- .../labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java index f911a0c2f..9206cf914 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java @@ -220,7 +220,7 @@ public void testGuideSetPlotDisplay() List> shapeCounts = new ArrayList<>(); shapeCounts.add(Pair.of(SvgShapes.CIRCLE.getPathPrefix(), 289)); shapeCounts.add(Pair.of(SvgShapes.TRIANGLE.getPathPrefix(), 40)); - verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 47); + verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 48); // check box for group x-axis values by date and verify qcPlotsWebPart.setGroupXAxisValuesByDate(true); From 66eddc452f2e6dd17ea3015542f7ccaba93a06b4 Mon Sep 17 00:00:00 2001 From: ankurjuneja Date: Sun, 5 Apr 2026 08:25:10 -0700 Subject: [PATCH 2/2] fix verifyGuideSetRelatedElementsForPlots --- .../tests/targetedms/TargetedMSQCGuideSetTest.java | 2 +- .../labkey/test/tests/targetedms/TargetedMSQCTest.java | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java index 9206cf914..f911a0c2f 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCGuideSetTest.java @@ -220,7 +220,7 @@ public void testGuideSetPlotDisplay() List> shapeCounts = new ArrayList<>(); shapeCounts.add(Pair.of(SvgShapes.CIRCLE.getPathPrefix(), 289)); shapeCounts.add(Pair.of(SvgShapes.TRIANGLE.getPathPrefix(), 40)); - verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 48); + verifyGuideSetRelatedElementsForPlots(qcPlotsWebPart, 4, shapeCounts, 47); // check box for group x-axis values by date and verify qcPlotsWebPart.setGroupXAxisValuesByDate(true); diff --git a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java index 6493d7224..01e2879e0 100644 --- a/test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java +++ b/test/src/org/labkey/test/tests/targetedms/TargetedMSQCTest.java @@ -25,6 +25,7 @@ import org.labkey.test.Locator; import org.labkey.test.SortDirection; import org.labkey.test.TestFileUtils; +import org.labkey.test.TestTimeoutException; import org.labkey.test.components.ext4.RadioButton; import org.labkey.test.components.ext4.Window; import org.labkey.test.components.html.SiteNavBar; @@ -36,6 +37,7 @@ import org.labkey.test.components.targetedms.QCSummaryWebPart; import org.labkey.test.pages.targetedms.PanoramaAnnotations; import org.labkey.test.pages.targetedms.PanoramaDashboard; +import org.labkey.test.util.APIContainerHelper; import org.labkey.test.util.ApiPermissionsHelper; import org.labkey.test.util.DataRegionTable; import org.labkey.test.util.Ext4Helper; @@ -197,6 +199,14 @@ public void preTest() qcPlotsWebPart.revertToDefaultView(); } + @Override + protected void doCleanup(boolean afterTest) throws TestTimeoutException + { + // Use the API-based approach for deletion so that we don't trigger AJAX requests navigating to the delete page + // that may run in the background and cause SQL Server deadlock exceptions + new APIContainerHelper(this).deleteProject(getProjectName(), afterTest); + } + @Test public void testQCDashboard() {