diff --git a/MUXControls.sln b/MUXControls.sln
index 18ebf29ba3..11c9e31039 100644
--- a/MUXControls.sln
+++ b/MUXControls.sln
@@ -1,7 +1,7 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29009.5
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.757
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "dev", "dev", "{67599AD5-51EC-44CB-85CE-B60CD8CBA270}"
EndProject
@@ -672,6 +672,8 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "ComboBox_APITests", "dev\Co
EndProject
Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AutoSuggestBox_APITests", "dev\AutoSuggestBox\APITests\AutoSuggestBox_APITests.shproj", "{84673739-208C-427E-A19E-E090EC3733CE}"
EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "AutoSuggestBox_InteractionTests", "dev\AutoSuggestBox\InteractionTests\AutoSuggestBox_InteractionTests.shproj", "{ED3E2182-D259-4DC0-B7BB-9B4219762F4C}"
+EndProject
Global
GlobalSection(SharedMSBuildProjectFiles) = preSolution
dev\ComboBox\ComboBox.vcxitems*{00523caf-422a-4185-9392-d374b72a019a}*SharedItemsImports = 9
@@ -964,6 +966,7 @@ Global
dev\NavigationView\NavigationView_ApiTests\NavigationView_ApiTests.projitems*{e98f3da3-3c00-4f2e-bf3b-2d2ad9d176bc}*SharedItemsImports = 13
dev\ColorPicker\APITests\ColorPicker_APITests.projitems*{e9ac4938-ec2a-46d3-85bf-27316db8cc4d}*SharedItemsImports = 13
test\MUXControls.Test\MUXControls.Test.Shared.projitems*{e9fc52cd-519a-41bb-8092-523ffa9d5617}*SharedItemsImports = 13
+ dev\AutoSuggestBox\InteractionTests\AutoSuggestBox_InteractionTests.projitems*{ed3e2182-d259-4dc0-b7bb-9b4219762f4c}*SharedItemsImports = 13
dev\PullToRefresh\RefreshVisualizer\RefreshVisualizer.vcxitems*{ed7dba65-8f09-44f3-8d25-7bb5a7a89609}*SharedItemsImports = 9
dev\TreeView\TreeView.vcxitems*{eeb38379-3a5c-439f-bb5e-535d75f2b6c1}*SharedItemsImports = 9
dev\PullToRefresh\RefreshContainer\InteractionTests\RefreshContainer_InteractionTests.projitems*{f30fe0d3-2e44-405e-8519-ec3ab098c41f}*SharedItemsImports = 13
@@ -1669,6 +1672,7 @@ Global
{D8CEA3B7-0012-4F74-B50F-B46E9A93C979} = {7DAE09F6-69EB-4FB3-9F52-AF746CA84DC9}
{CA704A8C-2624-4630-89A0-D86CB1EE409A} = {4C9CEC92-77C8-4B7B-8595-6C736A660F93}
{84673739-208C-427E-A19E-E090EC3733CE} = {CFAFD6A7-FC7B-4C96-B292-A440C7C65D89}
+ {ED3E2182-D259-4DC0-B7BB-9B4219762F4C} = {CFAFD6A7-FC7B-4C96-B292-A440C7C65D89}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {D93836AB-52D3-4DE2-AE25-23F26F55ECED}
diff --git a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
index 55f199f066..b5d4878358 100644
--- a/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
+++ b/dev/AutoSuggestBox/AutoSuggestBox_themeresources.xaml
@@ -413,6 +413,9 @@
Background="{ThemeResource AutoSuggestBoxSuggestionsListBackground}"
contract7Present:CornerRadius="{TemplateBinding CornerRadius}"
contract7NotPresent:CornerRadius="{ThemeResource OverlayCornerRadius}">
+
+
+
+ Margin="{ThemeResource AutoSuggestListPadding}">
+
+
+
+
diff --git a/dev/AutoSuggestBox/InteractionTests/AutoSuggestBoxTests.cs b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBoxTests.cs
new file mode 100644
index 0000000000..a32f327b6d
--- /dev/null
+++ b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBoxTests.cs
@@ -0,0 +1,62 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See LICENSE in the project root for license information.
+
+using System;
+
+using Common;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Infra;
+using Windows.UI.Xaml.Tests.MUXControls.InteractionTests.Common;
+
+#if USING_TAEF
+using WEX.TestExecution;
+using WEX.TestExecution.Markup;
+using WEX.Logging.Interop;
+#else
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using Microsoft.VisualStudio.TestTools.UnitTesting.Logging;
+#endif
+
+using Microsoft.Windows.Apps.Test.Foundation.Controls;
+using Microsoft.Windows.Apps.Test.Foundation.Patterns;
+
+namespace Windows.UI.Xaml.Tests.MUXControls.InteractionTests
+{
+ [TestClass]
+ public class AutoSuggestBox
+ {
+ [ClassInitialize]
+ [TestProperty("RunAs", "User")]
+ [TestProperty("Classification", "Integration")]
+ [TestProperty("TestPass:IncludeOnlyOn", "Desktop")]
+ public static void ClassInitialize(TestContext testContext)
+ {
+ TestEnvironment.Initialize(testContext);
+ }
+
+ [TestCleanup]
+ public void TestCleanup()
+ {
+ TestCleanupHelper.Cleanup();
+ }
+
+ [TestMethod]
+ public void CanSelectSuggestion()
+ {
+ using (var setup = new TestSetupHelper("AutoSuggestBox Tests"))
+ {
+ Edit autoSuggestBoxTextBox = new Edit(FindElement.ByNameAndClassName("With suggestions", "TextBox"));
+ FocusHelper.SetFocus(autoSuggestBoxTextBox);
+ KeyboardHelper.EnterText(autoSuggestBoxTextBox, "test");
+ KeyboardHelper.PressKey(Key.Enter);
+ InvokeImplementation dolorItem = new InvokeImplementation(FindElement.ByNameAndClassName("dolor", "ListViewItem"));
+
+ using (ValueChangedEventWaiter waiter = new ValueChangedEventWaiter(autoSuggestBoxTextBox, "dolor"))
+ {
+ dolorItem.Invoke();
+ }
+
+ Verify.AreEqual("dolor", autoSuggestBoxTextBox.Value);
+ }
+ }
+ }
+}
diff --git a/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.projitems b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.projitems
new file mode 100644
index 0000000000..4784661dc4
--- /dev/null
+++ b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.projitems
@@ -0,0 +1,15 @@
+
+
+
+
+ $(MSBuildAllProjects);$(MSBuildThisFileFullPath)
+ true
+ afaad014-132c-4d2a-a28e-4ef717d3e647
+
+
+ AutoSuggestBox_InteractionTests
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.shproj b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.shproj
new file mode 100644
index 0000000000..8ac40b58a2
--- /dev/null
+++ b/dev/AutoSuggestBox/InteractionTests/AutoSuggestBox_InteractionTests.shproj
@@ -0,0 +1,14 @@
+
+
+
+
+ {ED3E2182-D259-4DC0-B7BB-9B4219762F4C}
+ 15.0
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml b/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml
index 99c64a1ed5..59b97d11c6 100644
--- a/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml
+++ b/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml
@@ -12,6 +12,7 @@
+
diff --git a/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml.cs b/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml.cs
index 22be275102..9f44310a1d 100644
--- a/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml.cs
+++ b/dev/AutoSuggestBox/TestUI/AutoSuggestBoxPage.xaml.cs
@@ -6,9 +6,23 @@ namespace MUXControlsTestApp
[TopLevelTestPage(Name = "AutoSuggestBox", Icon = "AutoSuggestBox.png")]
public sealed partial class AutoSuggestBoxPage : TestPage
{
+ string[] suggestions =
+ {
+ "Lorem",
+ "ipsum",
+ "dolor",
+ "sit",
+ "amet"
+ };
+
public AutoSuggestBoxPage()
{
this.InitializeComponent();
}
+
+ private void AutoSuggestBox_QuerySubmitted(Windows.UI.Xaml.Controls.AutoSuggestBox sender, Windows.UI.Xaml.Controls.AutoSuggestBoxQuerySubmittedEventArgs args)
+ {
+ sender.ItemsSource = string.IsNullOrWhiteSpace(args.QueryText) ? null : suggestions;
+ }
}
}
diff --git a/test/MUXControls.Test/MUXControls.Test.Shared.targets b/test/MUXControls.Test/MUXControls.Test.Shared.targets
index 20e892723e..50df975911 100644
--- a/test/MUXControls.Test/MUXControls.Test.Shared.targets
+++ b/test/MUXControls.Test/MUXControls.Test.Shared.targets
@@ -27,6 +27,7 @@
+