From f41749170277d8e79c7a5e16af1a1db083705008 Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sat, 4 Feb 2023 22:44:24 +0100
Subject: [PATCH] Speed up integration tests.

Don't change combo boxes that are already set to the correct value.
---
 .../WindowTests.cs                            | 21 +++++++++++++------
 .../WindowTests_MacOS.cs                      | 14 +++++++++----
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index 23381c2e58..f3861ca267 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -325,14 +325,23 @@ namespace Avalonia.IntegrationTests.Appium
             if (size.HasValue)
                 sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
 
-            modeComboBox.Click();
-            _session.FindElementByName(mode.ToString()).SendClick();
+            if (modeComboBox.GetComboBoxValue() != mode.ToString())
+            {
+                modeComboBox.Click();
+                _session.FindElementByName(mode.ToString()).SendClick();
+            }
 
-            locationComboBox.Click();
-            _session.FindElementByName(location.ToString()).SendClick();
+            if (locationComboBox.GetComboBoxValue() != location.ToString())
+            {
+                locationComboBox.Click();
+                _session.FindElementByName(location.ToString()).SendClick();
+            }
 
-            stateComboBox.Click();
-            _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
+            if (stateComboBox.GetComboBoxValue() != state.ToString())
+            {
+                stateComboBox.Click();
+                _session.FindElementByAccessibilityId($"ShowWindowState{state}").SendClick();
+            }
 
             if (canResizeCheckBox.GetIsChecked() != canResize)
                 canResizeCheckBox.Click();
diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
index 06180be74a..0839cbf183 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests_MacOS.cs
@@ -352,11 +352,17 @@ namespace Avalonia.IntegrationTests.Appium
             if (size.HasValue)
                 sizeTextBox.SendKeys($"{size.Value.Width}, {size.Value.Height}");
 
-            modeComboBox.Click();
-            _session.FindElementByName(mode.ToString()).SendClick();
+            if (modeComboBox.GetComboBoxValue() != mode.ToString())
+            {
+                modeComboBox.Click();
+                _session.FindElementByName(mode.ToString()).SendClick();
+            }
 
-            locationComboBox.Click();
-            _session.FindElementByName(location.ToString()).SendClick();
+            if (locationComboBox.GetComboBoxValue() != location.ToString())
+            {
+                locationComboBox.Click();
+                _session.FindElementByName(location.ToString()).SendClick();
+            }
             
             if (canResizeCheckBox.GetIsChecked() != canResize)
                 canResizeCheckBox.Click();