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

Get rid of stringly-typed methods

Browse source
This commit is contained in:
Matt Cooley 2022-07-20 08:46:05 -07:00
commit 70a891f9c4
2 changed files with 19 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs
View file

@ -95,40 +95,29 @@ namespace CalculatorUITestFramework
return ToolTip.Text; return ToolTip.Text;
} }
///// <summary> /// <summary>
///// Checks in AoT (Keep on top) button is present /// Checks in AoT (Keep on top) button is present
///// </summary> /// </summary>
public string GetAoTPresence() public bool IsKeepOnTopButtonPresent()
{ {
bool AoTPresent;
string source = this.session.PageSource; string source = this.session.PageSource;
if (source.Contains("Keep on top")) return source.Contains("Keep on top");
{
AoTPresent = true;
}
else
{
AoTPresent = false;
}
return AoTPresent.ToString();
} }
///// <summary> /// <summary>
///// Checks Standard calculator to see if it's in AoT (Keep on top) /// Checks Standard calculator to see if it's in AoT (Keep on top)
///// </summary> /// </summary>
public string AoTModeCheck() public bool IsInAlwaysOnTopMode()
{ {
bool InAoTMode;
string source = this.session.PageSource; string source = this.session.PageSource;
if ((source.Contains("Keep on top")) && (source.Contains("Header"))) if ((source.Contains("Keep on top")) && (source.Contains("Header")))
{ {
InAoTMode = false; return false;
} }
else else
{ {
InAoTMode = true; return true;
} }
return InAoTMode.ToString();
} }
/// <summary> /// <summary>

24
src/CalculatorUITests/StandardModeFunctionalTests.cs
View file

@ -724,26 +724,22 @@ namespace CalculatorUITests
{ {
page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ScientificCalculator); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ScientificCalculator);
Assert.AreEqual("Scientific", CalculatorApp.GetCalculatorHeaderText()); Assert.AreEqual("Scientific", CalculatorApp.GetCalculatorHeaderText());
page.StandardAoTCalculatorPage.GetAoTPresence(); Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
CalculatorApp.EnsureCalculatorHasFocus(); CalculatorApp.EnsureCalculatorHasFocus();
page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ProgrammerCalculator); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ProgrammerCalculator);
Assert.AreEqual("Programmer", CalculatorApp.GetCalculatorHeaderText()); Assert.AreEqual("Programmer", CalculatorApp.GetCalculatorHeaderText());
page.StandardAoTCalculatorPage.GetAoTPresence(); Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
CalculatorApp.EnsureCalculatorHasFocus(); CalculatorApp.EnsureCalculatorHasFocus();
page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.DateCalculator); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.DateCalculator);
Assert.AreEqual("Date calculation", CalculatorApp.GetCalculatorHeaderText()); Assert.AreEqual("Date calculation", CalculatorApp.GetCalculatorHeaderText());
page.StandardAoTCalculatorPage.GetAoTPresence(); Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence());
CalculatorApp.EnsureCalculatorHasFocus(); CalculatorApp.EnsureCalculatorHasFocus();
page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.StandardCalculator); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.StandardCalculator);
Assert.AreEqual("Standard", CalculatorApp.GetCalculatorHeaderText()); Assert.AreEqual("Standard", CalculatorApp.GetCalculatorHeaderText());
page.StandardAoTCalculatorPage.GetAoTPresence(); Assert.IsTrue(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent());
Assert.AreEqual("True", page.StandardAoTCalculatorPage.GetAoTPresence());
} }
[TestMethod] [TestMethod]
@ -755,8 +751,7 @@ namespace CalculatorUITests
page.StandardOperators.DivideButton.Click(); page.StandardOperators.DivideButton.Click();
page.StandardOperators.NumberPad.Num0Button.Click(); page.StandardOperators.NumberPad.Num0Button.Click();
page.StandardOperators.EqualButton.Click(); page.StandardOperators.EqualButton.Click();
page.StandardAoTCalculatorPage.AoTModeCheck(); Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
Assert.AreEqual("Result is undefined", page.CalculatorResults.GetAoTCalculatorResultText()); Assert.AreEqual("Result is undefined", page.CalculatorResults.GetAoTCalculatorResultText());
} }
@ -768,8 +763,7 @@ namespace CalculatorUITests
page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton(); page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton();
page.StandardOperators.ClearButton.Click(); page.StandardOperators.ClearButton.Click();
page.StandardOperators.InvertButton.Click(); page.StandardOperators.InvertButton.Click();
page.StandardAoTCalculatorPage.AoTModeCheck(); Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText());
} }
@ -781,12 +775,10 @@ namespace CalculatorUITests
page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton(); page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton();
page.StandardOperators.ClearButton.Click(); page.StandardOperators.ClearButton.Click();
page.StandardOperators.InvertButton.Click(); page.StandardOperators.InvertButton.Click();
page.StandardAoTCalculatorPage.AoTModeCheck(); Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck());
Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText());
page.StandardAoTCalculatorPage.NavigateToStandardMode(); page.StandardAoTCalculatorPage.NavigateToStandardMode();
page.StandardAoTCalculatorPage.AoTModeCheck(); Assert.IsFalse(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode());
Assert.AreEqual("False", page.StandardAoTCalculatorPage.AoTModeCheck());
Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetCalculatorResultText()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetCalculatorResultText());
} }