Switch to using VisualUITestBase for general TokenizingTextBox tests, use proper async tests

Also splits out Clear test into two separate tests.

Author: michael-hawker

UnitTests/UnitTests.UWP/UI/Controls/Test_TokenizingTextBox_General.cs

@@ -2,23 +2,28 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 // See the LICENSE file in the project root for more information.
 
+using Microsoft.Toolkit.Uwp;
 using Microsoft.Toolkit.Uwp.UI;
 using Microsoft.Toolkit.Uwp.UI.Controls;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using Microsoft.VisualStudio.TestTools.UnitTesting.AppContainer;
+using System.Threading.Tasks;
 using Windows.UI.Xaml;
+using Windows.UI.Xaml.Controls;
 using Windows.UI.Xaml.Markup;
 
 namespace UnitTests.UWP.UI.Controls
 {
     [TestClass]
-    public class Test_TokenizingTextBox_General
+    public class Test_TokenizingTextBox_General : VisualUITestBase
     {
         [TestCategory("Test_TokenizingTextBox_General")]
-        [UITestMethod]
-        public void Test_Clear()
+        [TestMethod]
+        public async Task Test_ClearTokens()
         {
-            var treeRoot = XamlReader.Load(
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
 @"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
@@ -29,49 +34,90 @@ public void Test_Clear()
 
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
 
-            var tokenBox = treeRoot.FindChild("tokenboxname") as TokenizingTextBox;
+                await SetTestContentAsync(treeRoot);
 
-            Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
+                var tokenBox = treeRoot.FindChild("tokenboxname") as TokenizingTextBox;
 
-            Assert.AreEqual(tokenBox.Items.Count, 1, "Token default items failed");
+                Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
+                Assert.AreEqual(1, tokenBox.Items.Count, "Token default items failed");
 
-            tokenBox.AddTokenItem("TokenItem1");
-            tokenBox.AddTokenItem("TokenItem2");
-            tokenBox.AddTokenItem("TokenItem3");
-            tokenBox.AddTokenItem("TokenItem4");
+                // Add 4 items
+                tokenBox.AddTokenItem("TokenItem1");
+                tokenBox.AddTokenItem("TokenItem2");
+                tokenBox.AddTokenItem("TokenItem3");
+                tokenBox.AddTokenItem("TokenItem4");
 
-            Assert.AreEqual(tokenBox.Items.Count, 5, "Token Add count failed");
+                Assert.AreEqual(5, tokenBox.Items.Count, "Token Add count failed"); // 5th item is the textbox
 
-            // now test clear
-            Assert.IsTrue(tokenBox.ClearAsync().Wait(200), "Failed to wait for Clear() to finish");
+                var count = 0;
 
-            Assert.AreEqual(tokenBox.Items.Count, 1, "Clear Failed to clear");
+                tokenBox.TokenItemRemoving += (sender, args) => { count++; };
 
-            // test cancelled clear
-            tokenBox.AddTokenItem("TokenItem1");
-            tokenBox.AddTokenItem("TokenItem2");
-            tokenBox.AddTokenItem("TokenItem3");
-            tokenBox.AddTokenItem("TokenItem4");
+                // now test clear
+                await tokenBox.ClearAsync();
 
-            Assert.AreEqual(tokenBox.Items.Count, 5, "Token Add count failed");
+                Assert.AreEqual(1, tokenBox.Items.Count, "Clear Failed to clear"); // Still expect textbox to remain
+                Assert.AreEqual(4, count, "Did not receive 4 removal events.");
+            });
+        }
 
-            tokenBox.TokenItemRemoving += (sender, args) => { args.Cancel = true; };
+        [TestCategory("Test_TokenizingTextBox_General")]
+        [TestMethod]
+        public async Task Test_ClearTokenCancel()
+        {
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var treeRoot = XamlReader.Load(
+@"<Page
+    xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
+    xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
+    xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
 
-            Assert.IsTrue(tokenBox.ClearAsync().Wait(200), "Failed to wait for Clear() to finish");
+    <controls:TokenizingTextBox x:Name=""tokenboxname"">
+    </controls:TokenizingTextBox>
+
+</Page>") as FrameworkElement;
 
-            Assert.AreEqual(tokenBox.Items.Count, 5, "Cancelled Clear Failed ");
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+
+                await SetTestContentAsync(treeRoot);
+
+                var tokenBox = treeRoot.FindChild("tokenboxname") as TokenizingTextBox;
+
+                Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
+                Assert.AreEqual(1, tokenBox.Items.Count, "Token default items failed");
+
+                // test cancelled clear
+                tokenBox.AddTokenItem("TokenItem1");
+                tokenBox.AddTokenItem("TokenItem2");
+                tokenBox.AddTokenItem("TokenItem3");
+                tokenBox.AddTokenItem("TokenItem4");
+
+                Assert.AreEqual(5, tokenBox.Items.Count, "Token Add count failed");
+
+                tokenBox.TokenItemRemoving += (sender, args) => { args.Cancel = true; };
+
+                await tokenBox.ClearAsync();
+
+                // Should have the same number of items left
+                Assert.AreEqual(5, tokenBox.Items.Count, "Cancelled Clear Failed ");
+
+                // TODO: We should have test for individual removal as well.
+            });
         }
 
         [TestCategory("Test_TokenizingTextBox_General")]
-        [UITestMethod]
-        public void Test_MaximumTokens()
+        [TestMethod]
+        public async Task Test_MaximumTokens()
         {
-            var maxTokens = 2;
+            await App.DispatcherQueue.EnqueueAsync(async () =>
+            {
+                var maxTokens = 2;
 
-            var treeRoot = XamlReader.Load(
-$@"<Page
+                var treeRoot = XamlReader.Load(
+    $@"<Page
     xmlns=""http://schemas.microsoft.com/winfx/2006/xaml/presentation""
     xmlns:x=""http://schemas.microsoft.com/winfx/2006/xaml""
     xmlns:controls=""using:Microsoft.Toolkit.Uwp.UI.Controls"">
@@ -81,39 +127,42 @@ public void Test_MaximumTokens()
 
 </Page>") as FrameworkElement;
 
-            Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+                Assert.IsNotNull(treeRoot, "Could not load XAML tree.");
+
+                await SetTestContentAsync(treeRoot);
 
-            var tokenBox = treeRoot.FindChild("tokenboxname") as TokenizingTextBox;
+                var tokenBox = treeRoot.FindChild("tokenboxname") as TokenizingTextBox;
 
-            Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
+                Assert.IsNotNull(tokenBox, "Could not find TokenizingTextBox in tree.");
 
-            // Items includes the text fields as well, so we can expect at least one item to exist initially, the input box.
-            // Use the starting count as an offset.
-            var startingItemsCount = tokenBox.Items.Count;
+                // Items includes the text fields as well, so we can expect at least one item to exist initially, the input box.
+                // Use the starting count as an offset.
+                var startingItemsCount = tokenBox.Items.Count;
 
-            // Add two items.
-            tokenBox.AddTokenItem("TokenItem1");
-            tokenBox.AddTokenItem("TokenItem2");
+                // Add two items.
+                tokenBox.AddTokenItem("TokenItem1");
+                tokenBox.AddTokenItem("TokenItem2");
 
-            // Make sure we have the appropriate amount of items and that they are in the appropriate order.
-            Assert.AreEqual(startingItemsCount + maxTokens, tokenBox.Items.Count, "Token Add failed");
-            Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
-            Assert.AreEqual("TokenItem2", tokenBox.Items[1]);
+                // Make sure we have the appropriate amount of items and that they are in the appropriate order.
+                Assert.AreEqual(startingItemsCount + maxTokens, tokenBox.Items.Count, "Token Add failed");
+                Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
+                Assert.AreEqual("TokenItem2", tokenBox.Items[1]);
 
-            // Attempt to add an additional item, beyond the maximum.
-            tokenBox.AddTokenItem("TokenItem3");
+                // Attempt to add an additional item, beyond the maximum.
+                tokenBox.AddTokenItem("TokenItem3");
 
-            // Check that the number of items did not change, because the maximum number of items are already present.
-            Assert.AreEqual(startingItemsCount + maxTokens, tokenBox.Items.Count, "Token Add succeeded, where it should have failed.");
-            Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
-            Assert.AreEqual("TokenItem2", tokenBox.Items[1]);
+                // Check that the number of items did not change, because the maximum number of items are already present.
+                Assert.AreEqual(startingItemsCount + maxTokens, tokenBox.Items.Count, "Token Add succeeded, where it should have failed.");
+                Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
+                Assert.AreEqual("TokenItem2", tokenBox.Items[1]);
 
-            // Reduce the maximum number of tokens.
-            tokenBox.MaximumTokens = 1;
+                // Reduce the maximum number of tokens.
+                tokenBox.MaximumTokens = 1;
 
-            // The last token should be removed to account for the reduced maximum.
-            Assert.AreEqual(startingItemsCount + 1, tokenBox.Items.Count);
-            Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
+                // The last token should be removed to account for the reduced maximum.
+                Assert.AreEqual(startingItemsCount + 1, tokenBox.Items.Count);
+                Assert.AreEqual("TokenItem1", tokenBox.Items[0]);
+            });
         }
     }
 }