Fix tests

luigidellaquila · Oct 21, 2024 · e584d61 · e584d61
1 parent e8deff4
commit e584d61
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/...java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/StringPatternTests.java b/...java/org/elasticsearch/xpack/esql/core/expression/predicate/regex/StringPatternTests.java
@@ -39,13 +39,13 @@ private boolean rlikeExactMatch(String pattern) {
 
     public void testWildcardMatchAll() {
         assertTrue(likeMatchesAll("*"));
-        assertTrue(likeMatchesAll("*"));
+        assertTrue(likeMatchesAll("**"));
 
         assertFalse(likeMatchesAll("a*"));
-        assertFalse(likeMatchesAll("*_"));
-        assertFalse(likeMatchesAll("*_*_*"));
-        assertFalse(likeMatchesAll("_*"));
-        assertFalse(likeMatchesAll("0%"));
+        assertFalse(likeMatchesAll("*?"));
+        assertFalse(likeMatchesAll("*?*?*"));
+        assertFalse(likeMatchesAll("?*"));
+        assertFalse(likeMatchesAll("\\*"));
     }
 
     public void testRegexMatchAll() {
@@ -64,8 +64,8 @@ public void testWildcardExactMatch() {
         assertTrue(likeExactMatch("\\*"));
         assertTrue(likeExactMatch("\\?"));
         assertTrue(likeExactMatch("123"));
-        assertTrue(likeExactMatch("1230_"));
-        assertTrue(likeExactMatch("1230_321"));
+        assertTrue(likeExactMatch("123\\?"));
+        assertTrue(likeExactMatch("123\\?321"));
 
         assertFalse(likeExactMatch("*"));
         assertFalse(likeExactMatch("**"));

diff --git a/...est/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceRegexMatchTests.java b/...est/java/org/elasticsearch/xpack/esql/optimizer/rules/logical/ReplaceRegexMatchTests.java
@@ -15,6 +15,7 @@
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.RLikePattern;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardLike;
 import org.elasticsearch.xpack.esql.core.expression.predicate.regex.WildcardPattern;
+import org.elasticsearch.xpack.esql.core.util.StringUtils;
 import org.elasticsearch.xpack.esql.expression.predicate.operator.comparison.Equals;
 
 import static java.util.Arrays.asList;
@@ -46,15 +47,16 @@ public void testMatchAllRLikeToExist() {
     }
 
     public void testExactMatchWildcardLike() {
-        String s = "ab";
-        WildcardPattern pattern = new WildcardPattern(s);
-        FieldAttribute fa = getFieldAttribute();
-        WildcardLike l = new WildcardLike(EMPTY, fa, pattern);
-        Expression e = new ReplaceRegexMatch().rule(l);
-        assertEquals(Equals.class, e.getClass());
-        Equals eq = (Equals) e;
-        assertEquals(fa, eq.left());
-        assertEquals(s, eq.right().fold());
+        for (String s : asList("ab", "ab\\*", "ab\\?c")) {
+            WildcardPattern pattern = new WildcardPattern(s);
+            FieldAttribute fa = getFieldAttribute();
+            WildcardLike l = new WildcardLike(EMPTY, fa, pattern);
+            Expression e = new ReplaceRegexMatch().rule(l);
+            assertEquals(Equals.class, e.getClass());
+            Equals eq = (Equals) e;
+            assertEquals(fa, eq.left());
+            assertEquals(s.replace("\\", StringUtils.EMPTY), eq.right().fold());
+        }
     }
 
     public void testExactMatchRLike() {