From a70dadea18bd0ff1fb9e0b1a6fa657659eb608a4 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 Jun 2022 18:17:15 +0100
Subject: [PATCH] simplify test.

---
 .../WindowTests.cs                            | 42 +++++++------------
 1 file changed, 14 insertions(+), 28 deletions(-)

diff --git a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
index 1f5ac052ec..8d6be4d199 100644
--- a/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
+++ b/tests/Avalonia.IntegrationTests.Appium/WindowTests.cs
@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Linq;
 using System.Runtime.InteropServices;
 using Avalonia.Controls;
@@ -39,8 +40,6 @@ namespace Avalonia.IntegrationTests.Appium
                 var mainWindow =
                     _session.FindElementByAccessibilityId("MainWindow");
                 
-                
-                
                 sizeTextBox.SendKeys("200, 100");
 
                 modeComboBox.Click();
@@ -51,37 +50,15 @@ namespace Avalonia.IntegrationTests.Appium
 
                 showButton.Click();
 
-                var secondaryWindow = _session.FindElementByAccessibilityId("SecondaryWindow");
-
                 mainWindow.Click();
                 
                 var windows = _session.FindElements(By.XPath("XCUIElementTypeWindow"));
 
-                int i = 0;
-                int mainWindowIndex = 0;
-                int secondaryWindowIndex = 0;
+                int mainWindowIndex = windows.GetWindowOrder("MainWindow");
+                int secondaryWindowIndex = windows.GetWindowOrder("SecondaryWindow");
                 
-                foreach (var window in windows)
-                {
-                    i++;
-                    
-                    var child = window.FindElementByXPath("XCUIElementTypeWindow");
-
-                    switch (child.GetAttribute("identifier"))
-                    {
-                        case "MainWindow":
-                            mainWindowIndex = i;
-                            break;
-                            
-                        case "SecondaryWindow":
-                            secondaryWindowIndex = i;
-                            break;
-                    }
-
-                }
-                
-                Assert.Equal(1, secondaryWindowIndex);
-                Assert.Equal(2, mainWindowIndex);
+                Assert.Equal(0, secondaryWindowIndex);
+                Assert.Equal(1, mainWindowIndex);
 
                 SwitchToNewWindowHack(oldWindowHandle: mainWindowHandle);
             }
@@ -293,4 +270,13 @@ namespace Avalonia.IntegrationTests.Appium
             Modal
         }
     }
+
+    static class Extensions
+    {
+        public static int GetWindowOrder(this IReadOnlyCollection<AppiumWebElement> elements, string identifier)
+        {
+            return elements.TakeWhile(x =>
+                x.FindElementByXPath("XCUIElementTypeWindow")?.GetAttribute("identifier") != identifier).Count();
+        }
+    }
 }