UITest: improve SaveFileDialog view to support Win10 as well; add log…

…ging in test to get more infos
jbe2277 · Apr 21, 2024 · 8d5917c · 8d5917c
1 parent 520d973
commit 8d5917c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs b/src/Samples.UITest/Writer.Test/Tests/WriterTest.cs
@@ -105,6 +105,9 @@ public void NewSaveRestartOpenChangeAskToSave()
         saveChangesWindow.YesButton.Click();
 
         var saveFileDialog = window.FirstModalWindow().As<SaveFileDialog>();
+        Log.WriteLine("---------");
+        Log.WriteLine(saveFileDialog.GetTree());
+        Log.WriteLine("---------");
         var fileName = GetTempFileName("rtf");
         saveFileDialog.FileName.EditableText = fileName;
         saveFileDialog.SaveButton.Click();

diff --git a/src/Samples.UITest/Writer.Test/Views/SaveFileDialog.cs b/src/Samples.UITest/Writer.Test/Views/SaveFileDialog.cs
@@ -1,13 +1,14 @@
 using FlaUI.Core;
 using FlaUI.Core.AutomationElements;
+using FlaUI.Core.Definitions;
 
 namespace UITest.Writer.Views;
 
 public class SaveFileDialog(FrameworkAutomationElementBase element) : Window(element)
 {
     public ComboBox FileName => this.Find("FileNameControlHost").AsComboBox();
 
-    public Button SaveButton => this.Find("1").AsButton();
+    public Button SaveButton => this.Find(x => x.ByControlType(ControlType.Button).And(x.ByAutomationId("1"))).AsButton();
 
-    public Button CancelButton => this.Find("2").AsButton();
+    public Button CancelButton => this.Find(x => x.ByControlType(ControlType.Button).And(x.ByAutomationId("2"))).AsButton();
 }