From fcc5c7e6bd401e611bac14543fcb07d269fb8fce Mon Sep 17 00:00:00 2001 From: Dennis Aulenbacher Date: Tue, 11 Aug 2020 17:50:55 +0200 Subject: [PATCH] bug5239: pulled method clickOkButtonOrThrow() up to DataEntryDialogPO --- .../usermanagement/ChangePasswordDialogPO.java | 10 ---------- .../selenium/pages/common/DataEntryDialogPO.java | 9 +++++++++ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/usermanagement/ChangePasswordDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/usermanagement/ChangePasswordDialogPO.java index 8b8186a70a6..2fbafed95c0 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/usermanagement/ChangePasswordDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/usermanagement/ChangePasswordDialogPO.java @@ -1,6 +1,5 @@ package com.sap.sailing.selenium.pages.adminconsole.usermanagement; -import org.openqa.selenium.ElementNotSelectableException; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -28,13 +27,4 @@ public class ChangePasswordDialogPO extends DataEntryDialogPO { PasswordTextBoxPO.create(driver, textBoxPw).appendText(newPassword); PasswordTextBoxPO.create(driver, textBoxPwRepeat).appendText(newPassword); } - - public void clickOkButtonOrThrow() { - if (!okButton.isEnabled()) { - throw new ElementNotSelectableException("OK Button was disabled"); - } else { - okButton.click(); - } - } - } diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/common/DataEntryDialogPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/common/DataEntryDialogPO.java index 0e3859c3e84..516c0c406bd 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/common/DataEntryDialogPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/common/DataEntryDialogPO.java @@ -3,6 +3,7 @@ package com.sap.sailing.selenium.pages.common; import java.util.function.BooleanSupplier; import org.openqa.selenium.Alert; +import org.openqa.selenium.ElementNotSelectableException; import org.openqa.selenium.JavascriptExecutor; import org.openqa.selenium.StaleElementReferenceException; import org.openqa.selenium.WebDriver; @@ -109,4 +110,12 @@ public abstract class DataEntryDialogPO extends PageArea { public boolean isMakeDefaultButtonVisible() { return !driver.findElements(new BySeleniumId(ID_MAKE_DEFAULT_BUTTON)).isEmpty(); } + + public void clickOkButtonOrThrow() { + if (!okButton.isEnabled()) { + throw new ElementNotSelectableException("OK Button was disabled"); + } else { + okButton.click(); + } + } }