DevWiki/calculator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix primary display bug by adding leading 0's to binary values (#1760)

Browse Source 
* Fix binary display missing leading 0's (#1739)

* Added leading 0's to binary values in Progremmer Mode UI tests

Co-authored-by: mattclin <mattclin.umich.edu>
This commit is contained in:
mattclin
2022-05-26 04:27:32 -04:00
committed by GitHub
parent 73419b9ee1
commit c1987796b2
3 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/CalcViewModel/StandardCalculatorViewModel.cpp
View File

@@ -137,6 +137,13 @@ StandardCalculatorViewModel::StandardCalculatorViewModel()
String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue)
{
wstring result(displayValue);
// Adds leading padding 0's to Programmer Mode's Binary Display
if (IsProgrammer && CurrentRadixType == NumberBase::BinBase)
{
result = AddPadding(result);
}
LocalizationSettings::GetInstance()->LocalizeDisplayValue(&result);
return ref new Platform::String(result.c_str());
}

2
src/CalculatorUITestFramework/ProgrammerCalculatorPage.cs
View File

@@ -7,7 +7,7 @@ using OpenQA.Selenium.Appium.Windows;
namespace CalculatorUITestFramework
{
/// <summary>
/// This class contains the UI automation objects and helper methods available when the Calculator is in Scientific Mode.
/// This class contains the UI automation objects and helper methods available when the Calculator is in Programmer Mode.
/// </summary>
public class ProgrammerCalculatorPage
{

16
src/CalculatorUITests/ProgrammerModeFunctionalTests.cs
View File

@@ -340,7 +340,7 @@ namespace CalculatorUITests
page.ProgrammerOperators.LeftShiftButton.Click();
page.StandardOperators.NumberPad.Input(1);
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 0 0 1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
}
[TestMethod]
@@ -352,7 +352,7 @@ namespace CalculatorUITests
page.ProgrammerOperators.RightShiftButton.Click();
page.StandardOperators.NumberPad.Input(1);
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 1 0 1", page.CalculatorResults.GetCalculatorResultText());
}
[TestMethod]
@@ -429,7 +429,7 @@ namespace CalculatorUITests
page.ProgrammerOperators.XorButton.Click();
page.StandardOperators.NumberPad.Input(1100);
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 1 0", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 1 1 0", page.CalculatorResults.GetCalculatorResultText());
}
/// <summary>
@@ -623,7 +623,7 @@ namespace CalculatorUITests
page.ProgrammerOperators.LeftShiftLogicalButton.Click();
page.StandardOperators.NumberPad.Input(1);
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 0 0 1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
}
[TestMethod]
@@ -637,7 +637,7 @@ namespace CalculatorUITests
page.ProgrammerOperators.RightShiftLogicalButton.Click();
page.StandardOperators.NumberPad.Input(1);
page.StandardOperators.EqualButton.Click();
Assert.IsTrue(String.Equals(page.CalculatorResults.GetCalculatorResultText(), "1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1", StringComparison.OrdinalIgnoreCase));
Assert.IsTrue(String.Equals(page.CalculatorResults.GetCalculatorResultText(), "0 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 1 0 1 1", StringComparison.OrdinalIgnoreCase));
}
/// <summary>
@@ -737,7 +737,7 @@ namespace CalculatorUITests
page.StandardOperators.NumberPad.Input(1011);
page.ProgrammerOperators.RoLButton.Click();
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1 1 0", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 0 0 1 0 1 1 0", page.CalculatorResults.GetCalculatorResultText());
}
[TestMethod]
@@ -846,7 +846,7 @@ namespace CalculatorUITests
page.StandardOperators.NumberPad.Input(1010);
page.ProgrammerOperators.RoLButton.Click();
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 0 0 1 0 1 0 0", page.CalculatorResults.GetCalculatorResultText());
}
[TestMethod]
@@ -858,7 +858,7 @@ namespace CalculatorUITests
page.StandardOperators.NumberPad.Input(1011);
page.ProgrammerOperators.RoRCarryButton.Click();
page.StandardOperators.EqualButton.Click();
Assert.AreEqual("1 0 1", page.CalculatorResults.GetCalculatorResultText());
Assert.AreEqual("0 1 0 1", page.CalculatorResults.GetCalculatorResultText());
}
/// <summary>