cherry-pick(#969): feat: support ignoreCase option (#970)

Author: yury-s

playwright/src/main/java/com/microsoft/playwright/impl/LocatorAssertionsImpl.java

@@ -19,6 +19,7 @@
 import com.microsoft.playwright.Locator;
 import com.microsoft.playwright.assertions.LocatorAssertions;
 
+import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.regex.Pattern;
@@ -39,6 +40,7 @@ private LocatorAssertionsImpl(Locator locator, boolean isNot) {
   public void containsText(String text, ContainsTextOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = text;
+    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
     expectImpl("to.have.text", expected, text, "Locator expected to contain text", convertType(options, FrameExpectOptions.class));
@@ -47,6 +49,7 @@ public void containsText(String text, ContainsTextOptions options) {
   @Override
   public void containsText(Pattern pattern, ContainsTextOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
+    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
     expectImpl("to.have.text", expected, pattern, "Locator expected to contain regex", convertType(options, FrameExpectOptions.class));
@@ -58,6 +61,7 @@ public void containsText(String[] strings, ContainsTextOptions options) {
     for (String text : strings) {
       ExpectedTextValue expected = new ExpectedTextValue();
       expected.string = text;
+      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
@@ -70,6 +74,7 @@ public void containsText(Pattern[] patterns, ContainsTextOptions options) {
     List<ExpectedTextValue> list = new ArrayList<>();
     for (Pattern pattern : patterns) {
       ExpectedTextValue expected = expectedRegex(pattern);
+      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
@@ -203,6 +208,7 @@ public void hasJSProperty(String name, Object value, HasJSPropertyOptions option
   public void hasText(String text, HasTextOptions options) {
     ExpectedTextValue expected = new ExpectedTextValue();
     expected.string = text;
+    expected.ignoreCase = shouldIgnoreCase(options);
     expected.matchSubstring = false;
     expected.normalizeWhiteSpace = true;
     expectImpl("to.have.text", expected, text, "Locator expected to have text", convertType(options, FrameExpectOptions.class));
@@ -211,6 +217,7 @@ public void hasText(String text, HasTextOptions options) {
   @Override
   public void hasText(Pattern pattern, HasTextOptions options) {
     ExpectedTextValue expected = expectedRegex(pattern);
+    expected.ignoreCase = shouldIgnoreCase(options);
     // Just match substring, same as containsText.
     expected.matchSubstring = true;
     expected.normalizeWhiteSpace = true;
@@ -223,6 +230,7 @@ public void hasText(String[] strings, HasTextOptions options) {
     for (String text : strings) {
       ExpectedTextValue expected = new ExpectedTextValue();
       expected.string = text;
+      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = false;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
@@ -235,6 +243,7 @@ public void hasText(Pattern[] patterns, HasTextOptions options) {
     List<ExpectedTextValue> list = new ArrayList<>();
     for (Pattern pattern : patterns) {
       ExpectedTextValue expected = expectedRegex(pattern);
+      expected.ignoreCase = shouldIgnoreCase(options);
       expected.matchSubstring = true;
       expected.normalizeWhiteSpace = true;
       list.add(expected);
@@ -327,5 +336,17 @@ private void expectTrue(String expression, String message, FrameExpectOptions op
   public LocatorAssertions not() {
     return new LocatorAssertionsImpl(actualLocator, !isNot);
   }
-}
 
+  private static Boolean shouldIgnoreCase(Object options) {
+    if (options == null) {
+      return null;
+    }
+    try {
+      Field fromField = options.getClass().getDeclaredField("ignoreCase");
+      Object value = fromField.get(options);
+      return (Boolean) value;
+    } catch (NoSuchFieldException | IllegalAccessException e) {
+      return null;
+    }
+  }
+}

playwright/src/main/java/com/microsoft/playwright/impl/Protocol.java

@@ -85,6 +85,7 @@ class ExpectedTextValue {
   String string;
   String regexSource;
   String regexFlags;
+  Boolean ignoreCase;
   Boolean matchSubstring;
   Boolean normalizeWhiteSpace;
 }

playwright/src/test/java/com/microsoft/playwright/TestLocatorAssertions.java

@@ -72,13 +72,39 @@ void containsTextWRegexFail() {
     }
   }
 
+  @Test
+  void containsTextWTextPass() {
+    page.setContent("<div id=node>Text content</div>");
+    Locator locator = page.locator("#node");
+    assertThat(locator).containsText("Text");
+    // Should normalize whitespace.
+    assertThat(locator).containsText("   ext        cont\n  ");
+    // Should support ignoreCase.
+    assertThat(locator).containsText("EXT", new LocatorAssertions.ContainsTextOptions().setIgnoreCase(true));
+    // Should support falsy ignoreCase.
+    assertThat(locator).not().containsText("TEXT", new LocatorAssertions.ContainsTextOptions().setIgnoreCase(false));
+  }
+
+  @Test
+  void containsTextWTextArrayPass() {
+    page.setContent("<div>Text \n1</div><div>Text2</div><div>Text3</div>");
+    Locator locator = page.locator("div");
+    assertThat(locator).containsText(new String[] {"ext     1", "ext3"});
+    // Should support ignoreCase.
+    assertThat(locator).containsText(new String[] {"EXT 1", "eXt3"}, new LocatorAssertions.ContainsTextOptions().setIgnoreCase(true));
+  }
+
   @Test
   void hasTextWRegexPass() {
     page.setContent("<div id=node>Text   content</div>");
     Locator locator = page.locator("#node");
     assertThat(locator).hasText(Pattern.compile("Te.t"));
     // Should not normalize whitespace.
     assertThat(locator).hasText(Pattern.compile("Text.+content"));
+    // Should respect ignoreCase.
+    assertThat(locator).hasText(Pattern.compile("text   content"), new LocatorAssertions.HasTextOptions().setIgnoreCase(true));
+    // Should override regex flag with ignoreCase.
+    assertThat(locator).not().hasText(Pattern.compile("text   content", Pattern.CASE_INSENSITIVE), new LocatorAssertions.HasTextOptions().setIgnoreCase(false));
   }
 
   @Test
@@ -101,6 +127,10 @@ void hasTextWTextPass() {
     Locator locator = page.locator("#node");
     // Should normalize whitespace.
     assertThat(locator).hasText("Text                        content");
+    // Should support ignoreCase.
+    assertThat(locator).hasText("text CONTENT", new LocatorAssertions.HasTextOptions().setIgnoreCase(true));
+    // Should support falsy ignoreCase.
+    assertThat(locator).not().hasText("TEXT", new LocatorAssertions.HasTextOptions().setIgnoreCase(false));
   }
 
   @Test
@@ -131,6 +161,8 @@ void hasTextWTextArrayPass() {
     Locator locator = page.locator("div");
     // Should normalize whitespace.
     assertThat(locator).hasText(new String[] {"Text  1", "Text   2a"});
+    // Should support ignoreCase.
+    assertThat(locator).hasText(new String[] {"tEXT 1", "TExt 2A"}, new LocatorAssertions.HasTextOptions().setIgnoreCase(true));
   }
 
   @Test