From 77adf77935a512563fcf4c07ab0001545d641585 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/6] 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    | 13 ++++++++++
 UITests/UITests.App/Pages/SimpleTest.xaml.cs | 25 ++++++++++++++++++++
 UITests/UITests.App/UITests.App.csproj       |  9 ++++++-
 UITests/UITests.Tests.Shared/Tests.cs        | 12 +++++++++-
 6 files changed, 70 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..1ab5d6484bc
--- /dev/null
+++ b/UITests/UITests.App/Pages/SimpleTest.xaml
@@ -0,0 +1,13 @@
+<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: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..db474735c36
--- /dev/null
+++ b/UITests/UITests.App/Pages/SimpleTest.xaml.cs
@@ -0,0 +1,25 @@
+// 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 Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+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 1eda700c371168de471dc3e770d2a235da2f23a5 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/6] 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    | 51 +++++++++++++++++++
 UITests/UITests.App/Pages/TextBoxMask.xaml.cs | 47 +++++++++++++++++
 UITests/UITests.App/UITests.App.csproj        |  7 +++
 UITests/UITests.Tests.Shared/Tests.cs         | 20 ++++++++
 6 files changed, 131 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..a5ac3bd151c 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..af00151a13c
--- /dev/null
+++ b/UITests/UITests.App/Pages/TextBoxMask.xaml
@@ -0,0 +1,51 @@
+<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: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..cdd88d8d16d
--- /dev/null
+++ b/UITests/UITests.App/Pages/TextBoxMask.xaml.cs
@@ -0,0 +1,47 @@
+// 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.ComponentModel;
+using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
+
+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));

From 06bfbc39e655e901c3fd7cd17ee8f76c602fe2d4 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 19 Oct 2020 14:10:29 -0400
Subject: [PATCH 3/6] Make Controls section, move TextBoxMask there.

---
 UITests/UITests.App/Pages/{ => Controls}/TextBoxMask.xaml    | 0
 UITests/UITests.App/Pages/{ => Controls}/TextBoxMask.xaml.cs | 0
 UITests/UITests.App/UITests.App.csproj                       | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename UITests/UITests.App/Pages/{ => Controls}/TextBoxMask.xaml (100%)
 rename UITests/UITests.App/Pages/{ => Controls}/TextBoxMask.xaml.cs (100%)

diff --git a/UITests/UITests.App/Pages/TextBoxMask.xaml b/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml
similarity index 100%
rename from UITests/UITests.App/Pages/TextBoxMask.xaml
rename to UITests/UITests.App/Pages/Controls/TextBoxMask.xaml
diff --git a/UITests/UITests.App/Pages/TextBoxMask.xaml.cs b/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml.cs
similarity index 100%
rename from UITests/UITests.App/Pages/TextBoxMask.xaml.cs
rename to UITests/UITests.App/Pages/Controls/TextBoxMask.xaml.cs
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 0d6dcdbacf8..112a4ac5630 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -136,7 +136,7 @@
     <Compile Include="Pages\SimpleTest.xaml.cs">
       <DependentUpon>SimpleTest.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\TextBoxMask.xaml.cs">
+    <Compile Include="Pages\Controls\TextBoxMask.xaml.cs">
       <DependentUpon>TextBoxMask.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
@@ -169,7 +169,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\TextBoxMask.xaml">
+    <Page Include="Pages\Controls\TextBoxMask.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

From 65885f93c8f9ecafd9672bc55475bafc13e859cb Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 19 Oct 2020 15:45:37 -0400
Subject: [PATCH 4/6] Rename `TextBoxMask` test page to `TextBoxMaskTestPage`

---
 UITests/UITests.App/MainPage.xaml.cs                        | 2 +-
 .../Controls/{TextBoxMask.xaml => TextBoxMaskTestPage.xaml} | 2 +-
 .../{TextBoxMask.xaml.cs => TextBoxMaskTestPage.xaml.cs}    | 4 ++--
 UITests/UITests.App/UITests.App.csproj                      | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)
 rename UITests/UITests.App/Pages/Controls/{TextBoxMask.xaml => TextBoxMaskTestPage.xaml} (97%)
 rename UITests/UITests.App/Pages/Controls/{TextBoxMask.xaml.cs => TextBoxMaskTestPage.xaml.cs} (90%)

diff --git a/UITests/UITests.App/MainPage.xaml.cs b/UITests/UITests.App/MainPage.xaml.cs
index a5ac3bd151c..8661c816ef5 100644
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -21,7 +21,7 @@ private void btnSimple_Click(object sender, RoutedEventArgs e)
 
         private void btnTextBoxMask_Click(object sender, RoutedEventArgs e)
         {
-            navigationFrame.Navigate(typeof(TextBoxMask));
+            navigationFrame.Navigate(typeof(TextBoxMaskTestPage));
         }
     }
 }
diff --git a/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml
similarity index 97%
rename from UITests/UITests.App/Pages/Controls/TextBoxMask.xaml
rename to UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml
index af00151a13c..96ce0c21194 100644
--- a/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml
+++ b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml
@@ -1,5 +1,5 @@
 <Page
-    x:Class="UITests.App.Pages.TextBoxMask"
+    x:Class="UITests.App.Pages.TextBoxMaskTestPage"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
diff --git a/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml.cs b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
similarity index 90%
rename from UITests/UITests.App/Pages/Controls/TextBoxMask.xaml.cs
rename to UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
index cdd88d8d16d..d9ee6836b79 100644
--- a/UITests/UITests.App/Pages/Controls/TextBoxMask.xaml.cs
+++ b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
@@ -11,7 +11,7 @@ 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
+    public sealed partial class TextBoxMaskTestPage : Page, INotifyPropertyChanged
     {
         private const string INITIAL_VALUE = "12:50:59";
         private const string NEW_VALUE = "00:00:00";
@@ -32,7 +32,7 @@ public string Value
             }
         }
 
-        public TextBoxMask()
+        public TextBoxMaskTestPage()
         {
             this.InitializeComponent();
         }
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index 112a4ac5630..ce0b52a33b4 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -136,8 +136,8 @@
     <Compile Include="Pages\SimpleTest.xaml.cs">
       <DependentUpon>SimpleTest.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\Controls\TextBoxMask.xaml.cs">
-      <DependentUpon>TextBoxMask.xaml</DependentUpon>
+    <Compile Include="Pages\Controls\TextBoxMaskTestPage.xaml.cs">
+      <DependentUpon>TextBoxMaskTestPage.xaml</DependentUpon>
     </Compile>
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -169,7 +169,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\Controls\TextBoxMask.xaml">
+    <Page Include="Pages\Controls\TextBoxMaskTestPage.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>

From a05cdda15aad0d05afef543c557956ce69a276bc Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Mon, 19 Oct 2020 16:46:55 -0400
Subject: [PATCH 5/6] Use DependencyProperty instead of NotificationProperty

---
 .../Pages/Controls/TextBoxMaskTestPage.xaml.cs | 18 ++++++------------
 1 file changed, 6 insertions(+), 12 deletions(-)

diff --git a/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
index d9ee6836b79..f872d27017e 100644
--- a/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
+++ b/UITests/UITests.App/Pages/Controls/TextBoxMaskTestPage.xaml.cs
@@ -2,7 +2,6 @@
 // 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.ComponentModel;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
 
@@ -11,34 +10,29 @@ 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 TextBoxMaskTestPage : Page, INotifyPropertyChanged
+    public sealed partial class TextBoxMaskTestPage : Page
     {
         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)));
-            }
+            get { return (string)GetValue(ValueProperty); }
+            set { SetValue(ValueProperty, value); }
         }
 
+        public static readonly DependencyProperty ValueProperty =
+            DependencyProperty.Register(nameof(Value), typeof(string), typeof(TextBoxMaskTestPage), new PropertyMetadata(INITIAL_VALUE));
+
         public TextBoxMaskTestPage()
         {
             this.InitializeComponent();
         }
 
-        public event PropertyChangedEventHandler PropertyChanged;
-
         private void ChangeButton_Click(object sender, RoutedEventArgs e)
         {
             Value = NEW_VALUE;

From 097e182da208ddd36ba8a442694ce0decc131279 Mon Sep 17 00:00:00 2001
From: Rosario Pulella <RosarioPulella@gmail.com>
Date: Fri, 23 Oct 2020 16:47:22 -0400
Subject: [PATCH 6/6] Use a Tcp connection to switch ui tests.

---
 UITests/UITests.App/DefaultPage.xaml     | 13 +++++
 UITests/UITests.App/DefaultPage.xaml.cs  | 19 +++++++
 UITests/UITests.App/MainPage.xaml        | 11 +----
 UITests/UITests.App/MainPage.xaml.cs     | 63 ++++++++++++++++++++++--
 UITests/UITests.App/Package.appxmanifest |  1 +
 UITests/UITests.App/UITests.App.csproj   | 15 ++++++
 UITests/UITests.Tests.Shared/Tests.cs    | 29 ++++++++---
 azure-pipelines.yml                      |  3 ++
 8 files changed, 132 insertions(+), 22 deletions(-)
 create mode 100644 UITests/UITests.App/DefaultPage.xaml
 create mode 100644 UITests/UITests.App/DefaultPage.xaml.cs

diff --git a/UITests/UITests.App/DefaultPage.xaml b/UITests/UITests.App/DefaultPage.xaml
new file mode 100644
index 00000000000..9796cadd1a1
--- /dev/null
+++ b/UITests/UITests.App/DefaultPage.xaml
@@ -0,0 +1,13 @@
+<Page
+    x:Class="UITests.App.DefaultPage"
+    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    mc:Ignorable="d"
+    Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
+
+    <Grid>
+
+    </Grid>
+</Page>
diff --git a/UITests/UITests.App/DefaultPage.xaml.cs b/UITests/UITests.App/DefaultPage.xaml.cs
new file mode 100644
index 00000000000..c5fa57ae8f4
--- /dev/null
+++ b/UITests/UITests.App/DefaultPage.xaml.cs
@@ -0,0 +1,19 @@
+// 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 Windows.UI.Xaml.Controls;
+
+namespace UITests.App
+{
+    /// <summary>
+    /// An empty page that can be used on its own or navigated to within a Frame.
+    /// </summary>
+    public sealed partial class DefaultPage : Page
+    {
+        public DefaultPage()
+        {
+            this.InitializeComponent();
+        }
+    }
+}
diff --git a/UITests/UITests.App/MainPage.xaml b/UITests/UITests.App/MainPage.xaml
index 1cd1a25443b..098a892077c 100644
--- a/UITests/UITests.App/MainPage.xaml
+++ b/UITests/UITests.App/MainPage.xaml
@@ -6,20 +6,11 @@
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     mc:Ignorable="d"
+    Loaded="Page_Loaded"
     Background="{ThemeResource ApplicationPageBackgroundThemeBrush}">
 
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition Height="*" />
-            <RowDefinition Height="Auto" />
-        </Grid.RowDefinitions>
         <testhelpers:TestAutomationHelpersPanel />
-
         <Frame x:Name="navigationFrame" />
-        
-        <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 8661c816ef5..d3a3821ea42 100644
--- a/UITests/UITests.App/MainPage.xaml.cs
+++ b/UITests/UITests.App/MainPage.xaml.cs
@@ -2,26 +2,79 @@
 // 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 System;
+using System.IO;
+using System.Net;
+using System.Net.Sockets;
+using System.Threading;
+using System.Threading.Tasks;
+using Windows.UI.Core;
 using Windows.UI.Xaml;
 
 namespace UITests.App
 {
     public sealed partial class MainPage
     {
+        private static readonly string _pageNS = typeof(MainPage).Namespace + ".Pages.";
+        private NetworkStream clientStream;
+        private StreamWriter writer;
+
         public MainPage()
         {
             InitializeComponent();
         }
 
-        private void btnSimple_Click(object sender, RoutedEventArgs e)
+        private void Page_Loaded(object sender, RoutedEventArgs e)
         {
-            navigationFrame.Navigate(typeof(SimpleTest));
+            navigationFrame.Navigate(typeof(DefaultPage));
+
+            Task.Run(ConnectToTestDriver);
         }
 
-        private void btnTextBoxMask_Click(object sender, RoutedEventArgs e)
+        private void ConnectToTestDriver()
         {
-            navigationFrame.Navigate(typeof(TextBoxMaskTestPage));
+            var client = new TcpClient();
+            client.ConnectAsync(IPAddress.Loopback, 13000);
+
+            clientStream = client.GetStream();
+            writer = new StreamWriter(clientStream)
+            {
+                AutoFlush = true
+            };
+
+            writer.WriteLine("Ready");
+
+            var thread = new Thread(new ThreadStart(ListenForPageRequest));
+            thread.Start();
+        }
+
+        private void ListenForPageRequest()
+        {
+            var reader = new StreamReader(clientStream);
+
+            while (true)
+            {
+                try
+                {
+                    if (reader.ReadLine() is string request)
+                    {
+                        var type = Type.GetType(_pageNS + request);
+                        Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () => navigationFrame.Navigate(type))
+                            .AsTask()
+                            .ContinueWith(_ => writer.WriteLine("Opened " + request));
+                    }
+                    else
+                    {
+                        // The server has disconnected
+                        break;
+                    }
+                }
+                catch
+                {
+                    // A socket error has occurred
+                    break;
+                }
+            }
         }
     }
 }
diff --git a/UITests/UITests.App/Package.appxmanifest b/UITests/UITests.App/Package.appxmanifest
index a17d7b8e653..6e55a84ad3d 100644
--- a/UITests/UITests.App/Package.appxmanifest
+++ b/UITests/UITests.App/Package.appxmanifest
@@ -45,5 +45,6 @@
 
   <Capabilities>
     <Capability Name="internetClient" />
+    <Capability Name="privateNetworkClientServer"/>
   </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/UITests/UITests.App/UITests.App.csproj b/UITests/UITests.App/UITests.App.csproj
index ce0b52a33b4..b11634a50c2 100644
--- a/UITests/UITests.App/UITests.App.csproj
+++ b/UITests/UITests.App/UITests.App.csproj
@@ -40,6 +40,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
     <OutputPath>bin\x86\Release\</OutputPath>
@@ -52,6 +53,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM'">
     <DebugSymbols>true</DebugSymbols>
@@ -63,6 +65,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM'">
     <OutputPath>bin\ARM\Release\</OutputPath>
@@ -75,6 +78,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|ARM64'">
     <DebugSymbols>true</DebugSymbols>
@@ -87,6 +91,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|ARM64'">
     <OutputPath>bin\ARM64\Release\</OutputPath>
@@ -99,6 +104,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
     <DebugSymbols>true</DebugSymbols>
@@ -110,6 +116,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -122,6 +129,7 @@
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
+    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
   <PropertyGroup>
     <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
@@ -130,6 +138,9 @@
     <Compile Include="App.xaml.cs">
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
+    <Compile Include="DefaultPage.xaml.cs">
+      <DependentUpon>DefaultPage.xaml</DependentUpon>
+    </Compile>
     <Compile Include="MainPage.xaml.cs">
       <DependentUpon>MainPage.xaml</DependentUpon>
     </Compile>
@@ -161,6 +172,10 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="DefaultPage.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
     <Page Include="MainPage.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
diff --git a/UITests/UITests.Tests.Shared/Tests.cs b/UITests/UITests.Tests.Shared/Tests.cs
index 8e64002b9e6..56cee816924 100644
--- a/UITests/UITests.Tests.Shared/Tests.cs
+++ b/UITests/UITests.Tests.Shared/Tests.cs
@@ -5,6 +5,8 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Net;
+using System.Net.Sockets;
 using System.Reflection;
 using Microsoft.Windows.Apps.Test.Foundation.Controls;
 using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
@@ -23,6 +25,9 @@ namespace UITests.Tests
     [TestClass]
     public class Tests
     {
+        private static StreamReader _streamReader;
+        private static StreamWriter _streamWriter;
+
         public static TestApplicationInfo WinUICsUWPSampleApp
         {
             get
@@ -83,7 +88,18 @@ public static TestSetupHelper.TestSetupHelperOptions TestSetupHelperOptions
         [TestProperty("Platform", "Any")]
         public static void ClassInitialize(TestContext testContext)
         {
+            var listener = new TcpListener(IPAddress.Loopback, 13000);
+            listener.Start();
+
             TestEnvironment.Initialize(testContext, WinUICsUWPSampleApp);
+
+            var client = listener.AcceptTcpClient();
+
+            var stream = client.GetStream();
+            _streamReader = new StreamReader(stream);
+            _streamWriter = new StreamWriter(stream);
+
+            Verify.AreEqual("Ready", _streamReader.ReadLine());
         }
 
         [ClassCleanup]
@@ -100,7 +116,7 @@ public void TestCleanup()
         [TestMethod]
         public void SimpleTest()
         {
-            OpenTest("Simple");
+            Verify.IsTrue(OpenTest("SimpleTest"));
 
             var button = new Button(FindElement.ByName("Click Me"));
             var textBlock = new TextBlock(FindElement.ById("textBlock"));
@@ -119,7 +135,7 @@ public void SimpleTest()
         [TestMethod]
         public void TestTextBoxMaskBinding_Property()
         {
-            OpenTest("TextBox Mask");
+            Verify.IsTrue(OpenTest("TextBoxMaskTestPage"));
 
             var initialValue = FindElement.ById<TextBlock>("InitialValueTextBlock").GetText();
             var textBox = FindElement.ById<Edit>("TextBox");
@@ -136,12 +152,11 @@ public void TestTextBoxMaskBinding_Property()
             Verify.AreEqual(newValue, textBox.GetText());
         }
 
-        private static void OpenTest(string name)
+        private static bool OpenTest(string name)
         {
-            var btn = new Button(FindElement.ByName(name));
-            Verify.IsNotNull(btn);
-            btn.Click();
-            Wait.ForIdle();
+            _streamWriter.WriteLine(name);
+            _streamWriter.Flush();
+            return _streamReader.ReadLine() == "Opened " + name;
         }
     }
 }
\ No newline at end of file
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 75d381267ec..f5032bca46e 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -39,6 +39,9 @@ jobs:
   - script: nbgv cloud
     displayName: Set Version
 
+  - powershell: 'CheckNetIsolation.exe LoopbackExempt -a -n=3568ebdf-5b6b-4ddd-bb17-462d614ba50f_gspb8g6x97k2t'
+    displayName: Enable Test networking
+
   #- powershell: .\build\Install-WindowsSdkISO.ps1 19041
   #  displayName: Insider SDK