From f4d9d4cc131ba0d14122fad6f413eeee5644dc0f Mon Sep 17 00:00:00 2001
From: Steven Kirk <grokys@gmail.com>
Date: Sun, 21 Nov 2021 15:33:33 +0100
Subject: [PATCH] Make integration tests pass on MacOS.

---
 .../Peers/ComboBoxAutomationPeer.cs           | 20 ++++++++++++++++---
 .../ComboBoxTests.cs                          |  5 +++--
 .../ElementExtensions.cs                      | 19 ++++++++++++++++++
 .../MenuTests.cs                              |  2 +-
 .../PlatformFactAttribute.cs                  |  2 +-
 5 files changed, 41 insertions(+), 7 deletions(-)

diff --git a/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
index c582c3d372..0122527950 100644
--- a/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
+++ b/src/Avalonia.Controls/Automation/Peers/ComboBoxAutomationPeer.cs
@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using Avalonia.Automation.Provider;
 using Avalonia.Controls;
 
@@ -7,12 +8,13 @@ using Avalonia.Controls;
 namespace Avalonia.Automation.Peers
 {
     public class ComboBoxAutomationPeer : SelectingItemsControlAutomationPeer,
-        IExpandCollapseProvider
+        IExpandCollapseProvider,
+        IValueProvider
     {
         private UnrealizedSelectionPeer[]? _selection;
 
         public ComboBoxAutomationPeer(ComboBox owner)
-            : base(owner) 
+            : base(owner)
         {
         }
 
@@ -22,7 +24,19 @@ namespace Avalonia.Automation.Peers
         public bool ShowsMenu => true;
         public void Collapse() => Owner.IsDropDownOpen = false;
         public void Expand() => Owner.IsDropDownOpen = true;
+        bool IValueProvider.IsReadOnly => true;
 
+        string? IValueProvider.Value
+        {
+            get
+            {
+                var selection = GetSelection();
+                return selection.Count == 1 ? selection[0].GetName() : null;
+            }
+        }
+        
+        void IValueProvider.SetValue(string? value) => throw new NotSupportedException();
+        
         protected override AutomationControlType GetAutomationControlTypeCore()
         {
             return AutomationControlType.ComboBox;
diff --git a/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs
index c5ddb14d4b..f8920e6290 100644
--- a/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/ComboBoxTests.cs
@@ -1,4 +1,5 @@
 using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium.Mac;
 using Xunit;
 
 namespace Avalonia.IntegrationTests.Appium
@@ -24,8 +25,8 @@ namespace Avalonia.IntegrationTests.Appium
 
             Assert.Equal(string.Empty, comboBox.Text);
 
-            comboBox.Click();
-            comboBox.FindElementByName("Bar").Click();
+            ((MacElement)comboBox).Click();
+            _session.FindElementByName("Bar").ClickListItem();
 
             Assert.Equal("Bar", comboBox.Text);
         }
diff --git a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
index 8949aa9208..9e91422c38 100644
--- a/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/ElementExtensions.cs
@@ -1,6 +1,8 @@
 using System;
 using System.Runtime.InteropServices;
 using OpenQA.Selenium.Appium;
+using OpenQA.Selenium.Appium.MultiTouch;
+using OpenQA.Selenium.Interactions;
 
 namespace Avalonia.IntegrationTests.Appium
 {
@@ -17,6 +19,23 @@ namespace Avalonia.IntegrationTests.Appium
                 _ => throw new ArgumentOutOfRangeException($"Unexpected IsChecked value.")
             };
 
+        public static void ClickListItem(this AppiumWebElement element)
+        {
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                element.Click();
+            }
+            else
+            {
+                // List items don't respond to performClick on MacOS, so instead send a physical click as VoiceOver
+                // does.
+                var action = new Actions(element.WrappedDriver);
+                action.MoveToElement(element);
+                action.Click();
+                action.Perform();
+            }
+        }
+
         public static string GetAttribute(AppiumWebElement element, string windows, string macOS)
         {
             return element.GetAttribute(RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? windows : macOS);
diff --git a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
index 1e43330ae2..a2c3ee0e44 100644
--- a/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/MenuTests.cs
@@ -18,7 +18,7 @@ namespace Avalonia.IntegrationTests.Appium
             Assert.Equal("File", fileMenu.Text);
         }
 
-        [Fact]
+        [PlatformFact(SkipOnOSX = true)]
         public void Open()
         {
             var fileMenu = _session.FindElementByAccessibilityId("FileMenu");
diff --git a/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs
index 53b9a98347..60338b92c2 100644
--- a/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/PlatformFactAttribute.cs
@@ -14,7 +14,7 @@ namespace Avalonia.IntegrationTests.Appium
                 if (SkipOnWindows && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                     return "Ignored on Windows";
                 if (SkipOnOSX && RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                    return "Ignored on Windows";
+                    return "Ignored on MacOS";
                 return null;
             }
             set => throw new NotSupportedException();