revert back to JDK 11 / upgrade dependencies to latest

grossopa · Dec 1, 2024 · 516c247 · 516c247
1 parent 123acf0
commit 516c247
Show file tree

Hide file tree

Showing 7 changed files with 115 additions and 5 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -19,13 +19,13 @@ jobs:
         with:
           java-version: 11
       - name: Cache SonarCloud packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.sonar/cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
       - name: Cache Maven packages
-        uses: actions/cache@v1
+        uses: actions/cache@v4
         with:
           path: ~/.m2
           key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}

diff --git a/...-component-html/src/main/java/com/github/grossopa/selenium/component/html/HtmlSelect.java b/...-component-html/src/main/java/com/github/grossopa/selenium/component/html/HtmlSelect.java
@@ -79,6 +79,11 @@ public void selectByVisibleText(String text) {
         selectComponent.selectByVisibleText(text);
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text) {
+        selectComponent.selectByContainsVisibleText(text);
+    }
+
     @Override
     public void selectByIndex(int index) {
         selectComponent.selectByIndex(index);
@@ -109,6 +114,11 @@ public void deselectByVisibleText(String text) {
         selectComponent.deselectByVisibleText(text);
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text) {
+        selectComponent.deSelectByContainsVisibleText(text);
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) {

diff --git a/...rc/main/java/com/github/grossopa/hamster/selenium/component/mat/main/MatAutocomplete.java b/...rc/main/java/com/github/grossopa/hamster/selenium/component/mat/main/MatAutocomplete.java
@@ -230,6 +230,17 @@ public void selectByVisibleText(String text, Long delayInMillis) {
         }
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text, Long delayInMillis) {
+        List<WebComponent> options = getOptions2(delayInMillis);
+        for (WebComponent option : options) {
+            if (StringUtils.contains(option.getText(), text)) {
+                option.click();
+                return;
+            }
+        }
+    }
+
     @Override
     public void selectByIndex(int index, Long delayInMillis) {
         getOptions2(delayInMillis).get(index).click();
@@ -260,6 +271,11 @@ public void deselectByVisibleText(String text, Long delayInMillis) {
         SeleniumUtils.cleanText(this.getInput());
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text, Long delayInMillis) {
+        SeleniumUtils.cleanText(this.getInput());
+    }
+
     @Override
     public List<WebComponent> getOptions2() {
         return getOptions2(0L);
@@ -295,6 +311,11 @@ public void selectByVisibleText(String text) {
         selectByVisibleText(text, 0L);
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text) {
+        selectByContainsVisibleText(text, 0L);
+    }
+
     @Override
     public void selectByIndex(int i) {
         selectByIndex(i, 0L);
@@ -325,6 +346,11 @@ public void deselectByVisibleText(String visibleText) {
         deselectByVisibleText(visibleText, 0L);
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text) {
+        deSelectByContainsVisibleText(text, 0L);
+    }
+
     protected Optional<WebComponent> tryToFindAutocompletePanel() {
         MatOverlayContainer container = overlayFinder.findTopVisibleContainer();
         if (container != null) {

diff --git a/...erialui/src/main/java/com/github/grossopa/selenium/component/mui/v4/inputs/MuiSelect.java b/...erialui/src/main/java/com/github/grossopa/selenium/component/mui/v4/inputs/MuiSelect.java
@@ -198,12 +198,23 @@ public void selectByVisibleText(String text) {
         selectByVisibleText(text, 0L);
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text) {
+        selectByContainsVisibleText(text, 0L);
+    }
+
     @Override
     public void selectByVisibleText(String text, Long delayInMillis) {
         doFilterAndAction(getOptions2(delayInMillis),
                 option -> !config.isSelected(option) && StringUtils.equals(text, option.getText()));
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text, Long delayInMillis) {
+        doFilterAndAction(getOptions2(delayInMillis),
+                option -> !config.isSelected(option) && StringUtils.contains(option.getText(), text));
+    }
+
     @Override
     public void selectByIndex(int index) {
         selectByIndex(index, 0L);
@@ -268,12 +279,23 @@ public void deselectByVisibleText(String text) {
         deselectByVisibleText(text, 0L);
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text) {
+        deSelectByContainsVisibleText(text, 0L);
+    }
+
     @Override
     public void deselectByVisibleText(String text, Long delayInMillis) {
         doFilterAndAction(getOptions2(delayInMillis),
                 option -> config.isSelected(option) && StringUtils.equals(text, option.getText()));
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text, Long delayInMillis) {
+        doFilterAndAction(getOptions2(delayInMillis),
+                option -> config.isSelected(option) && StringUtils.contains(option.getText(), text));
+    }
+
     private void doFilterAndAction(List<WebComponent> options, Predicate<WebComponent> isTrue) {
         for (WebComponent option : options) {
             if (isTrue.test(option)) {

diff --git a/...alui/src/main/java/com/github/grossopa/selenium/component/mui/v4/lab/MuiAutocomplete.java b/...alui/src/main/java/com/github/grossopa/selenium/component/mui/v4/lab/MuiAutocomplete.java
@@ -329,6 +329,11 @@ public void selectByVisibleText(String text) {
         selectByVisibleText(text, 0L);
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text) {
+        selectByContainsVisibleText(text, 0L);
+    }
+
     @Override
     public void selectByVisibleText(String text, Long delayInMillis) {
         List<WebComponent> options = getOptions2(delayInMillis);
@@ -340,6 +345,17 @@ public void selectByVisibleText(String text, Long delayInMillis) {
         }
     }
 
+    @Override
+    public void selectByContainsVisibleText(String text, Long delayInMillis) {
+        List<WebComponent> options = getOptions2(delayInMillis);
+        for (WebComponent option : options) {
+            if (StringUtils.contains(option.getText(), text)) {
+                option.click();
+                return;
+            }
+        }
+    }
+
     @Override
     public void selectByIndex(int index) {
         selectByIndex(index, 0L);
@@ -428,11 +444,30 @@ public void deselectByVisibleText(String text) {
         }
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text) {
+        List<MuiAutocompleteTag> options = getVisibleTags();
+        for (MuiAutocompleteTag option : options) {
+            if (StringUtils.contains(option.getLabel(), text)) {
+                option.getDeleteButton().click();
+                // return here as all components will be recreated after removing the element that caused
+                // the options are not valid after deletion. A potential side effect is that the deselect action
+                // will only remove one element (e.g. duplicated visible text).
+                return;
+            }
+        }
+    }
+
     @Override
     public void deselectByVisibleText(String text, Long delayInMillis) {
         deselectByVisibleText(text);
     }
 
+    @Override
+    public void deSelectByContainsVisibleText(String text, Long delayInMillis) {
+        deSelectByContainsVisibleText(text);
+    }
+
     /**
      * Whether there is no options.
      *

diff --git a/...ium-core/src/main/java/com/github/grossopa/selenium/core/component/api/DelayedSelect.java b/...ium-core/src/main/java/com/github/grossopa/selenium/core/component/api/DelayedSelect.java
@@ -84,6 +84,15 @@ public interface DelayedSelect {
      */
     void selectByVisibleText(String text, Long delayInMillis);
 
+
+    /**
+     * Selects the option by visible text with delays
+     *
+     * @param text the text to be found
+     * @param delayInMillis the delay in milliseconds
+     */
+    void selectByContainsVisibleText(String text, Long delayInMillis);
+
     /**
      * Selects the option by option index with delays
      *
@@ -127,8 +136,16 @@ public interface DelayedSelect {
     /**
      * Deselects the option by visible text and with delays
      *
-     * @param text the text of element ot be deselected
+     * @param text the text of element to be deselected
      * @param delayInMillis the delays in milliseconds
      */
     void deselectByVisibleText(String text, Long delayInMillis);
+
+    /**
+     * Deselects the option by visible text and with delays
+     *
+     * @param text the text of element to be deselected
+     * @param delayInMillis the delays in milliseconds
+     */
+    void deSelectByContainsVisibleText(String text, Long delayInMillis);
 }
diff --git a/pom.xml b/pom.xml
@@ -78,9 +78,9 @@
     <java.version>11</java.version>
 
     <!-- project dependencies -->
-    <commons-lang3.version>3.12.0</commons-lang3.version>
+    <commons-lang3.version>3.17.0</commons-lang3.version>
     <commons-math3.version>3.6.1</commons-math3.version>
-    <selenium-java.version>4.6.0</selenium-java.version>
+    <selenium-java.version>4.27.0</selenium-java.version>
 
     <!-- testing dependencies -->
     <junit-jupiter.version>RELEASE</junit-jupiter.version>