From bc93c2813acbce178da0b5cdc63c0d0510e48510 Mon Sep 17 00:00:00 2001
From: brendanx67 <brendanx@proteinms.net>
Date: Thu, 10 Oct 2024 11:06:45 -0700
Subject: [PATCH] Skyline: Fix intermittent failure in TestRetentionTimeFilter

---
 pwiz_tools/Skyline/SettingsUI/PeptideSettingsUI.cs       | 6 ++++++
 .../Skyline/TestFunctional/RetentionTimeFilterTest.cs    | 9 ++++-----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/pwiz_tools/Skyline/SettingsUI/PeptideSettingsUI.cs b/pwiz_tools/Skyline/SettingsUI/PeptideSettingsUI.cs
index 566c6590dd..f0ddb9c4df 100644
--- a/pwiz_tools/Skyline/SettingsUI/PeptideSettingsUI.cs
+++ b/pwiz_tools/Skyline/SettingsUI/PeptideSettingsUI.cs
@@ -1206,6 +1206,12 @@ public void ChooseRegression(string name)
             comboRetentionTime.SelectedItem = name;
         }
 
+        public string RetentionTimeRegressionName
+        {
+            get { return comboRetentionTime.SelectedItem.ToString(); }
+            set { comboRetentionTime.SelectedItem = value; }
+        }
+
         public void UseMeasuredRT(bool use)
         {
             cbUseMeasuredRT.Checked = use;
diff --git a/pwiz_tools/Skyline/TestFunctional/RetentionTimeFilterTest.cs b/pwiz_tools/Skyline/TestFunctional/RetentionTimeFilterTest.cs
index d246c45450..cfab8882a5 100644
--- a/pwiz_tools/Skyline/TestFunctional/RetentionTimeFilterTest.cs
+++ b/pwiz_tools/Skyline/TestFunctional/RetentionTimeFilterTest.cs
@@ -162,6 +162,7 @@ protected void TestUsePredictedTime()
                 const string calcName = "TestCalculator";
                 const string regressionName = "TestCalculatorAutoCalcRegression";
                 var peptideSettingsDlg = ShowDialog<PeptideSettingsUI>(SkylineWindow.ShowPeptideSettingsUI);
+                RunUI(() => peptideSettingsDlg.SelectedTab = PeptideSettingsUI.TABS.Prediction);
                 var editIrtDlg = ShowDialog<EditIrtCalcDlg>(peptideSettingsDlg.AddCalculator);
                 RunUI(() =>
                 {
@@ -180,11 +181,9 @@ protected void TestUsePredictedTime()
                     editRtDlg.SetTimeWindow(1.0);
                 });
                 OkDialog(editRtDlg, editRtDlg.OkDialog);
-                RunUI(() =>
-                {
-                    peptideSettingsDlg.ChooseRegression(regressionName);
-                    peptideSettingsDlg.UseMeasuredRT(false);
-                });
+                WaitForConditionUI(() => Equals(regressionName, peptideSettingsDlg.RetentionTimeRegressionName),
+                    () => string.Format("Expected regression name '{0}' not set. Found '{1}' instead.", regressionName, peptideSettingsDlg.RetentionTimeRegressionName));
+                RunUI(() => peptideSettingsDlg.UseMeasuredRT(false));
                 OkDialog(peptideSettingsDlg, peptideSettingsDlg.OkDialog);
                 docBeforeImport = WaitForDocumentChange(docBeforeSettingsChange);
                 AssertEx.AreEqual(calcName, SkylineWindow.Document.Settings.PeptideSettings.Prediction.RetentionTime?.Calculator.Name);