Fix group references in String::matches (#10189)

Fixes #9572 by applying the change proposed by @morganga.

Author: zbynek

dev/core/test/org/apache/commons/collections/collection/AbstractTestCollection.java

@@ -591,7 +591,7 @@ public void testUnsupportedAdd() {
         resetEmpty();
         try {
             collection.add(new Object());
-            fail("Emtpy collection should not support add.");
+            fail("Empty collection should not support add.");
         } catch (UnsupportedOperationException e) {
             // expected
         }
@@ -601,7 +601,7 @@ public void testUnsupportedAdd() {
 
         try {
             collection.addAll(Arrays.asList(getFullElements()));
-            fail("Emtpy collection should not support addAll.");
+            fail("Empty collection should not support addAll.");
         } catch (UnsupportedOperationException e) {
             // expected
         }
@@ -929,12 +929,12 @@ public void testCollectionRemoveAll() {
         if (!isRemoveSupported()) return;
 
         resetEmpty();
-        assertTrue("Emtpy collection removeAll should return false for " +
+        assertTrue("Empty collection removeAll should return false for " +
                    "empty input",
                    !collection.removeAll(Collections.EMPTY_SET));
         verify();
 
-        assertTrue("Emtpy collection removeAll should return false for " +
+        assertTrue("Empty collection removeAll should return false for " +
                    "nonempty input",
                    !collection.removeAll(new ArrayList(collection)));
         verify();

user/super/com/google/gwt/emul/java/lang/String.java

@@ -518,9 +518,10 @@ public int length() {
    *
    * TODO(jat): properly handle Java regex syntax
    */
+  @SuppressWarnings("checkstyle:SpaceAfterColon")
   public boolean matches(String regex) {
     // We surround the regex with '^' and '$' because it must match the entire string.
-    return new NativeRegExp("^(" + regex + ")$").test(this);
+    return new NativeRegExp("^(?:" + regex + ")$").test(this);
   }
 
   public int offsetByCodePoints(int index, int codePointOffset) {

user/test/com/google/gwt/emultest/java/lang/CharacterTest.java

@@ -337,7 +337,7 @@ public void testIsSpace() {
     assertTrue(Character.isSpace('\n'));
   }
 
-  public void testIsWhitepace() {
+  public void testIsWhitespace() {
     char[] separators = {
         '\u0020', // SPACE.
         '\u1680', // OGHAM SPACE MARK.

user/test/com/google/gwt/emultest/java/lang/StringTest.java

@@ -623,6 +623,8 @@ public void testMatch() {
     assertFalse("11f.1", hideFromCompiler("ab").matches("|none"));
     assertFalse("11f.2", hideFromCompiler("anoneb").matches("|none"));
     assertTrue("12t", hideFromCompiler("none").matches("^|none$"));
+    assertTrue("13t", hideFromCompiler("abccd").matches(".*(.)\\1.*"));
+    assertFalse("13t", hideFromCompiler("abcd").matches(".*(.)\\1.*"));
   }
 
   public void testNull() {

user/test/com/google/gwt/emultest/java/util/TestCollection.java

@@ -411,7 +411,7 @@ public void testUnsupportedAdd() {
     resetEmpty();
     try {
       collection.add(new Object());
-      fail("Emtpy collection should not support add.");
+      fail("Empty collection should not support add.");
     } catch (UnsupportedOperationException e) {
       // expected
     }
@@ -421,7 +421,7 @@ public void testUnsupportedAdd() {
 
     try {
       collection.addAll(Arrays.asList(getFullElements()));
-      fail("Emtpy collection should not support addAll.");
+      fail("Empty collection should not support addAll.");
     } catch (UnsupportedOperationException e) {
       // expected
     }
@@ -712,12 +712,12 @@ public void testCollectionRemoveAll() {
 
     resetEmpty();
     assertTrue(
-        "Emtpy collection removeAll should return false for " + "empty input",
+        "Empty collection removeAll should return false for " + "empty input",
         !collection.removeAll(Collections.EMPTY_SET));
     verify();
 
     assertTrue(
-        "Emtpy collection removeAll should return false for " + "nonempty input",
+        "Empty collection removeAll should return false for " + "nonempty input",
         !collection.removeAll(new ArrayList(collection)));
     verify();
 

user/test/com/google/gwt/emultest/java11/lang/StringTest.java

@@ -33,39 +33,39 @@ public void testIsBlank() {
   }
 
   public void testStrip() {
-    stripRightAsssertEquals("", "");
-    stripRightAsssertEquals("", "  ");
-    stripRightAsssertEquals("x", " x ");
-    stripRightAsssertEquals("x", "\u001cx\u001c");
-    stripRightAsssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0 ");
-    stripRightAsssertEquals("\uffefx\u180e", "\uffefx\u180e ");
+    stripRightAssertEquals("", "");
+    stripRightAssertEquals("", "  ");
+    stripRightAssertEquals("x", " x ");
+    stripRightAssertEquals("x", "\u001cx\u001c");
+    stripRightAssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0 ");
+    stripRightAssertEquals("\uffefx\u180e", "\uffefx\u180e ");
   }
 
   public void testStripLeading() {
-    stripRightLeadingAsssertEquals("", "");
-    stripRightLeadingAsssertEquals("", "  ");
-    stripRightLeadingAsssertEquals("x ", " x ");
-    stripRightLeadingAsssertEquals("x\u001c", "\u001cx\u001c");
-    stripRightLeadingAsssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0");
+    stripRightLeadingAssertEquals("", "");
+    stripRightLeadingAssertEquals("", "  ");
+    stripRightLeadingAssertEquals("x ", " x ");
+    stripRightLeadingAssertEquals("x\u001c", "\u001cx\u001c");
+    stripRightLeadingAssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0");
   }
 
   public void testStripTrailing() {
-    stripRightTrailingAsssertEquals("", "");
-    stripRightTrailingAsssertEquals("", "  ");
-    stripRightTrailingAsssertEquals(" x", " x ");
-    stripRightTrailingAsssertEquals("\u001cx", "\u001cx\u001c");
-    stripRightTrailingAsssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0 ");
+    stripRightTrailingAssertEquals("", "");
+    stripRightTrailingAssertEquals("", "  ");
+    stripRightTrailingAssertEquals(" x", " x ");
+    stripRightTrailingAssertEquals("\u001cx", "\u001cx\u001c");
+    stripRightTrailingAssertEquals("\u00a0x\u00a0", "\u00a0x\u00a0 ");
   }
 
-  private void stripRightAsssertEquals(String expected, String arg) {
+  private void stripRightAssertEquals(String expected, String arg) {
     assertEquals(expected, hideFromCompiler(arg).strip());
   }
 
-  private void stripRightLeadingAsssertEquals(String expected, String arg) {
+  private void stripRightLeadingAssertEquals(String expected, String arg) {
     assertEquals(expected, hideFromCompiler(arg).stripLeading());
   }
 
-  private void stripRightTrailingAsssertEquals(String expected, String arg) {
+  private void stripRightTrailingAssertEquals(String expected, String arg) {
     assertEquals(expected, hideFromCompiler(arg).stripTrailing());
   }