Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
lindexi_gd
Uno
提交
95efa06d
U
Uno
项目概览
lindexi_gd
/
Uno
大约 1 年 前同步成功
通知
1
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
DevOps
流水线
流水线任务
计划
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
U
Uno
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
DevOps
DevOps
流水线
流水线任务
计划
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
流水线任务
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
95efa06d
编写于
3月 14, 2023
作者:
M
Martin Zikmund
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
test: Adjust all tests to use GetOpenPopupsForXamlRoot
上级
40e48a30
变更
7
隐藏空白更改
内联
并排
Showing
7 changed file
with
15 addition
and
14 deletion
+15
-14
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/Common/NavigationViewPage.xaml.cs
...ols/NavigationViewTests/Common/NavigationViewPage.xaml.cs
+1
-1
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/Regression/NavigationViewRS4Page.xaml.cs
...igationViewTests/Regression/NavigationViewRS4Page.xaml.cs
+1
-1
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/TopMode/NavigationViewTopNavPage.xaml.cs
...igationViewTests/TopMode/NavigationViewTopNavPage.xaml.cs
+1
-1
src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/Breadcrumb/BreadcrumbTests.cs
.../Microsoft_UI_Xaml_Controls/Breadcrumb/BreadcrumbTests.cs
+2
-2
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Popups/Given_MessageDialog.cs
...ntimeTests/Tests/Windows_UI_Popups/Given_MessageDialog.cs
+2
-1
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
...ntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
+1
-1
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Media/Given_VisualTreeHelper.cs
...sts/Tests/Windows_UI_Xaml_Media/Given_VisualTreeHelper.cs
+7
-7
未找到文件。
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/Common/NavigationViewPage.xaml.cs
浏览文件 @
95efa06d
...
...
@@ -537,7 +537,7 @@ namespace MUXControlsTestApp
private
void
CopyGamesLabelButton_Click
(
object
sender
,
RoutedEventArgs
e
)
{
var
popups
=
VisualTreeHelper
.
GetOpenPopups
(
Windows
.
UI
.
Xaml
.
Window
.
Curren
t
);
var
popups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
XamlRoo
t
);
if
(
popups
!=
null
&&
popups
.
Count
>
0
)
{
var
popup
=
popups
[
0
];
...
...
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/Regression/NavigationViewRS4Page.xaml.cs
浏览文件 @
95efa06d
...
...
@@ -366,7 +366,7 @@ namespace MUXControlsTestApp
private
void
CopyGamesLabelButton_Click
(
object
sender
,
RoutedEventArgs
e
)
{
var
popups
=
VisualTreeHelper
.
GetOpenPopups
(
Windows
.
UI
.
Xaml
.
Window
.
Curren
t
);
var
popups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
XamlRoo
t
);
if
(
popups
!=
null
&&
popups
.
Count
>
0
)
{
var
popup
=
popups
[
0
];
...
...
src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/NavigationViewTests/TopMode/NavigationViewTopNavPage.xaml.cs
浏览文件 @
95efa06d
...
...
@@ -392,7 +392,7 @@ namespace MUXControlsTestApp
private
void
CopyGamesLabelButton_Click
(
object
sender
,
RoutedEventArgs
e
)
{
var
popups
=
VisualTreeHelper
.
GetOpenPopups
(
Windows
.
UI
.
Xaml
.
Window
.
Curren
t
);
var
popups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
XamlRoo
t
);
if
(
popups
!=
null
&&
popups
.
Count
>
0
)
{
var
popup
=
popups
[
0
];
...
...
src/Uno.UI.RuntimeTests/MUX/Microsoft_UI_Xaml_Controls/Breadcrumb/BreadcrumbTests.cs
浏览文件 @
95efa06d
...
...
@@ -307,7 +307,7 @@ namespace Windows.UI.Xaml.Tests.MUXControls.ApiTests
await
RunOnUIThread
.
ExecuteAsync
(()
=>
{
var
openPopups
=
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
);
var
openPopups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
TestServices
.
WindowHelper
.
XamlRoo
t
);
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
.
Curren
t
);
var
openPopups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
TestServices
.
WindowHelper
.
XamlRoo
t
);
var
flyout
=
openPopups
[
openPopups
.
Count
-
1
];
Verify
.
IsNotNull
(
flyout
,
"Flyout could not be retrieved"
);
var
ellipsisItemsRepeater
=
TestUtilities
.
FindDescendents
<
ItemsRepeater
>(
flyout
).
Single
();
...
...
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Popups/Given_MessageDialog.cs
浏览文件 @
95efa06d
...
...
@@ -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
.
Curren
t
);
var
popups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
TestServices
.
WindowHelper
.
XamlRoo
t
);
#if HAS_UNO
return
popups
.
Count
(
p
=>
p
.
Child
is
not
MessageDialogContentDialog
);
#else
...
...
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Controls/Given_Button.cs
浏览文件 @
95efa06d
...
...
@@ -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
.
Curren
t
);
var
popups
=
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
TestServices
.
WindowHelper
.
XamlRoo
t
);
var
innerFlyoutItem
=
popups
.
Select
(
p
=>
((
p
.
Child
as
MenuFlyoutPresenter
)?.
TemplatedRoot
as
FrameworkElement
)?.
FindName
(
"innerFlyoutItem"
)
as
MenuFlyoutItem
).
Trim
().
FirstOrDefault
();
...
...
src/Uno.UI.RuntimeTests/Tests/Windows_UI_Xaml_Media/Given_VisualTreeHelper.cs
浏览文件 @
95efa06d
...
...
@@ -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
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
Count
);
FlyoutBase
.
ShowAttachedFlyout
(
button
);
Assert
.
AreEqual
(
1
,
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
1
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
Count
);
flyout
.
Hide
();
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
Count
);
}
[
TestMethod
]
public
void
OpenPopups_Popups_Unique
()
{
var
popup
=
new
Popup
();
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
Count
);
popup
.
IsOpen
=
true
;
Assert
.
AreEqual
(
1
,
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
1
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
Count
);
popup
.
IsOpen
=
false
;
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
(
Window
.
Curren
t
).
Count
);
Assert
.
AreEqual
(
0
,
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
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
.
Curren
t
).
ToArray
(),
popup
);
CollectionAssert
.
Contains
(
VisualTreeHelper
.
GetOpenPopups
ForXamlRoot
(
WindowHelper
.
XamlRoo
t
).
ToArray
(),
popup
);
popup
.
IsOpen
=
false
;
}
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录