Fix primary display bug by adding leading 0's to binary values (#1760)
* 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:
@@ -137,6 +137,13 @@ StandardCalculatorViewModel::StandardCalculatorViewModel()
|
|||||||
String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue)
|
String ^ StandardCalculatorViewModel::LocalizeDisplayValue(_In_ wstring const& displayValue)
|
||||||
{
|
{
|
||||||
wstring result(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);
|
LocalizationSettings::GetInstance()->LocalizeDisplayValue(&result);
|
||||||
return ref new Platform::String(result.c_str());
|
return ref new Platform::String(result.c_str());
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ using OpenQA.Selenium.Appium.Windows;
|
|||||||
namespace CalculatorUITestFramework
|
namespace CalculatorUITestFramework
|
||||||
{
|
{
|
||||||
/// <summary>
|
/// <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>
|
/// </summary>
|
||||||
public class ProgrammerCalculatorPage
|
public class ProgrammerCalculatorPage
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ namespace CalculatorUITests
|
|||||||
page.ProgrammerOperators.LeftShiftButton.Click();
|
page.ProgrammerOperators.LeftShiftButton.Click();
|
||||||
page.StandardOperators.NumberPad.Input(1);
|
page.StandardOperators.NumberPad.Input(1);
|
||||||
page.StandardOperators.EqualButton.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]
|
[TestMethod]
|
||||||
@@ -352,7 +352,7 @@ namespace CalculatorUITests
|
|||||||
page.ProgrammerOperators.RightShiftButton.Click();
|
page.ProgrammerOperators.RightShiftButton.Click();
|
||||||
page.StandardOperators.NumberPad.Input(1);
|
page.StandardOperators.NumberPad.Input(1);
|
||||||
page.StandardOperators.EqualButton.Click();
|
page.StandardOperators.EqualButton.Click();
|
||||||
Assert.AreEqual("1 0 1", page.CalculatorResults.GetCalculatorResultText());
|
Assert.AreEqual("0 1 0 1", page.CalculatorResults.GetCalculatorResultText());
|
||||||
}
|
}
|
||||||
|
|
||||||
[TestMethod]
|
[TestMethod]
|
||||||
@@ -429,7 +429,7 @@ namespace CalculatorUITests
|
|||||||
page.ProgrammerOperators.XorButton.Click();
|
page.ProgrammerOperators.XorButton.Click();
|
||||||
page.StandardOperators.NumberPad.Input(1100);
|
page.StandardOperators.NumberPad.Input(1100);
|
||||||
page.StandardOperators.EqualButton.Click();
|
page.StandardOperators.EqualButton.Click();
|
||||||
Assert.AreEqual("1 1 0", page.CalculatorResults.GetCalculatorResultText());
|
Assert.AreEqual("0 1 1 0", page.CalculatorResults.GetCalculatorResultText());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
@@ -623,7 +623,7 @@ namespace CalculatorUITests
|
|||||||
page.ProgrammerOperators.LeftShiftLogicalButton.Click();
|
page.ProgrammerOperators.LeftShiftLogicalButton.Click();
|
||||||
page.StandardOperators.NumberPad.Input(1);
|
page.StandardOperators.NumberPad.Input(1);
|
||||||
page.StandardOperators.EqualButton.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]
|
[TestMethod]
|
||||||
@@ -637,7 +637,7 @@ namespace CalculatorUITests
|
|||||||
page.ProgrammerOperators.RightShiftLogicalButton.Click();
|
page.ProgrammerOperators.RightShiftLogicalButton.Click();
|
||||||
page.StandardOperators.NumberPad.Input(1);
|
page.StandardOperators.NumberPad.Input(1);
|
||||||
page.StandardOperators.EqualButton.Click();
|
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>
|
/// <summary>
|
||||||
@@ -737,7 +737,7 @@ namespace CalculatorUITests
|
|||||||
page.StandardOperators.NumberPad.Input(1011);
|
page.StandardOperators.NumberPad.Input(1011);
|
||||||
page.ProgrammerOperators.RoLButton.Click();
|
page.ProgrammerOperators.RoLButton.Click();
|
||||||
page.StandardOperators.EqualButton.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]
|
[TestMethod]
|
||||||
@@ -846,7 +846,7 @@ namespace CalculatorUITests
|
|||||||
page.StandardOperators.NumberPad.Input(1010);
|
page.StandardOperators.NumberPad.Input(1010);
|
||||||
page.ProgrammerOperators.RoLButton.Click();
|
page.ProgrammerOperators.RoLButton.Click();
|
||||||
page.StandardOperators.EqualButton.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]
|
[TestMethod]
|
||||||
@@ -858,7 +858,7 @@ namespace CalculatorUITests
|
|||||||
page.StandardOperators.NumberPad.Input(1011);
|
page.StandardOperators.NumberPad.Input(1011);
|
||||||
page.ProgrammerOperators.RoRCarryButton.Click();
|
page.ProgrammerOperators.RoRCarryButton.Click();
|
||||||
page.StandardOperators.EqualButton.Click();
|
page.StandardOperators.EqualButton.Click();
|
||||||
Assert.AreEqual("1 0 1", page.CalculatorResults.GetCalculatorResultText());
|
Assert.AreEqual("0 1 0 1", page.CalculatorResults.GetCalculatorResultText());
|
||||||
}
|
}
|
||||||
|
|
||||||
/// <summary>
|
/// <summary>
|
||||||
|
|||||||
Reference in New Issue
Block a user