From 7b4ff49df8195388c595319187928dd3bb430a07 Mon Sep 17 00:00:00 2001
From: Quentin <27322516+quentin987@users.noreply.github.com>
Date: Fri, 8 May 2020 12:32:17 -0500
Subject: [PATCH] Issue 935 - Updates to Scientific/Graphing Keypad  (#1214)

* Switching from Difference between dates to Add or subtract dates ignores the first date field

https://github.com/microsoft/calculator/issues/254

Date field needs to persist across Date Difference and Add/Subtract From Date Mode.

* Update DateCalculator.xaml.cpp

Addressing review comments (white space, small code refactor), also found a null pointer exception during testing, this fix addresses that as well.

* Issue 935 - Updates to Scientific/Graphing Keypad

Update Scientific and Graphing keyboard layouts to expose square root button at the top level

* Updated ScientificModeFunctionalTests/SmokeTest_Cube()

Updated broken test to work with changes.
---
 .../Views/CalculatorScientificOperators.xaml  | 24 +++++++++---------
 .../GraphingCalculator/GraphingNumPad.xaml    | 25 ++++++++++---------
 .../ScientificOperatorsPanel.cs               |  1 +
 .../ScientificModeFunctionalTests.cs          |  1 +
 4 files changed, 27 insertions(+), 24 deletions(-)

diff --git a/src/Calculator/Views/CalculatorScientificOperators.xaml b/src/Calculator/Views/CalculatorScientificOperators.xaml
index 2a614c52..a55bdaff 100644
--- a/src/Calculator/Views/CalculatorScientificOperators.xaml
+++ b/src/Calculator/Views/CalculatorScientificOperators.xaml
@@ -953,13 +953,13 @@
                                            ButtonId="XPower2"
                                            Content="&#xf7c8;"/>
 
-                <controls:CalculatorButton x:Name="XPower3Button"
-                                           x:Uid="xpower3Button"
+                <controls:CalculatorButton x:Name="SquareRootButton"
+                                           x:Uid="squareRootButton"
                                            Grid.Row="1"
-                                           Style="{StaticResource SymbolOperatorButtonStyle}"
-                                           AutomationProperties.AutomationId="xpower3Button"
-                                           ButtonId="Cube"
-                                           Content="&#xf7cb;"/>
+                                           Style="{StaticResource EmphasizedCalcButtonStyle}"
+                                           AutomationProperties.AutomationId="squareRootButton"
+                                           ButtonId="Sqrt"
+                                           Content="&#xF899;"/>
 
                 <controls:CalculatorButton x:Name="PowerButton"
                                            x:Uid="powerButton"
@@ -1004,13 +1004,13 @@
                     <RowDefinition/>
                     <RowDefinition/>
                 </Grid.RowDefinitions>
-                <controls:CalculatorButton x:Name="SquareRootButton"
-                                           x:Uid="squareRootButton"
-                                           Style="{StaticResource EmphasizedCalcButtonStyle}"
-                                           AutomationProperties.AutomationId="squareRootButton"
-                                           ButtonId="Sqrt"
+                <controls:CalculatorButton x:Name="XPower3Button"
+                                           x:Uid="xpower3Button"
+                                           Style="{StaticResource SymbolOperatorButtonStyle}"
+                                           AutomationProperties.AutomationId="xpower3Button"
+                                           ButtonId="Cube"
                                            Click="ShiftButton_Uncheck"
-                                           Content="&#xF899;"/>
+                                           Content="&#xf7cb;"/>
 
                 <controls:CalculatorButton x:Name="CubeRootButton"
                                            x:Uid="cubeRootButton"
diff --git a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
index 3fc9541f..a4f47069 100644
--- a/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
+++ b/src/Calculator/Views/GraphingCalculator/GraphingNumPad.xaml
@@ -998,14 +998,14 @@
                                                Content="&#xf7c8;"
                                                IsTabStop="false"/>
 
-                    <controls:CalculatorButton x:Name="XPower3Button"
-                                               x:Uid="xpower3Button"
+                    <controls:CalculatorButton x:Name="SquareRootButton"
+                                               x:Uid="squareRootButton"
                                                Grid.Row="1"
-                                               Style="{StaticResource SymbolOperatorButtonStyle}"
-                                               AutomationProperties.AutomationId="xpower3Button"
-                                               ButtonId="Cube"
+                                               Style="{StaticResource EmphasizedCalcButtonStyle}"
+                                               AutomationProperties.AutomationId="squareRootButton"
+                                               ButtonId="Sqrt"
                                                Click="Button_Clicked"
-                                               Content="&#xf7cb;"
+                                               Content="&#xF899;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="PowerButton"
@@ -1059,13 +1059,14 @@
                         <RowDefinition/>
                         <RowDefinition/>
                     </Grid.RowDefinitions>
-                    <controls:CalculatorButton x:Name="SquareRootButton"
-                                               x:Uid="squareRootButton"
-                                               Style="{StaticResource EmphasizedCalcButtonStyle}"
-                                               AutomationProperties.AutomationId="squareRootButton"
-                                               ButtonId="Sqrt"
+
+                    <controls:CalculatorButton x:Name="XPower3Button"
+                                               x:Uid="xpower3Button"
+                                               Style="{StaticResource SymbolOperatorButtonStyle}"
+                                               AutomationProperties.AutomationId="xpower3Button"
+                                               ButtonId="Cube"
                                                Click="ShiftButton_Uncheck"
-                                               Content="&#xF899;"
+                                               Content="&#xf7cb;"
                                                IsTabStop="false"/>
 
                     <controls:CalculatorButton x:Name="CubeRootButton"
diff --git a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs b/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
index 15776d0f..11ad88b9 100644
--- a/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
+++ b/src/CalculatorUITestFramework/ScientificOperatorsPanel.cs
@@ -83,6 +83,7 @@ namespace CalculatorUITestFramework
         public WindowsElement DegreesButton => this.session.TryFindElementByAccessibilityId("degreesButton");
         public WindowsElement FixedToExponentialButton => this.session.TryFindElementByAccessibilityId("ftoeButton");
         public WindowsElement NegateButton => this.session.TryFindElementByAccessibilityId("negateButton");
+        public WindowsElement ShiftButton => this.session.TryFindElementByAccessibilityId("shiftButton");
         public WindowsElement TrigFlyout => this.session.TryFindElementByAccessibilityId("Trigflyout");
         public WindowsElement LightDismiss => this.session.TryFindElementByAccessibilityId("Light Dismiss");
         private WindowsElement DegRadGradButton => GetAngleOperatorButton();
diff --git a/src/CalculatorUITests/ScientificModeFunctionalTests.cs b/src/CalculatorUITests/ScientificModeFunctionalTests.cs
index 837f0311..c576de0e 100644
--- a/src/CalculatorUITests/ScientificModeFunctionalTests.cs
+++ b/src/CalculatorUITests/ScientificModeFunctionalTests.cs
@@ -69,6 +69,7 @@ namespace CalculatorUITests
         public void SmokeTest_Cube()
         {
             page.StandardOperators.NumberPad.Input(3);
+            page.ScientificOperators.ShiftButton.Click();
             page.ScientificOperators.XPower3Button.Click();
             page.StandardOperators.EqualButton.Click();
             Assert.AreEqual("27", page.CalculatorResults.GetCalculatorResultText());