From cb3f11b9f8ba2b35778c2f4bea603427d17e509b Mon Sep 17 00:00:00 2001 From: Viliam Repan Date: Sat, 14 Mar 2020 13:57:55 +0100 Subject: [PATCH] removed unnecessary dependency from schrodinger --- tools/schrodinger/pom.xml | 11 +++++---- .../component/common/InlineMenu.java | 24 ++++++++++++++++--- .../schrodinger/component/common/Paging.java | 3 ++- 3 files changed, 30 insertions(+), 8 deletions(-) diff --git a/tools/schrodinger/pom.xml b/tools/schrodinger/pom.xml index 52531f29beb..066cd0c03cf 100644 --- a/tools/schrodinger/pom.xml +++ b/tools/schrodinger/pom.xml @@ -53,13 +53,16 @@ commons-lang3 - - org.jsoup - jsoup - dnsjava dnsjava + runtime + + + + org.testng + testng + test diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/InlineMenu.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/InlineMenu.java index 0259c05deaf..60407ac9d6b 100644 --- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/InlineMenu.java +++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/InlineMenu.java @@ -18,6 +18,7 @@ import java.util.ArrayList; import java.util.List; +import java.util.Objects; import com.codeborne.selenide.ElementsCollection; import com.codeborne.selenide.SelenideElement; @@ -79,14 +80,31 @@ public List getItemKeys() { } public InlineMenu clickItemByName(String itemName) { - // todo implement - SelenideElement dropdown = getParentElement().find("div.btn-group ul.dropdown-menu li"); + boolean found = false; + ElementsCollection lis = getParentElement().findAll("div.btn-group ul.dropdown-menu li a"); + for (SelenideElement a : lis) { + if (!a.isDisplayed()) { + continue; + } + + String txt = a.getText(); + if (Objects.equals(itemName, txt.trim())) { + a.parent().click(); + found = true; + break; + } + } + + if (!found) { + throw new IllegalStateException("Couldn't find item by name " + itemName); + } return this; } public InlineMenu clickItemByKey(String itemKey) { - // todo implement + SelenideElement element = getParentElement().find("div.btn-group ul.dropdown-menu li a schrodinger[data-s-resource-key=" + itemKey + "]"); + element.parent().click(); return this; } diff --git a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Paging.java b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Paging.java index d635c87e172..4054e1d7cae 100644 --- a/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Paging.java +++ b/tools/schrodinger/src/main/java/com/evolveum/midpoint/schrodinger/component/common/Paging.java @@ -14,7 +14,8 @@ import com.evolveum.midpoint.schrodinger.SchrodingerException; import com.evolveum.midpoint.schrodinger.component.Component; import com.evolveum.midpoint.schrodinger.util.Schrodinger; -import org.jsoup.helper.Validate; + +import org.apache.commons.lang3.Validate; import org.openqa.selenium.By; /**