Skip to content

Commit 90a5b4a

Browse files
jamesmcroftjamesmcroft
committed
Moved Windows ByExtensions to WindowsByExtras to match implementation for core
1 parent 3c59eb9 commit 90a5b4a

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+155
-163
lines changed

‎samples/MADESampleApp/Pages/AppPage.cs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ namespace MADESampleApp.Pages
33
using System;
44
using System.Collections.Generic;
55
using Legerity.Pages;
6+
using Legerity.Windows;
67
using Legerity.Windows.Elements.Core;
78
using Legerity.Windows.Elements.MADE;
89
using Legerity.Windows.Extensions;
@@ -13,17 +14,17 @@ public class AppPage : BasePage
1314
/// <summary>
1415
/// Gets a given trait of the page to verify that the page is in view.
1516
/// </summary>
16-
protected override By Trait => ByExtensions.AutomationId("DropDownList");
17+
protected override By Trait => WindowsByExtras.AutomationId("DropDownList");
1718

1819
public InputValidator TextInputValidator =>
19-
this.WindowsApp.FindElement(ByExtensions.AutomationId("TextBoxValidator"));
20+
this.WindowsApp.FindElement(WindowsByExtras.AutomationId("TextBoxValidator"));
2021

21-
public TextBox TextInput => this.TextInputValidator.Input(ByExtensions.AutomationId("TextBox"));
22+
public TextBox TextInput => this.TextInputValidator.Input(WindowsByExtras.AutomationId("TextBox"));
2223

2324
public InputValidator DateInputValidator =>
24-
this.WindowsApp.FindElement(ByExtensions.AutomationId("DatePickerValidator"));
25+
this.WindowsApp.FindElement(WindowsByExtras.AutomationId("DatePickerValidator"));
2526

26-
public DatePicker DateInput => this.DateInputValidator.Input(ByExtensions.AutomationId("DatePicker"));
27+
public DatePicker DateInput => this.DateInputValidator.Input(WindowsByExtras.AutomationId("DatePicker"));
2728

2829
public DropDownList DropDownList => this.WindowsApp.FindElementByAutomationId("DropDownList");
2930

‎samples/WindowsAlarmsAndClock/Elements/AlarmPopup.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
namespace WindowsAlarmsAndClock.Elements
22
{
33
using System;
4+
using Legerity.Windows;
45
using Legerity.Windows.Elements;
56
using Legerity.Windows.Elements.Core;
6-
using Legerity.Windows.Extensions;
77
using OpenQA.Selenium;
88
using OpenQA.Selenium.Appium;
99
using OpenQA.Selenium.Appium.Windows;
@@ -67,11 +67,11 @@ public static implicit operator AlarmPopup(RemoteWebElement element)
6767
return new AlarmPopup(element as WindowsElement);
6868
}
6969

70-
public CustomTimePicker DurationPicker => this.FindElement(ByExtensions.AutomationId("DurationPicker"));
70+
public CustomTimePicker DurationPicker => this.FindElement(WindowsByExtras.AutomationId("DurationPicker"));
7171

7272
public TextBox AlarmNameInput => this.FindElement(By.Name("Alarm name"));
7373

74-
public Button SaveButton => this.Element.FindElement(ByExtensions.AutomationId("PrimaryButton"));
74+
public Button SaveButton => this.Element.FindElement(WindowsByExtras.AutomationId("PrimaryButton"));
7575

7676
public void SetTime(TimeSpan time)
7777
{

‎samples/WindowsAlarmsAndClock/Elements/CustomTimePicker.cs‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
namespace WindowsAlarmsAndClock.Elements
22
{
33
using System;
4-
4+
using Legerity.Windows;
55
using Legerity.Windows.Elements;
6-
using Legerity.Windows.Extensions;
76
using OpenQA.Selenium.Appium;
87
using OpenQA.Selenium.Appium.Windows;
98
using OpenQA.Selenium.Remote;
@@ -74,8 +73,8 @@ public static implicit operator CustomTimePicker(RemoteWebElement element)
7473
/// </param>
7574
public void SetTime(TimeSpan time)
7675
{
77-
this.Element.FindElement(ByExtensions.AutomationId("HourPicker")).FindElementByName(time.ToString("%h")).Click();
78-
this.Element.FindElement(ByExtensions.AutomationId("MinutePicker")).FindElementByName(time.ToString("mm")).Click();
76+
this.Element.FindElement(WindowsByExtras.AutomationId("HourPicker")).FindElementByName(time.ToString("%h")).Click();
77+
this.Element.FindElement(WindowsByExtras.AutomationId("MinutePicker")).FindElementByName(time.ToString("mm")).Click();
7978
}
8079
}
8180
}

‎samples/WindowsAlarmsAndClock/Pages/AlarmPage.cs‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ namespace WindowsAlarmsAndClock.Pages
55
using System.Linq;
66
using Elements;
77
using Legerity.Extensions;
8-
using Legerity.Windows.Extensions;
9-
8+
using Legerity.Windows;
109
using Microsoft.VisualStudio.TestTools.UnitTesting;
1110

1211
using OpenQA.Selenium;
@@ -26,16 +25,16 @@ public class AlarmPage : AppPage
2625
/// </summary>
2726
public AlarmPage()
2827
{
29-
this.addAlarmButton = ByExtensions.AutomationId("AddAlarmButton");
30-
this.alarmList = ByExtensions.AutomationId("AlarmListView");
28+
this.addAlarmButton = WindowsByExtras.AutomationId("AddAlarmButton");
29+
this.alarmList = WindowsByExtras.AutomationId("AlarmListView");
3130
}
3231

33-
public AlarmPopup AlarmPopup => this.WindowsApp.FindElement(ByExtensions.AutomationId("EditFlyout"));
32+
public AlarmPopup AlarmPopup => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("EditFlyout"));
3433

3534
/// <summary>
3635
/// Gets a given trait of the page to verify that the page is in view.
3736
/// </summary>
38-
protected override By Trait => ByExtensions.AutomationId("AddAlarmButton");
37+
protected override By Trait => WindowsByExtras.AutomationId("AddAlarmButton");
3938

4039
/// <summary>
4140
/// Navigates to adding an alarm.

‎samples/WindowsAlarmsAndClock/Pages/AppPage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ namespace WindowsAlarmsAndClock.Pages
22
{
33
using System;
44
using Legerity.Pages;
5+
using Legerity.Windows;
56
using Legerity.Windows.Elements.WinUI;
6-
using Legerity.Windows.Extensions;
77
using OpenQA.Selenium;
88

99
public class AppPage : BasePage
@@ -13,7 +13,7 @@ public class AppPage : BasePage
1313
/// <summary>
1414
/// Gets a given trait of the page to verify that the page is in view.
1515
/// </summary>
16-
protected override By Trait => ByExtensions.AutomationId("NavView");
16+
protected override By Trait => WindowsByExtras.AutomationId("NavView");
1717

1818
/// <summary>
1919
/// Selects a sample from the available options with the given name.

‎samples/WindowsAlarmsAndClock/Pages/EditAlarmPage.cs‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,7 @@ namespace WindowsAlarmsAndClock.Pages
33
using System;
44

55
using Legerity.Pages;
6-
using Legerity.Windows.Extensions;
7-
6+
using Legerity.Windows;
87
using OpenQA.Selenium;
98
using OpenQA.Selenium.Appium.Windows;
109

@@ -38,21 +37,21 @@ public class EditAlarmPage : BasePage
3837
/// </summary>
3938
public EditAlarmPage()
4039
{
41-
this.alarmTimePicker = ByExtensions.AutomationId("AlarmTimePicker");
42-
this.alarmNameTextBox = ByExtensions.AutomationId("AlarmNameTextBox");
43-
this.alarmRepeatButton = ByExtensions.AutomationId("AlarmRepeatsToggleButton");
44-
this.alarmSoundButton = ByExtensions.AutomationId("AlarmSoundButton");
45-
this.alarmSnoozeComboBox = ByExtensions.AutomationId("AlarmSnoozeCombobox");
46-
this.alarmSaveButton = ByExtensions.AutomationId("AlarmSaveButton");
47-
this.alarmCancelButton = ByExtensions.AutomationId("CancelButton");
48-
this.alarmDeleteButton = ByExtensions.AutomationId("AlarmDeleteButton");
49-
this.alarmDeleteDialog = ByExtensions.AutomationId("DeleteConfirmationDialog");
40+
this.alarmTimePicker = WindowsByExtras.AutomationId("AlarmTimePicker");
41+
this.alarmNameTextBox = WindowsByExtras.AutomationId("AlarmNameTextBox");
42+
this.alarmRepeatButton = WindowsByExtras.AutomationId("AlarmRepeatsToggleButton");
43+
this.alarmSoundButton = WindowsByExtras.AutomationId("AlarmSoundButton");
44+
this.alarmSnoozeComboBox = WindowsByExtras.AutomationId("AlarmSnoozeCombobox");
45+
this.alarmSaveButton = WindowsByExtras.AutomationId("AlarmSaveButton");
46+
this.alarmCancelButton = WindowsByExtras.AutomationId("CancelButton");
47+
this.alarmDeleteButton = WindowsByExtras.AutomationId("AlarmDeleteButton");
48+
this.alarmDeleteDialog = WindowsByExtras.AutomationId("DeleteConfirmationDialog");
5049
}
5150

5251
/// <summary>
5352
/// Gets a given trait of the page to verify that the page is in view.
5453
/// </summary>
55-
protected override By Trait => ByExtensions.AutomationId("EditAlarmHeader");
54+
protected override By Trait => WindowsByExtras.AutomationId("EditAlarmHeader");
5655

5756
/// <summary>
5857
/// Sets the time of the alarm being edited.

‎samples/WindowsCommunityToolkitSampleApp/Pages/AppPage.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,27 +4,27 @@ namespace WindowsCommunityToolkitSampleApp.Pages
44
using System.Linq;
55
using System.Threading;
66
using Legerity.Pages;
7+
using Legerity.Windows;
78
using Legerity.Windows.Elements.Core;
89
using Legerity.Windows.Elements.WinUI;
9-
using Legerity.Windows.Extensions;
1010
using OpenQA.Selenium;
1111
using OpenQA.Selenium.Appium;
1212

1313
public class AppPage : BasePage
1414
{
1515
public NavigationView NavigationView => this.WindowsApp.FindElement(this.Trait);
1616

17-
public AutoSuggestBox SampleSearchBox => this.NavigationView.FindElement(ByExtensions.AutomationId("SearchBox"));
17+
public AutoSuggestBox SampleSearchBox => this.NavigationView.FindElement(WindowsByExtras.AutomationId("SearchBox"));
1818

1919
/// <summary>
2020
/// Gets the UI component associated with the sample picker.
2121
/// </summary>
22-
public GridView SamplePicker => this.WindowsApp.FindElement(ByExtensions.AutomationId("SamplePickerGridView"));
22+
public GridView SamplePicker => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("SamplePickerGridView"));
2323

2424
/// <summary>
2525
/// Gets a given trait of the page to verify that the page is in view.
2626
/// </summary>
27-
protected override By Trait => ByExtensions.AutomationId("NavView");
27+
protected override By Trait => WindowsByExtras.AutomationId("NavView");
2828

2929
/// <summary>
3030
/// Selects a sample from the available options with the given name.

‎samples/WindowsCommunityToolkitSampleApp/Pages/BladeViewPage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
namespace WindowsCommunityToolkitSampleApp.Pages
22
{
3+
using Legerity.Windows;
34
using Legerity.Windows.Elements.Core;
45
using Legerity.Windows.Elements.WCT;
5-
using Legerity.Windows.Extensions;
66
using OpenQA.Selenium;
77

88
/// <summary>
@@ -17,7 +17,7 @@ public BladeViewPage()
1717
{
1818
}
1919

20-
public BladeView BladeView => this.WindowsApp.FindElement(ByExtensions.AutomationId("BladeView"));
20+
public BladeView BladeView => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("BladeView"));
2121

2222
/// <summary>
2323
/// Gets a given trait of the page to verify that the page is in view.

‎samples/WindowsCommunityToolkitSampleApp/Pages/CarouselPage.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace WindowsCommunityToolkitSampleApp.Pages
22
{
3+
using Legerity.Windows;
34
using Legerity.Windows.Elements.WCT;
4-
using Legerity.Windows.Extensions;
55
using OpenQA.Selenium;
66
using Shouldly;
77

@@ -17,7 +17,7 @@ public CarouselPage()
1717
{
1818
}
1919

20-
public Carousel Carousel => this.WindowsApp.FindElement(ByExtensions.AutomationId("CarouselControl"));
20+
public Carousel Carousel => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("CarouselControl"));
2121

2222
/// <summary>
2323
/// Gets a given trait of the page to verify that the page is in view.

‎samples/WindowsCommunityToolkitSampleApp/Pages/ExpanderPage.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
namespace WindowsCommunityToolkitSampleApp.Pages
22
{
3+
using Legerity.Windows;
34
using Legerity.Windows.Elements.WCT;
4-
using Legerity.Windows.Extensions;
55
using Microsoft.VisualStudio.TestTools.UnitTesting;
66
using OpenQA.Selenium;
77

@@ -10,9 +10,9 @@ namespace WindowsCommunityToolkitSampleApp.Pages
1010
/// </summary>
1111
public class ExpanderPage : AppPage
1212
{
13-
public Expander VerticalExpander => this.WindowsApp.FindElement(ByExtensions.AutomationId("Expander1"));
13+
public Expander VerticalExpander => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("Expander1"));
1414

15-
public Expander HorizontalExpander => this.WindowsApp.FindElement(ByExtensions.AutomationId("Expander2"));
15+
public Expander HorizontalExpander => this.WindowsApp.FindElement(WindowsByExtras.AutomationId("Expander2"));
1616

1717
/// <summary>
1818
/// Gets a given trait of the page to verify that the page is in view.

0 commit comments

Comments
 (0)