From f17a6fede8a037c50073770abeacfe7cfbdd54ea Mon Sep 17 00:00:00 2001 From: Dennis Aulenbacher Date: Tue, 11 Aug 2020 15:26:13 +0200 Subject: [PATCH] bug5239: Added AclActionInputPo --- .../api/test/AclRevokeAnonymousTest.java | 8 ++--- .../event/EventConfigurationPanelPO.java | 2 +- .../security/AclActionInputPO.java | 30 +++++++++++++++++++ .../{ => security}/AclPopupPO.java | 12 ++++---- 4 files changed, 40 insertions(+), 12 deletions(-) create mode 100644 java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclActionInputPO.java rename java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/{ => security}/AclPopupPO.java (66%) diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java index 1a9d11d069d..7d9e7163f18 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/AclRevokeAnonymousTest.java @@ -10,16 +10,16 @@ import org.hamcrest.Matchers; import org.junit.Assert; import org.junit.Before; import org.junit.Test; -import org.openqa.selenium.WebElement; import com.sap.sailing.domain.common.CompetitorRegistrationType; import com.sap.sailing.selenium.api.core.ApiContext; import com.sap.sailing.selenium.api.event.EventApi; import com.sap.sailing.selenium.api.event.SecurityApi; -import com.sap.sailing.selenium.pages.adminconsole.AclPopupPO; import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO; import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO.EventEntryPO; +import com.sap.sailing.selenium.pages.adminconsole.security.AclActionInputPO; +import com.sap.sailing.selenium.pages.adminconsole.security.AclPopupPO; import com.sap.sailing.selenium.test.AbstractSeleniumTest; public class AclRevokeAnonymousTest extends AbstractSeleniumTest { @@ -51,8 +51,8 @@ public class AclRevokeAnonymousTest extends AbstractSeleniumTest { EventEntryPO eventEntry = eventPanel.getEventEntry(EVENT_NAME); AclPopupPO aclPopup = eventEntry.openAclPopup(); aclPopup.addUserGroup(""); // add empty user group -> anonymous group - WebElement deniedInput = aclPopup.getDeniedActionsInput(); - WebElement allowedInput = aclPopup.getAllowedActionsInput(); + AclActionInputPO deniedInput = aclPopup.getDeniedActionsInput(); + AclActionInputPO allowedInput = aclPopup.getAllowedActionsInput(); Assert.assertThat(deniedInput.isEnabled(), Matchers.equalTo(false)); Assert.assertThat(allowedInput.isEnabled(), Matchers.equalTo(true)); diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java index 9a0dd073c20..d8fed6a83c7 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/event/EventConfigurationPanelPO.java @@ -10,9 +10,9 @@ import org.openqa.selenium.WebElement; import com.sap.sailing.selenium.core.BySeleniumId; import com.sap.sailing.selenium.core.FindBy; import com.sap.sailing.selenium.pages.PageArea; -import com.sap.sailing.selenium.pages.adminconsole.AclPopupPO; import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardGroupCreateDialogPO; import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaCreateDialogPO; +import com.sap.sailing.selenium.pages.adminconsole.security.AclPopupPO; import com.sap.sailing.selenium.pages.common.ConfirmDialogPO; import com.sap.sailing.selenium.pages.gwt.CellTablePO; import com.sap.sailing.selenium.pages.gwt.DataEntryPO; diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclActionInputPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclActionInputPO.java new file mode 100644 index 00000000000..2e542c60efd --- /dev/null +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclActionInputPO.java @@ -0,0 +1,30 @@ +package com.sap.sailing.selenium.pages.adminconsole.security; + +import org.openqa.selenium.WebDriver; +import org.openqa.selenium.WebElement; + +import com.sap.sailing.selenium.core.BySeleniumId; +import com.sap.sailing.selenium.core.FindBy; +import com.sap.sailing.selenium.pages.PageArea; +import com.sap.sailing.selenium.pages.gwt.SuggestBoxPO; + +public class AclActionInputPO extends PageArea { + @FindBy(how = BySeleniumId.class, using = "InputSuggestBox") + private WebElement inputSuggestBox; + + @FindBy(how = BySeleniumId.class, using = "AddButton") + private WebElement addButton; + + AclActionInputPO(WebDriver driver, WebElement element) { + super(driver, element); + } + + void addAction(String name) { + SuggestBoxPO.create(driver, inputSuggestBox).appendText(name); + addButton.click(); + } + + public boolean isEnabled() { + return inputSuggestBox.isEnabled(); + } +} \ No newline at end of file diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AclPopupPO.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclPopupPO.java similarity index 66% rename from java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AclPopupPO.java rename to java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclPopupPO.java index 295b339ac36..8b96aca2fa6 100644 --- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/AclPopupPO.java +++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/security/AclPopupPO.java @@ -1,4 +1,4 @@ -package com.sap.sailing.selenium.pages.adminconsole; +package com.sap.sailing.selenium.pages.adminconsole.security; import org.openqa.selenium.WebDriver; import org.openqa.selenium.WebElement; @@ -23,14 +23,12 @@ public class AclPopupPO extends PageArea { driver.findElement(new BySeleniumId(ADD_USER_GROUP_BUTTON)).click(); } - public WebElement getDeniedActionsInput() { - WebElement parent = context.findElement(new BySeleniumId(DENIED_ACTIONS_CONTAINER)); - return parent.findElement(new BySeleniumId(INPUT_SUGGEST_BOX)); + public AclActionInputPO getDeniedActionsInput() { + return new AclActionInputPO(driver, context.findElement(new BySeleniumId(DENIED_ACTIONS_CONTAINER))); } - public WebElement getAllowedActionsInput() { - WebElement parent = context.findElement(new BySeleniumId(ALLOWED_ACTIONS_CONTAINER)); - return parent.findElement(new BySeleniumId(INPUT_SUGGEST_BOX)); + public AclActionInputPO getAllowedActionsInput() { + return new AclActionInputPO(driver, context.findElement(new BySeleniumId(ALLOWED_ACTIONS_CONTAINER))); } } \ No newline at end of file