From 4f176b8535caa875783464bc421892a5c1849552 Mon Sep 17 00:00:00 2001 From: "Crystal Edwards (Insight Global Inc)" Date: Thu, 12 Nov 2020 11:16:38 -0800 Subject: [PATCH] Test case is changed not to use a repeating-decimal results, and to not be sensitive to whitespace in the expression --- src/CalculatorUITests/StandardModeFunctionalTests.cs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/CalculatorUITests/StandardModeFunctionalTests.cs b/src/CalculatorUITests/StandardModeFunctionalTests.cs index b9548c8f..d316da74 100644 --- a/src/CalculatorUITests/StandardModeFunctionalTests.cs +++ b/src/CalculatorUITests/StandardModeFunctionalTests.cs @@ -5,6 +5,7 @@ using CalculatorUITestFramework; using Microsoft.VisualStudio.TestTools.UnitTesting; using OpenQA.Selenium; using System; +using System.Text.RegularExpressions; namespace CalculatorUITests { @@ -372,17 +373,18 @@ namespace CalculatorUITests CalculatorApp.Window.SendKeys(Keys.Multiply); CalculatorApp.Window.SendKeys("5"); CalculatorApp.Window.SendKeys(Keys.Divide); - CalculatorApp.Window.SendKeys("6"); + CalculatorApp.Window.SendKeys("2"); CalculatorApp.Window.SendKeys(Keys.Equal); page.HistoryPanel.ResizeWindowToDisplayHistoryButton(); CalculatorApp.Window.SendKeys(Keys.Control + "h" + Keys.Control); var historyFlyoutItems = page.HistoryPanel.GetAllHistoryFlyoutListViewItems(); - Assert.IsTrue(historyFlyoutItems[0].GetValue().Equals("3.333333333333333", StringComparison.InvariantCultureIgnoreCase)); //verifies History button hotkeys - Assert.IsTrue(historyFlyoutItems[0].GetExpression().Equals("4 × 5 ÷ 6 =", StringComparison.InvariantCultureIgnoreCase)); //verifies History button hotkeys + var historyExpression = Regex.Replace(historyFlyoutItems[0].GetExpression(), @"\s", string.Empty); + Assert.IsTrue(historyFlyoutItems[0].GetValue().Equals("10", StringComparison.InvariantCultureIgnoreCase)); //verifies History button hotkeys + Assert.IsTrue(historyExpression.Equals("4×5÷2=", StringComparison.InvariantCultureIgnoreCase)); //verifies History button hotkeys page.HistoryPanel.ResizeWindowToDisplayHistoryLabel(); var historyItems = page.HistoryPanel.GetAllHistoryListViewItems(); - Assert.IsTrue(historyItems[0].GetValue().Equals("3.333333333333333", StringComparison.InvariantCultureIgnoreCase)); - Assert.IsTrue(historyItems[0].GetExpression().Equals("4 × 5 ÷ 6 =", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyItems[0].GetValue().Equals("10", StringComparison.InvariantCultureIgnoreCase)); + Assert.IsTrue(historyExpression.Equals("4×5÷2=", StringComparison.InvariantCultureIgnoreCase)); CalculatorApp.Window.SendKeys(Keys.Shift + Keys.Control + "d" + Keys.Control + Keys.Shift); Assert.IsNotNull(WinAppDriver.Instance.CalculatorSession.FindElementByAccessibilityId("HistoryEmpty")); //verifies the History panel's clear history button hotkeys }