提交 95efa06d 编写于 作者: M Martin Zikmund

test: Adjust all tests to use GetOpenPopupsForXamlRoot

上级 40e48a30
......@@ -537,7 +537,7 @@ namespace MUXControlsTestApp
private void CopyGamesLabelButton_Click(object sender, RoutedEventArgs e)
{
var popups = VisualTreeHelper.GetOpenPopups(Windows.UI.Xaml.Window.Current);
var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(XamlRoot);
if (popups != null && popups.Count > 0)
{
var popup = popups[0];
......
......@@ -366,7 +366,7 @@ namespace MUXControlsTestApp
private void CopyGamesLabelButton_Click(object sender, RoutedEventArgs e)
{
var popups = VisualTreeHelper.GetOpenPopups(Windows.UI.Xaml.Window.Current);
var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(XamlRoot);
if (popups != null && popups.Count > 0)
{
var popup = popups[0];
......
......@@ -392,7 +392,7 @@ namespace MUXControlsTestApp
private void CopyGamesLabelButton_Click(object sender, RoutedEventArgs e)
{
var popups = VisualTreeHelper.GetOpenPopups(Windows.UI.Xaml.Window.Current);
var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(XamlRoot);
if (popups != null && popups.Count > 0)
{
var popup = popups[0];
......
......@@ -307,7 +307,7 @@ namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
await RunOnUIThread.ExecuteAsync(() =>
{
var openPopups = VisualTreeHelper.GetOpenPopups(Window.Current);
var openPopups = VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot);
var flyout = openPopups[openPopups.Count - 1];
Verify.IsNotNull(flyout, "Flyout could not be retrieved");
var ellipsisItemsRepeater = TestUtilities.FindDescendents<ItemsRepeater>(flyout).Single();
......@@ -389,7 +389,7 @@ namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
await RunOnUIThread.ExecuteAsync(() =>
{
var openPopups = VisualTreeHelper.GetOpenPopups(Window.Current);
var openPopups = VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot);
var flyout = openPopups[openPopups.Count - 1];
Verify.IsNotNull(flyout, "Flyout could not be retrieved");
var ellipsisItemsRepeater = TestUtilities.FindDescendents<ItemsRepeater>(flyout).Single();
......
......@@ -11,6 +11,7 @@ using Windows.UI.Xaml.Controls.Primitives;
using Windows.UI.Xaml.Media;
using static Private.Infrastructure.TestServices;
using System.Linq;
using Private.Infrastructure;
#if HAS_UNO
using Uno.UI.WinRT.Extensions.UI.Popups;
#endif
......@@ -87,7 +88,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Popups
private int GetNonMessageDialogPopupsCount()
{
var popups = VisualTreeHelper.GetOpenPopups(Window.Current);
var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot);
#if HAS_UNO
return popups.Count(p => p.Child is not MessageDialogContentDialog);
#else
......
......@@ -71,7 +71,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Controls
await TestServices.WindowHelper.WaitForIdle();
var popups = VisualTreeHelper.GetOpenPopups(Windows.UI.Xaml.Window.Current);
var popups = VisualTreeHelper.GetOpenPopupsForXamlRoot(TestServices.WindowHelper.XamlRoot);
var innerFlyoutItem = popups.Select(p
=> ((p.Child as MenuFlyoutPresenter)?.TemplatedRoot as FrameworkElement)?.FindName("innerFlyoutItem") as MenuFlyoutItem).Trim().FirstOrDefault();
......
......@@ -27,22 +27,22 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Media
var flyout = new Flyout();
FlyoutBase.SetAttachedFlyout(button, flyout);
WindowHelper.WindowContent = button;
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
FlyoutBase.ShowAttachedFlyout(button);
Assert.AreEqual(1, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(1, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
flyout.Hide();
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
}
[TestMethod]
public void OpenPopups_Popups_Unique()
{
var popup = new Popup();
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
popup.IsOpen = true;
Assert.AreEqual(1, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(1, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
popup.IsOpen = false;
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopups(Window.Current).Count);
Assert.AreEqual(0, VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).Count);
}
[TestMethod]
......@@ -50,7 +50,7 @@ namespace Uno.UI.RuntimeTests.Tests.Windows_UI_Xaml_Media
{
var popup = new Popup();
popup.IsOpen = true;
CollectionAssert.Contains(VisualTreeHelper.GetOpenPopups(Window.Current).ToArray(), popup);
CollectionAssert.Contains(VisualTreeHelper.GetOpenPopupsForXamlRoot(WindowHelper.XamlRoot).ToArray(), popup);
popup.IsOpen = false;
}
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册