From 70a891f9c4915856cb2f8cba234b6503518b1e02 Mon Sep 17 00:00:00 2001 From: Matt Cooley Date: Wed, 20 Jul 2022 08:46:05 -0700 Subject: [PATCH] Get rid of stringly-typed methods --- .../StandardAoTCalculatorPage.cs | 33 +++++++------------ .../StandardModeFunctionalTests.cs | 24 +++++--------- 2 files changed, 19 insertions(+), 38 deletions(-) diff --git a/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs b/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs index 066d32d8..9eedc312 100644 --- a/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs +++ b/src/CalculatorUITestFramework/StandardAoTCalculatorPage.cs @@ -95,40 +95,29 @@ namespace CalculatorUITestFramework return ToolTip.Text; } - ///// - ///// Checks in AoT (Keep on top) button is present - ///// - public string GetAoTPresence() + /// + /// Checks in AoT (Keep on top) button is present + /// + public bool IsKeepOnTopButtonPresent() { - bool AoTPresent; string source = this.session.PageSource; - if (source.Contains("Keep on top")) - { - AoTPresent = true; - } - else - { - AoTPresent = false; - } - return AoTPresent.ToString(); + return source.Contains("Keep on top"); } - ///// - ///// Checks Standard calculator to see if it's in AoT (Keep on top) - ///// - public string AoTModeCheck() + /// + /// Checks Standard calculator to see if it's in AoT (Keep on top) + /// + public bool IsInAlwaysOnTopMode() { - bool InAoTMode; string source = this.session.PageSource; if ((source.Contains("Keep on top")) && (source.Contains("Header"))) { - InAoTMode = false; + return false; } else { - InAoTMode = true; + return true; } - return InAoTMode.ToString(); } /// diff --git a/src/CalculatorUITests/StandardModeFunctionalTests.cs b/src/CalculatorUITests/StandardModeFunctionalTests.cs index 1795de2c..80b8e7aa 100644 --- a/src/CalculatorUITests/StandardModeFunctionalTests.cs +++ b/src/CalculatorUITests/StandardModeFunctionalTests.cs @@ -724,26 +724,22 @@ namespace CalculatorUITests { page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ScientificCalculator); Assert.AreEqual("Scientific", CalculatorApp.GetCalculatorHeaderText()); - page.StandardAoTCalculatorPage.GetAoTPresence(); - Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence()); + Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent()); CalculatorApp.EnsureCalculatorHasFocus(); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.ProgrammerCalculator); Assert.AreEqual("Programmer", CalculatorApp.GetCalculatorHeaderText()); - page.StandardAoTCalculatorPage.GetAoTPresence(); - Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence()); + Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent()); CalculatorApp.EnsureCalculatorHasFocus(); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.DateCalculator); Assert.AreEqual("Date calculation", CalculatorApp.GetCalculatorHeaderText()); - page.StandardAoTCalculatorPage.GetAoTPresence(); - Assert.AreEqual("False", page.StandardAoTCalculatorPage.GetAoTPresence()); + Assert.IsFalse(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent()); CalculatorApp.EnsureCalculatorHasFocus(); page.NavigationMenu.ChangeCalculatorMode(CalculatorMode.StandardCalculator); Assert.AreEqual("Standard", CalculatorApp.GetCalculatorHeaderText()); - page.StandardAoTCalculatorPage.GetAoTPresence(); - Assert.AreEqual("True", page.StandardAoTCalculatorPage.GetAoTPresence()); + Assert.IsTrue(page.StandardAoTCalculatorPage.IsKeepOnTopButtonPresent()); } [TestMethod] @@ -755,8 +751,7 @@ namespace CalculatorUITests page.StandardOperators.DivideButton.Click(); page.StandardOperators.NumberPad.Num0Button.Click(); page.StandardOperators.EqualButton.Click(); - page.StandardAoTCalculatorPage.AoTModeCheck(); - Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck()); + Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode()); Assert.AreEqual("Result is undefined", page.CalculatorResults.GetAoTCalculatorResultText()); } @@ -768,8 +763,7 @@ namespace CalculatorUITests page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton(); page.StandardOperators.ClearButton.Click(); page.StandardOperators.InvertButton.Click(); - page.StandardAoTCalculatorPage.AoTModeCheck(); - Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck()); + Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText()); } @@ -781,12 +775,10 @@ namespace CalculatorUITests page.StandardAoTCalculatorPage.ResizeAoTWindowToDisplayInvertButton(); page.StandardOperators.ClearButton.Click(); page.StandardOperators.InvertButton.Click(); - page.StandardAoTCalculatorPage.AoTModeCheck(); - Assert.AreEqual("True", page.StandardAoTCalculatorPage.AoTModeCheck()); + Assert.IsTrue(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetAoTCalculatorResultText()); page.StandardAoTCalculatorPage.NavigateToStandardMode(); - page.StandardAoTCalculatorPage.AoTModeCheck(); - Assert.AreEqual("False", page.StandardAoTCalculatorPage.AoTModeCheck()); + Assert.IsFalse(page.StandardAoTCalculatorPage.IsInAlwaysOnTopMode()); Assert.AreEqual("Cannot divide by zero", page.CalculatorResults.GetCalculatorResultText()); }