From d7ca569c2d5215cf2f22ff2363a813b3686c5ba9 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 30 Sep 2020 14:52:47 -0400
Subject: [PATCH 1/2] Adpat UITests to support multiple tests

---
 UITests/UITests.App/MainPage.xaml            | 11 ++++--
 UITests/UITests.App/MainPage.xaml.cs         |  7 +++-
 UITests/UITests.App/Pages/SimpleTest.xaml    | 14 +++++++
 UITests/UITests.App/Pages/SimpleTest.xaml.cs | 39 ++++++++++++++++++++
 UITests/UITests.App/UITests.App.csproj       |  9 ++++-
 UITests/UITests.Tests.Shared/Tests.cs        | 12 +++++-
 6 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 UITests/UITests.App/Pages/SimpleTest.xaml
 create mode 100644 UITests/UITests.App/Pages/SimpleTest.xaml.cs

diff --git a/UITests/UITests.App/MainPage.xaml b/UITests/UITests.App/MainPage.xaml
index d38db07e3e3..a9491449baa 100644
--- a/UITests/UITests.App/MainPage.xaml
+++ b/UITests/UITests.App/MainPage.xaml
@@ -9,11 +9,16 @@
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="*" />
+            <RowDefinition Height="Auto" />
+        </Grid.RowDefinitions>
         <testhelpers:TestAutomationHelpersPanel />
 
-        <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
-            <Button Content="Click Me" Click="Button_Click"/>
-            <TextBlock x:Name="textBlock"/>
+        <Frame x:Name="navigationFrame" />
+        
+        <StackPanel Orientation="Horizontal" Grid.Row="1" >
+            <Button Content="Simple" Click="btnSimple_Click" />
         </StackPanel>
     </Grid>
 </Page>
diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
index b44c1291f46..e9eb160cb84 100644
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -2,6 +2,9 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using UITests.App.Pages;
+using Windows.UI.Xaml;
+
 namespace UITests.App
 {
     public sealed partial class MainPage
@@ -11,9 +14,9 @@ public MainPage()
             InitializeComponent();
         }
 
-        private void Button_Click(object sender, Windows.UI.Xaml.RoutedEventArgs e)
+        private void btnSimple_Click(object sender, RoutedEventArgs e)
         {
-            textBlock.Text = "Clicked";
+            navigationFrame.Navigate(typeof(SimpleTest));
         }
     }
 }
diff --git a/UITests/UITests.App/Pages/SimpleTest.xaml b/UITests/UITests.App/Pages/SimpleTest.xaml
new file mode 100644
index 00000000000..d9109de6bc7
--- /dev/null
+++ b/UITests/UITests.App/Pages/SimpleTest.xaml
@@ -0,0 +1,14 @@
+<Page
+    x:Class="UITests.App.Pages.SimpleTest"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:UITests.App.Pages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Button Content="Click Me" Click="Button_Click"/>
+        <TextBlock x:Name="textBlock"/>
+    </StackPanel>
+</Page>
diff --git a/UITests/UITests.App/Pages/SimpleTest.xaml.cs b/UITests/UITests.App/Pages/SimpleTest.xaml.cs
new file mode 100644
index 00000000000..cd9534b5e8c
--- /dev/null
+++ b/UITests/UITests.App/Pages/SimpleTest.xaml.cs
@@ -0,0 +1,39 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace UITests.App.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class SimpleTest : Page
+    {
+        public SimpleTest()
+        {
+            this.InitializeComponent();
+        }
+
+        private void Button_Click(object sender, RoutedEventArgs e)
+        {
+            textBlock.Text = "Clicked";
+        }
+    }
+}
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 48fc8de5936..8427fe82dcf 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -133,6 +133,9 @@
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\SimpleTest.xaml.cs">
+      <DependentUpon>SimpleTest.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -159,6 +162,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Pages\SimpleTest.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
@@ -252,4 +259,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index bba017d8c9e..6a2bd4d8b96 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -98,8 +98,10 @@ public void TestCleanup()
         }
 
         [TestMethod]
-        public void SimpleLaunchTest()
+        public void SimpleTest()
         {
+            OpenTest("Simple");
+
             var button = new Button(FindElement.ByName("Click Me"));
             var textBlock = new TextBlock(FindElement.ById("textBlock"));
 
@@ -113,5 +115,13 @@ public void SimpleLaunchTest()
 
             Verify.AreEqual("Clicked", textBlock.GetText());
         }
+
+        private static void OpenTest(string name)
+        {
+            var btn = new Button(FindElement.ByName(name));
+            Verify.IsNotNull(btn);
+            btn.Click();
+            Wait.ForIdle();
+        }
     }
 }
\ No newline at end of file

From 1850ad57cb3b0b2d57e8f21e146ba9bc134b2986 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Wed, 30 Sep 2020 14:57:28 -0400
Subject: [PATCH 2/2] Added TextBoxMask binding to property test.

---
 UITests/UITests.App/MainPage.xaml             |  1 +
 UITests/UITests.App/MainPage.xaml.cs          |  5 ++
 UITests/UITests.App/Pages/TextBoxMask.xaml    | 52 ++++++++++++++++
 UITests/UITests.App/Pages/TextBoxMask.xaml.cs | 62 +++++++++++++++++++
 UITests/UITests.App/UITests.App.csproj        |  7 +++
 UITests/UITests.Tests.Shared/Tests.cs         | 20 ++++++
 6 files changed, 147 insertions(+)
 create mode 100644 UITests/UITests.App/Pages/TextBoxMask.xaml
 create mode 100644 UITests/UITests.App/Pages/TextBoxMask.xaml.cs

diff --git a/UITests/UITests.App/MainPage.xaml b/UITests/UITests.App/MainPage.xaml
index a9491449baa..1cd1a25443b 100644
--- a/UITests/UITests.App/MainPage.xaml
+++ b/UITests/UITests.App/MainPage.xaml
@@ -19,6 +19,7 @@
         
         <StackPanel Orientation="Horizontal" Grid.Row="1" >
             <Button Content="Simple" Click="btnSimple_Click" />
+            <Button Content="TextBox Mask" Click="btnTextBoxMask_Click" />
         </StackPanel>
     </Grid>
 </Page>
diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
index e9eb160cb84..f1a6fdb2de2 100644
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -18,5 +18,10 @@ private void btnSimple_Click(object sender, RoutedEventArgs e)
         {
             navigationFrame.Navigate(typeof(SimpleTest));
         }
+        
+        private void btnTextBoxMask_Click(object sender, RoutedEventArgs e)
+        {
+            navigationFrame.Navigate(typeof(TextBoxMask));
+        }
     }
 }
diff --git a/UITests/UITests.App/Pages/TextBoxMask.xaml b/UITests/UITests.App/Pages/TextBoxMask.xaml
new file mode 100644
index 00000000000..407adb984aa
--- /dev/null
+++ b/UITests/UITests.App/Pages/TextBoxMask.xaml
@@ -0,0 +1,52 @@
+<Page
+    x:Class="UITests.App.Pages.TextBoxMask"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:local="using:UITests.App.Pages"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    xmlns:extensions="using:Microsoft.Toolkit.Uwp.UI.Extensions"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+    <Grid HorizontalAlignment="Center" VerticalAlignment="Center">
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="10"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto"/>
+            <ColumnDefinition Width="10"/>
+            <ColumnDefinition Width="Auto"/>
+        </Grid.ColumnDefinitions>
+        <Button 
+            x:Name="ChangeButton" 
+            Content="Change Target Value"
+            Click="ChangeButton_Click"
+            Grid.Column="0" Grid.Row="0"
+            />
+        <TextBox 
+            x:Name="TextBox"
+            Width="120"
+	        Padding="0,4,0,0"
+            VerticalAlignment="Center"
+            extensions:TextBoxMask.CustomMask="5:[0-5]"
+            extensions:TextBoxMask.Mask="99:59:59"
+            TextAlignment="Center"
+            Text="{x:Bind Value, Mode=OneWay}"
+            Grid.Column="2" Grid.Row="0"
+            />
+        <TextBlock 
+            x:Name="InitialValueTextBlock"
+            Text="{x:Bind InitialValue}"
+            HorizontalAlignment="Center"
+            Grid.Column="0" Grid.Row="2"
+            />
+        <TextBlock
+            x:Name="NewValueTextBlock"
+            Text="{x:Bind NewValue}"
+            HorizontalAlignment="Center"
+            Grid.Column="2" Grid.Row="2"
+            />
+    </Grid>
+</Page>
diff --git a/UITests/UITests.App/Pages/TextBoxMask.xaml.cs b/UITests/UITests.App/Pages/TextBoxMask.xaml.cs
new file mode 100644
index 00000000000..859f1062c87
--- /dev/null
+++ b/UITests/UITests.App/Pages/TextBoxMask.xaml.cs
@@ -0,0 +1,62 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.IO;
+using System.Linq;
+using System.Runtime.InteropServices.WindowsRuntime;
+using System.Windows.Input;
+using Windows.Foundation;
+using Windows.Foundation.Collections;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Controls.Primitives;
+using Windows.UI.Xaml.Data;
+using Windows.UI.Xaml.Input;
+using Windows.UI.Xaml.Media;
+using Windows.UI.Xaml.Navigation;
+
+// The Blank Page item template is documented at https://go.microsoft.com/fwlink/?LinkId=234238
+
+namespace UITests.App.Pages
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class TextBoxMask : Page, INotifyPropertyChanged
+    {
+        private const string INITIAL_VALUE = "12:50:59";
+        private const string NEW_VALUE = "00:00:00";
+
+        private string _value = INITIAL_VALUE;
+
+        public string InitialValue => INITIAL_VALUE;
+
+        public string NewValue => NEW_VALUE;
+
+        public string Value
+        {
+            get => _value;
+            set
+            {
+                _value = value;
+                PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(nameof(Value)));
+            }
+        }
+
+        public TextBoxMask()
+        {
+            this.InitializeComponent();
+        }
+
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void ChangeButton_Click(object sender, RoutedEventArgs e)
+        {
+            Value = NEW_VALUE;
+        }
+    }
+}
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 8427fe82dcf..0d6dcdbacf8 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -136,6 +136,9 @@
     <Compile Include="Pages\SimpleTest.xaml.cs">
       <DependentUpon>SimpleTest.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\TextBoxMask.xaml.cs">
+      <DependentUpon>TextBoxMask.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
@@ -166,6 +169,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\TextBoxMask.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 6a2bd4d8b96..8e64002b9e6 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -116,6 +116,26 @@ public void SimpleTest()
             Verify.AreEqual("Clicked", textBlock.GetText());
         }
 
+        [TestMethod]
+        public void TestTextBoxMaskBinding_Property()
+        {
+            OpenTest("TextBox Mask");
+
+            var initialValue = FindElement.ById<TextBlock>("InitialValueTextBlock").GetText();
+            var textBox = FindElement.ById<Edit>("TextBox");
+
+            Verify.AreEqual(initialValue, textBox.GetText());
+
+            var changeButton = FindElement.ById<Button>("ChangeButton");
+
+            changeButton.Click();
+            Wait.ForIdle();
+
+            var newValue = FindElement.ById<TextBlock>("NewValueTextBlock").GetText();
+
+            Verify.AreEqual(newValue, textBox.GetText());
+        }
+
         private static void OpenTest(string name)
         {
             var btn = new Button(FindElement.ByName(name));