From 441f43669894bcd2d4dc771716b8ee490ec5dab5 Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Fri, 10 Jan 2025 14:44:42 +0100 Subject: [PATCH 1/5] refactor: Cleanup samples --- .../UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs | 2 +- .../CheckBoxTests/CheckBox_Automated.xaml.cs | 2 +- .../CheckBoxTests/CheckBox_States.xaml.cs | 2 +- .../Simple_Contrained_Horizontal_Center_Wrap.xaml.cs | 2 +- .../TextBlockControl/Simple_Text_Arabic.xaml.cs | 2 +- .../CompositionTargetTests/CompositionTarget_Rendering.xaml.cs | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs index 0155e2831db5..03d6d24773cb 100644 --- a/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Microsoft_UI/ColorHelperTests.xaml.cs @@ -9,7 +9,7 @@ namespace UITests.Shared.Microsoft_UI; -[Sample("Microsoft.UI", "ColorHelper", Description = "Demonstrates use of Microsoft.UI.ColorHelper. Until WinUI3 1.6+ this currently only works on Uno targets", ViewModelType = typeof(ColorHelperTestsViewModel), IgnoreInSnapshotTests = true)] +[Sample("Microsoft.UI", Description = "Demonstrates use of Microsoft.UI.ColorHelper. Until WinUI3 1.6+ this currently only works on Uno targets", ViewModelType = typeof(ColorHelperTestsViewModel), IgnoreInSnapshotTests = true)] public sealed partial class ColorHelperTests : UserControl { public ColorHelperTests() diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs index 50a99bfa6f21..f685e04294ba 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_Automated.xaml.cs @@ -19,7 +19,7 @@ namespace UITests.Shared.Windows_UI_Xaml_Controls.CheckBoxTests { - [SampleControlInfo("CheckBox")] + [SampleControlInfo("Buttons")] public sealed partial class CheckBox_Automated : UserControl { public CheckBox_Automated() diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs index 0062a4824139..cda0da1d5da8 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/CheckBoxTests/CheckBox_States.xaml.cs @@ -16,7 +16,7 @@ namespace UITests.Windows_UI_Xaml_Controls.CheckBoxTests { - [Sample("CheckBox")] + [Sample("Buttons")] public sealed partial class CheckBox_States : Page { public CheckBox_States() diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs index 1bd7cc5da875..3f393d804864 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Contrained_Horizontal_Center_Wrap.xaml.cs @@ -3,7 +3,7 @@ namespace Uno.UI.Samples.Content.UITests.TextBlockControl { - [Sample] + [Sample("TextBlock")] public sealed partial class Simple_Contrained_Horizontal_Center_Wrap : Page { public Simple_Contrained_Horizontal_Center_Wrap() diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs index 84123a85b0b9..82a810453641 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Controls/TextBlockControl/Simple_Text_Arabic.xaml.cs @@ -3,7 +3,7 @@ namespace Uno.UI.Samples.Content.UITests.TextBlockControl { - [SampleControlInfo("TextBlockControl", "Simple_Text_Arabic")] + [SampleControlInfo("TextBlock", "Simple_Text_Arabic")] public sealed partial class Simple_Text_Arabic : UserControl { public Simple_Text_Arabic() diff --git a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs index 05cdb6c82f12..726ccad5b5f7 100644 --- a/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs +++ b/src/SamplesApp/UITests.Shared/Windows_UI_Xaml_Media/CompositionTargetTests/CompositionTarget_Rendering.xaml.cs @@ -18,7 +18,7 @@ namespace UITests.Shared.Windows_UI_Xaml_Media.CompositionTargetTests { - [SampleControlInfo("Composition", "CompositionTarget_Rendering", description: "Demonstrates the CompositionTarget.Rendering event")] + [SampleControlInfo("Microsoft.UI.Xaml.Media", "CompositionTarget_Rendering", description: "Demonstrates the CompositionTarget.Rendering event")] public sealed partial class CompositionTarget_Rendering : UserControl { public CompositionTarget_Rendering() From 54b044103bc3899741f958886ad7f5bd1fb09401 Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Wed, 15 Jan 2025 16:01:43 +0100 Subject: [PATCH 2/5] refactor: Replace runtime tests iconography with Fluent icons --- .../Controls/UnitTest/UnitTestsControl.xaml | 81 ++++++++++++------- 1 file changed, 52 insertions(+), 29 deletions(-) diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml index 87f3bfc07722..18e039f35a23 100644 --- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml +++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml @@ -34,16 +34,24 @@ - - - + + + + + + + + + + + + + + + + + + @@ -80,20 +93,23 @@ - + + FontSize="15"> + + + + Margin="4,0,0,0" + FontSize="15"> + + + + Margin="4,0,0,0" + Foreground="DarkGreen" + FontSize="15"> + + + + Margin="4,0,0,0" + Foreground="Red" + FontSize="15"> + + + Date: Wed, 15 Jan 2025 16:11:09 +0100 Subject: [PATCH 3/5] chore: Adjust icons further --- .../Controls/UnitTest/UnitTestsControl.xaml | 47 +++++++------------ 1 file changed, 16 insertions(+), 31 deletions(-) diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml index 18e039f35a23..f4115de4dcd3 100644 --- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml +++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml @@ -72,14 +72,14 @@ - + - + @@ -94,50 +94,35 @@ + + + + + + - - - - + - - - - + - - - - + + - - - - From aa08ba3e47e3e96b922c6d3533bc323d1731651e Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Wed, 15 Jan 2025 16:24:48 +0100 Subject: [PATCH 4/5] chore: Final touches --- .../Controls/UnitTest/UnitTestsControl.xaml | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml index f4115de4dcd3..b68c558101e4 100644 --- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml +++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml @@ -10,7 +10,7 @@ d:DesignHeight="300" d:DesignWidth="400"> - + @@ -23,7 +23,7 @@ - + @@ -49,7 +49,7 @@ Margin="0,0,4,0"> - + - + - - - - + @@ -121,11 +116,16 @@ Text="None" /> - + + + From e9a15ef6b76287c9f33ea4bcfa124883204bc51e Mon Sep 17 00:00:00 2001 From: Martin Zikmund Date: Wed, 15 Jan 2025 17:03:45 +0100 Subject: [PATCH 5/5] chore: Further UI adjustments --- .../Controls/UnitTest/UnitTestsControl.xaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml index b68c558101e4..104ee1bab52f 100644 --- a/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml +++ b/src/SamplesApp/SamplesApp.UnitTests.Shared/Controls/UnitTest/UnitTestsControl.xaml @@ -10,7 +10,7 @@ d:DesignHeight="300" d:DesignWidth="400"> - + @@ -88,12 +88,12 @@ - + - +