From d54403c57836257cd7a28b92d9ea7184ce803710 Mon Sep 17 00:00:00 2001
From: oneonezhang <oneonezhang@users.noreply.github.com>
Date: Tue, 3 Aug 2021 12:29:35 +0800
Subject: [PATCH] add automation name for history and memory list item (#1628)

* add automation name for history and memory list item

* fix UI tests

Co-authored-by: Yiyi Zhang <Yiyi.Zhang@microsoft.com>
---
 src/Calculator/Views/HistoryList.xaml            |  7 ++++---
 src/Calculator/Views/HistoryList.xaml.cs         |  5 +++++
 src/Calculator/Views/Memory.xaml                 |  4 ++--
 src/Calculator/Views/MemoryListItem.xaml         |  3 ++-
 src/CalculatorUITestFramework/HistoryItem.cs     |  6 ++++--
 src/CalculatorUITestFramework/MemoryItem.cs      |  2 +-
 src/CalculatorUITests/HistoryFunctionalTests.cs  | 16 ++++++++--------
 .../StandardModeFunctionalTests.cs               | 14 +++++++-------
 8 files changed, 33 insertions(+), 24 deletions(-)

diff --git a/src/Calculator/Views/HistoryList.xaml b/src/Calculator/Views/HistoryList.xaml
index bd1e65a..f8051cf 100644
--- a/src/Calculator/Views/HistoryList.xaml
+++ b/src/Calculator/Views/HistoryList.xaml
@@ -4,6 +4,7 @@
              xmlns:automation="using:CalculatorApp.ViewModel.Common.Automation"
              xmlns:converters="using:CalculatorApp.Converters"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:local="using:CalculatorApp"
              xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
              xmlns:model="using:CalculatorApp.ViewModel"
              xmlns:muxc="using:Microsoft.UI.Xaml.Controls"
@@ -56,14 +57,14 @@
             </MenuFlyout>
 
             <DataTemplate x:Key="HistoryItemTemplate" x:DataType="model:HistoryItemViewModel">
-                <muxc:SwipeControl RightItems="{StaticResource HistorySwipeItems}">
+                <muxc:SwipeControl AutomationProperties.Name="{x:Bind local:HistoryList.GetHistoryItemAutomationName(AccExpression, AccResult)}" RightItems="{StaticResource HistorySwipeItems}">
                     <StackPanel Margin="0,6,16,6" Background="Transparent">
                         <TextBlock x:Name="ExprTextBlock"
                                    Margin="0,0,0,4"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource BodyTextBlockMediumStyle}"
+                                   AutomationProperties.AccessibilityView="Raw"
                                    AutomationProperties.AutomationId="HistoryItemExpression"
-                                   AutomationProperties.Name="{x:Bind AccExpression}"
                                    IsTextSelectionEnabled="True"
                                    Text="{x:Bind Expression}"
                                    TextAlignment="Right"
@@ -71,8 +72,8 @@
                         <TextBlock x:Name="ResultTextBlock"
                                    HorizontalAlignment="Right"
                                    Style="{ThemeResource SubtitleTextBlockStyle}"
+                                   AutomationProperties.AccessibilityView="Raw"
                                    AutomationProperties.AutomationId="HistoryItemValue"
-                                   AutomationProperties.Name="{x:Bind AccResult}"
                                    IsTextSelectionEnabled="True"
                                    Text="{x:Bind Result}"
                                    TextAlignment="Right"
diff --git a/src/Calculator/Views/HistoryList.xaml.cs b/src/Calculator/Views/HistoryList.xaml.cs
index 14faadd..a473e56 100644
--- a/src/Calculator/Views/HistoryList.xaml.cs
+++ b/src/Calculator/Views/HistoryList.xaml.cs
@@ -43,6 +43,11 @@ public Windows.UI.Xaml.GridLength RowHeight
         public static readonly DependencyProperty RowHeightProperty =
             DependencyProperty.Register(nameof(RowHeight), typeof(Windows.UI.Xaml.GridLength), typeof(HistoryList), new PropertyMetadata(default(Windows.UI.Xaml.GridLength)));
 
+        public static string GetHistoryItemAutomationName(string accExpression, string accResult)
+        {
+            return $"{accExpression} {accResult}";
+        }
+
         private void ListView_ItemClick(object sender, ItemClickEventArgs e)
         {
             HistoryViewModel historyVM = (DataContext as HistoryViewModel);
diff --git a/src/Calculator/Views/Memory.xaml b/src/Calculator/Views/Memory.xaml
index a435423..1c476f9 100644
--- a/src/Calculator/Views/Memory.xaml
+++ b/src/Calculator/Views/Memory.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.Memory"
+<UserControl x:Class="CalculatorApp.Memory"
              xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
              xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
              xmlns:common="using:CalculatorApp.Common"
@@ -36,7 +36,7 @@
         </MenuFlyout>
 
         <DataTemplate x:Key="MemoryItemTemplate" x:DataType="model:MemoryItemViewModel">
-            <local:MemoryListItem Model="{x:Bind Mode=OneWay}"/>
+            <local:MemoryListItem AutomationProperties.Name="{x:Bind Value, Mode=OneWay}" Model="{x:Bind Mode=OneWay}"/>
         </DataTemplate>
         <Style x:Key="MemoryItemContainerStyle"
                BasedOn="{StaticResource ConditionalHistoryMemoryItemContainerStyle}"
diff --git a/src/Calculator/Views/MemoryListItem.xaml b/src/Calculator/Views/MemoryListItem.xaml
index f4687e5..230c2d0 100644
--- a/src/Calculator/Views/MemoryListItem.xaml
+++ b/src/Calculator/Views/MemoryListItem.xaml
@@ -1,4 +1,4 @@
-<UserControl x:Class="CalculatorApp.MemoryListItem"
+<UserControl x:Class="CalculatorApp.MemoryListItem"
              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"
@@ -52,6 +52,7 @@
             <TextBlock Margin="0,4,20,0"
                        HorizontalAlignment="Right"
                        Style="{ThemeResource SubtitleTextBlockStyle}"
+                       AutomationProperties.AccessibilityView="Raw"
                        AutomationProperties.AutomationId="MemoryItemValue"
                        FlowDirection="LeftToRight"
                        IsTextSelectionEnabled="True"
diff --git a/src/CalculatorUITestFramework/HistoryItem.cs b/src/CalculatorUITestFramework/HistoryItem.cs
index cc5f736..6faabf1 100644
--- a/src/CalculatorUITestFramework/HistoryItem.cs
+++ b/src/CalculatorUITestFramework/HistoryItem.cs
@@ -19,11 +19,13 @@ public HistoryItem(AppiumWebElement item)
 
         public string GetValue()
         {
-            return Item.FindElementByAccessibilityId("HistoryItemValue")?.Text;
+            var equalSignIndex = Item.Text.IndexOf("=");
+            return Item.Text.Substring(equalSignIndex + 1).Trim();
         }
         public string GetExpression()
         {
-            return Item.FindElementByAccessibilityId("HistoryItemExpression")?.Text;
+            var equalSignIndex = Item.Text.IndexOf("=");
+            return Item.Text.Substring(0, equalSignIndex + 1).Trim();
         }
     }
 }
diff --git a/src/CalculatorUITestFramework/MemoryItem.cs b/src/CalculatorUITestFramework/MemoryItem.cs
index 5bc2289..2f6838f 100644
--- a/src/CalculatorUITestFramework/MemoryItem.cs
+++ b/src/CalculatorUITestFramework/MemoryItem.cs
@@ -19,7 +19,7 @@ public MemoryItem(AppiumWebElement item)
 
         public string GetValue()
         {
-            return Item.FindElementByAccessibilityId("MemoryItemValue")?.Text;
+            return Item.Text;
         }
     }
 }
diff --git a/src/CalculatorUITests/HistoryFunctionalTests.cs b/src/CalculatorUITests/HistoryFunctionalTests.cs
index 406f842..a61fd24 100644
--- a/src/CalculatorUITests/HistoryFunctionalTests.cs
+++ b/src/CalculatorUITests/HistoryFunctionalTests.cs
@@ -88,10 +88,10 @@ public void StandardHistory_Panel()
             page.StandardOperators.EqualButton.Click();
 
             var historyItems = page.HistoryPanel.GetAllHistoryListViewItems();
-            Assert.IsTrue(historyItems[0].GetValue().Equals("-1", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[0].GetExpression().Equals("2   -   3 =", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[1].GetValue().Equals("-5.6", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[1].GetExpression().Equals("-3   +   -2.6 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[0].GetValue().Equals("Minus (1", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[0].GetExpression().Equals("2 Minus ( 3=", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[1].GetValue().Equals("Minus (5.6", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[1].GetExpression().Equals("-3 + -2.6=", StringComparison.InvariantCultureIgnoreCase));
 
             Assert.AreEqual("-1", page.CalculatorResults.GetCalculatorResultText());
 
@@ -134,17 +134,17 @@ public void StandardHistory_Flyout()
 
             var historyPanelItems = page.HistoryPanel.GetAllHistoryListViewItems();
             Assert.IsTrue(historyPanelItems[0].GetValue().Equals("-1", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyPanelItems[0].GetExpression().Equals("2   -   3 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyPanelItems[0].GetExpression().Equals("2 - 3=", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(historyPanelItems[1].GetValue().Equals("-5.6", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyPanelItems[1].GetExpression().Equals("-3   +   -2.6 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyPanelItems[1].GetExpression().Equals("-3 + -2.6=", StringComparison.InvariantCultureIgnoreCase));
 
             Assert.AreEqual("-1", page.CalculatorResults.GetCalculatorResultText());
 
             var historyItems = page.HistoryPanel.GetAllHistoryFlyoutListViewItems();
             Assert.IsTrue(historyItems[0].GetValue().Equals("-1", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[0].GetExpression().Equals("2   -   3 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[0].GetExpression().Equals("2 - 3=", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(historyItems[1].GetValue().Equals("-5.6", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[1].GetExpression().Equals("-3   +   -2.6 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[1].GetExpression().Equals("-3 + -2.6=", StringComparison.InvariantCultureIgnoreCase));
 
             Assert.AreEqual("-1", page.CalculatorResults.GetCalculatorResultText());
 
diff --git a/src/CalculatorUITests/StandardModeFunctionalTests.cs b/src/CalculatorUITests/StandardModeFunctionalTests.cs
index c172941..68f3393 100644
--- a/src/CalculatorUITests/StandardModeFunctionalTests.cs
+++ b/src/CalculatorUITests/StandardModeFunctionalTests.cs
@@ -173,15 +173,15 @@ public void MouseInput_HistoryButtons()
             page.HistoryPanel.HistoryButton.Click();
             var historyFlyoutItems = page.HistoryPanel.GetAllHistoryFlyoutListViewItems();
             Assert.IsTrue(historyFlyoutItems[0].GetValue().Equals("3.333333333333333", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
-            Assert.IsTrue(historyFlyoutItems[0].GetExpression().Equals("20   ÷   6 =", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
+            Assert.IsTrue(historyFlyoutItems[0].GetExpression().Equals("20 ÷ 6=", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
             Assert.IsTrue(historyFlyoutItems[1].GetValue().Equals("20", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
-            Assert.IsTrue(historyFlyoutItems[1].GetExpression().Equals("4   ×   5 =", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
+            Assert.IsTrue(historyFlyoutItems[1].GetExpression().Equals("4 × 5=", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
             page.HistoryPanel.ResizeWindowToDisplayHistoryLabel();
             var historyItems = page.HistoryPanel.GetAllHistoryListViewItems();
             Assert.IsTrue(historyFlyoutItems[0].GetValue().Equals("3.333333333333333", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
-            Assert.IsTrue(historyFlyoutItems[0].GetExpression().Equals("20   ÷   6 =", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
+            Assert.IsTrue(historyFlyoutItems[0].GetExpression().Equals("20 ÷ 6=", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
             Assert.IsTrue(historyFlyoutItems[1].GetValue().Equals("20", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
-            Assert.IsTrue(historyFlyoutItems[1].GetExpression().Equals("4   ×   5 =", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
+            Assert.IsTrue(historyFlyoutItems[1].GetExpression().Equals("4 × 5=", StringComparison.InvariantCultureIgnoreCase)); //verifies History button
             page.HistoryPanel.ClearHistoryButton.Click();
             Assert.IsNotNull(WinAppDriver.Instance.CalculatorSession.FindElementByAccessibilityId("HistoryEmpty")); //verifies the History panel's clear history button
         }
@@ -575,9 +575,9 @@ public void MixedInput_Operators_Equal()
             Assert.AreEqual("0", page.CalculatorResults.GetCalculatorResultText());
             var historyItems = page.HistoryPanel.GetAllHistoryListViewItems();
             Assert.IsTrue(historyItems[0].GetValue().Equals("0", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[0].GetExpression().Equals("0 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[0].GetExpression().Equals("0=", StringComparison.InvariantCultureIgnoreCase));
             Assert.IsTrue(historyItems[1].GetValue().Equals("0", StringComparison.InvariantCultureIgnoreCase));
-            Assert.IsTrue(historyItems[1].GetExpression().Equals("0 =", StringComparison.InvariantCultureIgnoreCase));
+            Assert.IsTrue(historyItems[1].GetExpression().Equals("0=", StringComparison.InvariantCultureIgnoreCase));
             CalculatorApp.Window.SendKeys(Keys.Escape);
         }
 
@@ -711,7 +711,7 @@ public void AoT_HistoryFunction()
                 page.StandardAoTCalculatorPage.NavigateToStandardMode();
                 var historyItems = page.HistoryPanel.GetAllHistoryListViewItems();
                 Assert.IsTrue(historyItems[0].GetValue().Equals("6", StringComparison.InvariantCultureIgnoreCase));
-                Assert.IsTrue(historyItems[0].GetExpression().Equals("3   +   3 =", StringComparison.InvariantCultureIgnoreCase));
+                Assert.IsTrue(historyItems[0].GetExpression().Equals("3 + 3=", StringComparison.InvariantCultureIgnoreCase));
             }
         }