diff --git a/src/CalculatorUITestFramework/CalculatorResults.cs b/src/CalculatorUITestFramework/CalculatorResults.cs index 6e6815d9..bef7a423 100644 --- a/src/CalculatorUITestFramework/CalculatorResults.cs +++ b/src/CalculatorUITestFramework/CalculatorResults.cs @@ -13,8 +13,6 @@ namespace CalculatorUITestFramework private WindowsElement CalculatorAlwaysOnTopResults => this.session.TryFindElementByAccessibilityId("CalculatorAlwaysOnTopResults"); private WindowsElement CalculatorResult => this.session.TryFindElementByAccessibilityId("CalculatorResults"); private WindowsElement CalculatorExpression => this.session.TryFindElementByAccessibilityId("CalculatorExpression"); - private WindowsElement MenuItemCopy => this.session.WaitForElementByAccessibilityId("CopyMenuItem"); - private WindowsElement MenuItemPaste => this.session.WaitForElementByAccessibilityId("PasteMenuItem"); /// /// Gets the text from the display control in AoT mode and removes the narrator text that is not displayed in the UI. @@ -64,33 +62,5 @@ namespace CalculatorUITestFramework throw new Exception("The Calculator Expression is not clear"); } } - - /// - /// Opens the context menu in order to be able to click its items - /// - private void OpenContextMenu() - { - Actions actions = new Actions(CalculatorResult.WrappedDriver); - // It is important to move not to the centre in order to avoid click on the text - actions.MoveToElement(CalculatorResult, 1,1).ContextClick().Perform(); - } - - /// - /// Opens the context menu and clicks the "Copy" item there - /// - public void ContextMenuItemCopyClick() - { - OpenContextMenu(); - MenuItemCopy.Click(); - } - - /// - /// Opens the context menu and clicks the "Paste" item there - /// - public void ContextMenuItemPasteClick() - { - OpenContextMenu(); - MenuItemPaste.Click(); - } } } diff --git a/src/CalculatorUITests/ProgrammerModeFunctionalTests.cs b/src/CalculatorUITests/ProgrammerModeFunctionalTests.cs index e5ca991d..29df583f 100644 --- a/src/CalculatorUITests/ProgrammerModeFunctionalTests.cs +++ b/src/CalculatorUITests/ProgrammerModeFunctionalTests.cs @@ -899,10 +899,10 @@ namespace CalculatorUITests { page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit1.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("2", page.CalculatorResults.GetCalculatorResultText()); } @@ -912,11 +912,11 @@ namespace CalculatorUITests { page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit63.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); page.ProgrammerOperators.QWordButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("Invalid input", page.CalculatorResults.GetCalculatorResultText()); } @@ -926,10 +926,10 @@ namespace CalculatorUITests { page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit63.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("-9,223,372,036,854,775,808", page.CalculatorResults.GetCalculatorResultText()); } @@ -940,10 +940,10 @@ namespace CalculatorUITests page.ProgrammerOperators.QWordButton.Click(); page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit31.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("-2,147,483,648", page.CalculatorResults.GetCalculatorResultText()); } @@ -955,10 +955,10 @@ namespace CalculatorUITests page.ProgrammerOperators.DWordButton.Click(); page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit15.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("-32,768", page.CalculatorResults.GetCalculatorResultText()); } @@ -971,10 +971,10 @@ namespace CalculatorUITests page.ProgrammerOperators.WordButton.Click(); page.ProgrammerOperators.BitFlip.Click(); page.ProgrammerOperators.Bit7.Click(); - page.CalculatorResults.ContextMenuItemCopyClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "c" + Keys.Control); page.ProgrammerOperators.FullKeypad.Click(); page.StandardOperators.ClearEntryButton.Click(); - page.CalculatorResults.ContextMenuItemPasteClick(); + CalculatorApp.Window.SendKeys(Keys.Control + "v" + Keys.Control); Assert.AreEqual("-128", page.CalculatorResults.GetCalculatorResultText()); } #endregion