Add regex support for ExpectedError (#672)

albertZhangTJ · mrigger · web-flow · commit 7ca7d36a395b · 2022-12-22T14:43:24.000Z
* Add Regex support in ExpectedErrors * Add Regex support in ExpectedErrors * Add Regex support in ExpectedErrors * Add unit test cases for regex in ExpectedError * Revert "Add unit test cases for regex in ExpectedError" This reverts commit cc9fce2. * Add unit test cases for regex in ExpectedError * Removed config file from PR * Removed config file from PR * Remove unused imports * Fix PMD violation * Remove usingXXX fields in ExpectedError * Remove test cases for usingXXX fields in ExpectedError * Remove test cases for usingXXX fields in ExpectedError Co-authored-by: Manuel Rigger <rigger@nus.edu.sg>
diff --git a/src/sqlancer/common/query/ExpectedErrors.java b/src/sqlancer/common/query/ExpectedErrors.java
@@ -1,8 +1,11 @@
 package sqlancer.common.query;
 
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Set;
+import java.util.regex.Pattern;
 
 /**
  * This class represents the errors that executing a statement might result in. For example, an INSERT statement might
@@ -12,6 +15,7 @@
 public class ExpectedErrors {
 
     private final Set<String> errors = new HashSet<>();
+    private final List<Pattern> regexes = new ArrayList<>();
 
     public ExpectedErrors add(String error) {
         if (error == null) {
@@ -21,6 +25,35 @@ public ExpectedErrors add(String error) {
         return this;
     }
 
+    public ExpectedErrors addRegex(Pattern errorPattern) {
+        if (errorPattern == null) {
+            throw new IllegalArgumentException();
+        }
+        regexes.add(errorPattern);
+        return this;
+    }
+
+    public ExpectedErrors addAll(Collection<String> list) {
+        errors.addAll(list);
+        return this;
+    }
+
+    public ExpectedErrors addAllRegexes(Collection<Pattern> list) {
+        if (list == null) {
+            throw new IllegalArgumentException();
+        }
+        regexes.addAll(list);
+        return this;
+    }
+
+    public static ExpectedErrors from(String... errors) {
+        ExpectedErrors expectedErrors = new ExpectedErrors();
+        for (String error : errors) {
+            expectedErrors.add(error);
+        }
+        return expectedErrors;
+    }
+
     /**
      * Checks whether the error message (e.g., returned by the DBMS under test) contains any of the added error
      * messages.
@@ -34,25 +67,17 @@ public boolean errorIsExpected(String error) {
         if (error == null) {
             throw new IllegalArgumentException();
         }
-        for (String s : errors) {
+        for (String s : this.errors) {
             if (error.contains(s)) {
                 return true;
             }
         }
-        return false;
-    }
-
-    public ExpectedErrors addAll(Collection<String> list) {
-        errors.addAll(list);
-        return this;
-    }
-
-    public static ExpectedErrors from(String... errors) {
-        ExpectedErrors expectedErrors = new ExpectedErrors();
-        for (String error : errors) {
-            expectedErrors.add(error);
+        for (Pattern p : this.regexes) {
+            if (p.matcher(error).find()) {
+                return true;
+            }
         }
-        return expectedErrors;
+        return false;
     }
 
 }
diff --git a/test/sqlancer/TestExpectedErrors.java b/test/sqlancer/TestExpectedErrors.java
@@ -1,5 +1,7 @@
 package sqlancer;
 
+import java.util.regex.Pattern;
+
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -16,7 +18,7 @@ public void testEmpty() {
     }
 
     @Test
-    public void testSimple() {
+    public void testStringSimple() {
         ExpectedErrors errors = new ExpectedErrors();
         errors.add("a");
         errors.add("b");
@@ -25,16 +27,37 @@ public void testSimple() {
         assertTrue(errors.errorIsExpected("b"));
         assertTrue(errors.errorIsExpected("c"));
         assertTrue(errors.errorIsExpected("aa"));
-
         assertFalse(errors.errorIsExpected("d"));
+
+    }
+
+    @Test
+    public void testRegexSimple() {
+        ExpectedErrors errors = new ExpectedErrors();
+        errors.addRegex(Pattern.compile("a\\d"));
+        errors.addRegex(Pattern.compile("b\\D"));
+        errors.add("c");
+        assertTrue(errors.errorIsExpected("a0"));
+        assertTrue(errors.errorIsExpected("bb"));
+        assertTrue(errors.errorIsExpected("c"));
+        assertFalse(errors.errorIsExpected("aa"));
+
     }
 
     @Test
-    public void testRealistic() {
+    public void testStringRealistic() {
         ExpectedErrors errors = new ExpectedErrors();
         errors.add("violated");
         assertTrue(errors.errorIsExpected("UNIQUE constraint was violated!"));
         assertTrue(errors.errorIsExpected("PRIMARY KEY constraint was violated!"));
     }
 
+    @Test
+    public void testRegexRealistic() {
+        ExpectedErrors errors = new ExpectedErrors();
+        errors.addRegex(Pattern.compile(".violated."));
+        assertTrue(errors.errorIsExpected("UNIQUE constraint was violated!"));
+        assertTrue(errors.errorIsExpected("PRIMARY KEY constraint was violated!"));
+    }
+
 }
