Merge pull request #8648 from workgroupengineering/fixes/SamplesApp/M…

…ux_Category fix:(SamplesApp): Mux Category
unoplatform · Apr 29, 2022 · 5fe24f2 · 5fe24f2
2 parents c383dd8 + 61c9d5e
commit 5fe24f2
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/...amplesApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/NumberBoxTests/Given_NumberBox.cs b/...amplesApp/SamplesApp.UITests/Microsoft_UI_Xaml_Controls/NumberBoxTests/Given_NumberBox.cs
@@ -19,7 +19,7 @@ public partial class NumberBoxTests : SampleControlUITestBase
 		[AutoRetry]
 		public void UpDownTest()
 		{
-			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.MUX_Test");
+			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBoxPage");
 
 			var numBox = _app.Marked("TestNumberBox");
 			Assert.AreEqual(0, numBox.GetDependencyPropertyValue<double>("Value"));
@@ -71,7 +71,7 @@ public void UpDownTest()
 		[AutoRetry]
 		public void DecimalFormatterTest()
 		{
-			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.MUX_Test");
+			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBoxPage");
 
 			var numBox = _app.Marked("TestNumberBox");
 			Assert.AreEqual(0, numBox.GetDependencyPropertyValue<double>("Value"));
@@ -93,7 +93,7 @@ public void DecimalFormatterTest()
 		[AutoRetry]
 		public void MinMaxTest()
 		{
-			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.MUX_Test");
+			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBoxPage");
 
 			_app.FastTap("MinCheckBox");
 			_app.FastTap("MaxCheckBox");
@@ -138,7 +138,7 @@ public void MinMaxTest()
 		[AutoRetry]
 		public void UpDownEnabledTest()
 		{
-			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.MUX_Test");
+			Run("UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBoxPage");
 
 			var numBox = _app.Marked("TestNumberBox");
 

diff --git a/...aml_Controls/NumberBoxTests/MUX_Test.xaml → ...ontrols/NumberBoxTests/NumberBoxPage.xaml b/...aml_Controls/NumberBoxTests/MUX_Test.xaml → ...ontrols/NumberBoxTests/NumberBoxPage.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.MUX_Test"
+<UserControl x:Class="UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests.NumberBoxPage"
 			 xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 			 xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 			 xmlns:local="using:UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests"

diff --git a/..._Controls/NumberBoxTests/MUX_Test.xaml.cs → ...rols/NumberBoxTests/NumberBoxPage.xaml.cs b/..._Controls/NumberBoxTests/MUX_Test.xaml.cs → ...rols/NumberBoxTests/NumberBoxPage.xaml.cs
@@ -19,10 +19,10 @@
 
 namespace UITests.Shared.Microsoft_UI_Xaml_Controls.NumberBoxTests
 {
-	[Sample("NumberBox", "WinUI", Name="MUX_Test")]
-	public sealed partial class MUX_Test : UserControl
+	[Sample("MUX", "WinUI", Name= "NumberBox")]
+	public sealed partial class NumberBoxPage : UserControl
 	{
-		public MUX_Test()
+		public NumberBoxPage()
 		{
 			this.InitializeComponent();
 			TestNumberBox.RegisterPropertyChangedCallback(NumberBox.TextProperty, new DependencyPropertyChangedCallback(TextPropertyChanged));

diff --git a/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/SplitButtonTests/SplitButtonPage.xaml.cs b/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/SplitButtonTests/SplitButtonPage.xaml.cs
@@ -27,7 +27,7 @@ namespace UITests.Microsoft_UI_Xaml_Controls.SplitButtonTests
 	/// <summary>
 	/// An empty page that can be used on its own or navigated to within a Frame.
 	/// </summary>
-	[SampleControlInfo("SplitButton", "MUX_Test")]
+	[SampleControlInfo("MUX","SplitButton")]
 	public sealed partial class SplitButtonPage : Page
     {
 		private int _clickCount = 0;

diff --git a/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/TreeView/TreeViewPage.xaml.cs b/src/SamplesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/TreeView/TreeViewPage.xaml.cs
@@ -35,7 +35,7 @@
 
 namespace UITests.Shared.Microsoft_UI_Xaml_Controls.TreeViewTests
 {
-	[SampleControlInfo("TreeView", "MUX_Test_TreeViewPage")]
+	[SampleControlInfo("MUX", "TreeView")]
 	public sealed partial class TreeViewPage : MUXTestPage
 	{
 		bool _disableClickToExpand;

diff --git a/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/TwoPaneViewTests/TwoPaneViewPage.xaml.cs b/...lesApp/UITests.Shared/Microsoft_UI_Xaml_Controls/TwoPaneViewTests/TwoPaneViewPage.xaml.cs
@@ -21,7 +21,7 @@
 
 namespace UITests.Shared.Microsoft_UI_Xaml_Controls.TwoPaneViewTests
 {
-	[Sample("TwoPaneView", "WinUI", Name="MUX_Test")]
+	[Sample("MUX", "WinUI", Name= "TwoPaneView")]
 	public sealed partial class TwoPaneViewPage : Page
     {
         // Need to be the same as c_defaultMinWideModeWidth/c_defaultMinTallModeHeight in TwoPaneViewFactory.cpp

diff --git a/src/SamplesApp/UITests.Shared/UITests.Shared.projitems b/src/SamplesApp/UITests.Shared/UITests.Shared.projitems
@@ -177,7 +177,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NumberBoxTests\MUX_Test.xaml">
+    <Page Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NumberBoxTests\NumberBoxPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -4697,8 +4697,8 @@
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NavigationViewTests\TopMode\NavigationViewTopNavStorePage.xaml.cs">
       <DependentUpon>NavigationViewTopNavStorePage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NumberBoxTests\MUX_Test.xaml.cs">
-      <DependentUpon>MUX_Test.xaml</DependentUpon>
+    <Compile Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NumberBoxTests\NumberBoxPage.xaml.cs">
+      <DependentUpon>NumberBoxPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="$(MSBuildThisFileDirectory)Microsoft_UI_Xaml_Controls\NumberBoxTests\NumberBox_Description.xaml.cs">
       <DependentUpon>NumberBox_Description.xaml</DependentUpon>

diff --git a/...plesApp/UITests.Shared/Windows_UI_Xaml_Controls/DropDownButton/DropDownButtonPage.xaml.cs b/...plesApp/UITests.Shared/Windows_UI_Xaml_Controls/DropDownButton/DropDownButtonPage.xaml.cs
@@ -14,7 +14,7 @@
 namespace MUXControlsTestApp
 {
 
-	[SampleControlInfo("DropDownButton", "MUX Page")]
+	[SampleControlInfo("MUX","DropDownButton")]
 	public sealed partial class DropDownButtonPage
 	{
 		private int _clickCount = 0;

diff --git a/...sApp/UITests.Shared/Windows_UI_Xaml_Controls/PersonPictureTests/PersonPicturePage.xaml.cs b/...sApp/UITests.Shared/Windows_UI_Xaml_Controls/PersonPictureTests/PersonPicturePage.xaml.cs
@@ -18,7 +18,7 @@
 
 namespace MUXControlsTestApp
 {
-	[SampleControlInfo("PersonPicture", "MUX Page")]
+	[SampleControlInfo("MUX","PersonPicture")]
 	public sealed partial class PersonPicturePage
     {
         private Uri imageUri = new Uri("ms-appx:///Assets/ingredient2.png");