github/msft-calculator
1
0
Fork 0
mirror of https://github.com/Microsoft/calculator.git synced 2025-08-19 21:03:11 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix the broken decimal key (#2038) (#2041)

Browse source
This commit is contained in:
hanzhang54 2023-08-15 00:49:50 +08:00 • committed by GitHub
commit b94c6434ca
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Calculator/Views/NumberPad.xaml
View file

@ -110,10 +110,12 @@
AutomationProperties.AutomationId="num9Button" AutomationProperties.AutomationId="num9Button"
AutomationProperties.Name="{utils:ResourceString Name=num9Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}" AutomationProperties.Name="{utils:ResourceString Name=num9Button/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"
ButtonId="Nine"/> ButtonId="Nine"/>
<!-- DO NOT REMOVE the common:KeyboardShortcutManager.Character from this element, it's value will be overwritten by the KeyboardShortcutManager -->
<controls:CalculatorButton x:Name="DecimalSeparatorButton" <controls:CalculatorButton x:Name="DecimalSeparatorButton"
Grid.Row="3" Grid.Row="3"
Grid.Column="2" Grid.Column="2"
Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}" Style="{Binding ElementName=ControlRoot, Path=ButtonStyle}"
common:KeyboardShortcutManager.Character="."
common:KeyboardShortcutManager.VirtualKey="{utils:ResourceVirtualKey Name=decimalSeparatorButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKey}" common:KeyboardShortcutManager.VirtualKey="{utils:ResourceVirtualKey Name=decimalSeparatorButton/[using:CalculatorApp.Common]KeyboardShortcutManager/VirtualKey}"
AutomationProperties.AutomationId="decimalSeparatorButton" AutomationProperties.AutomationId="decimalSeparatorButton"
AutomationProperties.Name="{utils:ResourceString Name=decimalSeparatorButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}" AutomationProperties.Name="{utils:ResourceString Name=decimalSeparatorButton/[using:Windows.UI.Xaml.Automation]AutomationProperties/Name}"

31
src/CalculatorUITests/StandardModeFunctionalTests.cs
View file

@ -316,11 +316,8 @@ namespace CalculatorUITests
Assert.AreEqual("square (9)", page.CalculatorResults.GetCalculatorExpressionText()); //verifies squared hotkey Assert.AreEqual("square (9)", page.CalculatorResults.GetCalculatorExpressionText()); //verifies squared hotkey
} }
// Ignore this test and add a new test KeyboardInput_PercentSquareRootBackspaceNegateOneZero below
// to avoid the issue of decimal keyboard input
[TestMethod] [TestMethod]
[Priority(1)] [Priority(1)]
[Ignore]
public void KeyboardInput_PercentSquareRootBackspaceDecimalNegateOneZero() public void KeyboardInput_PercentSquareRootBackspaceDecimalNegateOneZero()
{ {
//Verifies the %, square root, backspace, decimal, negate, 1, and 0 button //Verifies the %, square root, backspace, decimal, negate, 1, and 0 button
@ -348,34 +345,6 @@ namespace CalculatorUITests
Assert.AreEqual("9.9", page.CalculatorResults.GetCalculatorResultText()); //verifies calculation with decimal point and negative number Assert.AreEqual("9.9", page.CalculatorResults.GetCalculatorResultText()); //verifies calculation with decimal point and negative number
} }
[TestMethod]
[Priority(1)]
public void KeyboardInput_PercentSquareRootBackspaceNegateOneZero()
{
//Verifies the %, square root, backspace, negate, 1, and 0 button
CalculatorApp.EnsureCalculatorHasFocus();
CalculatorApp.Window.SendKeys("100");
CalculatorApp.Window.SendKeys(Keys.Backspace);
Assert.AreEqual("10", page.CalculatorResults.GetCalculatorResultText()); // verifies using the 1 key, the 0 key, and the backspace key
CalculatorApp.Window.SendKeys(Keys.Add);
CalculatorApp.EnsureCalculatorHasFocus();
CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
Assert.AreEqual("1", page.CalculatorResults.GetCalculatorResultText()); //verifies percent calculation
Assert.AreEqual("10 + 1", page.CalculatorResults.GetCalculatorExpressionText()); //verifies percent hotkey
CalculatorApp.Window.SendKeys(Keys.Shift);
CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
CalculatorApp.Window.SendKeys(Keys.Shift);
CalculatorApp.Window.SendKeys(Keys.Shift + "2" + Keys.Shift);
Assert.AreEqual("0.3162277660168379", page.CalculatorResults.GetCalculatorResultText()); //verifies square root calculation
Assert.AreEqual("10 + √(0.1)", page.CalculatorResults.GetCalculatorExpressionText()); //verifies 2√x hotkey
CalculatorApp.Window.SendKeys("1");
CalculatorApp.Window.SendKeys(Keys.Shift + "5" + Keys.Shift);
CalculatorApp.Window.SendKeys(Keys.F9);
Assert.AreEqual("-0.1", page.CalculatorResults.GetCalculatorResultText()); //verifies negate hotkey
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("9.9", page.CalculatorResults.GetCalculatorResultText()); //verifies calculation with decimal point and negative number
}
[TestMethod] [TestMethod]
[Priority(1)] [Priority(1)]
public void KeyboardInput_MemoryHotkeys() public void KeyboardInput_MemoryHotkeys()