#1780 avoid duplicate calls to toLowerCase()

selenide · Aug 3, 2022 · 231e7a0 · 231e7a0
1 parent 66bb1b6
commit 231e7a0
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/src/main/java/com/codeborne/selenide/conditions/PartialText.java b/src/main/java/com/codeborne/selenide/conditions/PartialText.java
@@ -7,7 +7,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import static java.util.Locale.ROOT;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 @ParametersAreNonnullByDefault
@@ -24,7 +23,7 @@ public PartialText(String text) {
 
   @Override
   protected boolean match(String actualText, String expectedText) {
-    return Html.text.contains(actualText, expectedText.toLowerCase(ROOT));
+    return Html.text.contains(actualText, expectedText);
   }
 
   @Nullable

diff --git a/src/main/java/com/codeborne/selenide/conditions/Text.java b/src/main/java/com/codeborne/selenide/conditions/Text.java
@@ -9,7 +9,6 @@
 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import static java.util.Locale.ROOT;
 import static org.apache.commons.lang3.StringUtils.isEmpty;
 
 @ParametersAreNonnullByDefault
@@ -33,8 +32,8 @@ protected boolean match(String actualText, String expectedText) {
   @Override
   protected boolean match(TextCheck textCheck, String actualText, String expectedText) {
     return switch (textCheck) {
-      case FULL_TEXT -> Html.text.equals(actualText, expectedText.toLowerCase(ROOT));
-      case PARTIAL_TEXT -> Html.text.contains(actualText, expectedText.toLowerCase(ROOT));
+      case FULL_TEXT -> Html.text.equals(actualText, expectedText);
+      case PARTIAL_TEXT -> Html.text.contains(actualText, expectedText);
     };
   }
 

diff --git a/src/main/java/com/codeborne/selenide/impl/Html.java b/src/main/java/com/codeborne/selenide/impl/Html.java
@@ -1,9 +1,9 @@
 package com.codeborne.selenide.impl;
 
 import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.Locale;
 import java.util.regex.Pattern;
 
+import static java.util.Locale.ROOT;
 import static java.util.regex.Pattern.DOTALL;
 
 @ParametersAreNonnullByDefault
@@ -20,7 +20,7 @@ public boolean matchesSubstring(String text, String regex) {
   }
 
   public boolean contains(String text, String subtext) {
-    return reduceSpaces(text.toLowerCase(Locale.ROOT)).contains(reduceSpaces(subtext.toLowerCase(Locale.ROOT)));
+    return reduceSpaces(text.toLowerCase(ROOT)).contains(reduceSpaces(subtext.toLowerCase(ROOT)));
   }
 
   public boolean containsCaseSensitive(String text, String subtext) {