fix windows

kuzudb · Feb 29, 2024 · 4633255 · 4633255
1 parent 7036b66
commit 4633255
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 2 deletions.
diff --git a/test/include/test_runner/test_group.h b/test/include/test_runner/test_group.h
@@ -18,6 +18,7 @@ struct TestStatement {
     uint64_t numThreads = 4;
     std::string encodedJoin;
     bool expectedError = false;
+    bool expectedErrorRegex = false;
     std::string errorMessage;
     bool expectedOk = false;
     uint64_t expectedNumTuples = 0;

diff --git a/test/test_files/copy/export_import_db.test b/test/test_files/copy/export_import_db.test
@@ -84,5 +84,5 @@ Binder exception: Directory ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db5 does not
 -REMOVE_FILE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4/schema.cypher"
 -IMPORT_DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4"
 -STATEMENT IMPORT DATABASE "${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4"
----- error
+---- error(regex)
 Binder exception: File ${KUZU_EXPORT_DB_DIRECTORY}_case3/demo-db4/schema.cypher does not exist.
diff --git a/test/test_runner/test_parser.cpp b/test/test_runner/test_parser.cpp
@@ -124,6 +124,10 @@ void TestParser::extractExpectedResult(TestStatement* statement) {
         statement->expectedError = true;
         statement->errorMessage = extractTextBeforeNextStatement();
         replaceVariables(statement->errorMessage);
+    } else if (result == "error(regex)") {
+        statement->expectedErrorRegex = true;
+        statement->errorMessage = extractTextBeforeNextStatement();
+        replaceVariables(statement->errorMessage);
     } else if (result.substr(0, 4) == "hash") {
         statement->expectHash = true;
         checkMinimumParams(1);

diff --git a/test/test_runner/test_runner.cpp b/test/test_runner/test_runner.cpp
@@ -68,7 +68,8 @@ bool TestRunner::testStatement(
         preparedStatement = conn.prepareNoLock(parsedStatement.get(), true, statement->encodedJoin);
     }
     // Check for wrong statements
-    if (!statement->expectedError && !preparedStatement->isSuccess()) {
+    if (!statement->expectedError && !statement->expectedErrorRegex &&
+        !preparedStatement->isSuccess()) {
         spdlog::error(preparedStatement->getErrorMessage());
         return false;
     }
@@ -99,6 +100,19 @@ bool TestRunner::checkLogicalPlan(std::unique_ptr<PreparedStatement>& preparedSt
             return true;
         }
         spdlog::info("EXPECTED ERROR: {}", expectedError);
+    } else if (statement->expectedErrorRegex) {
+        std::string expectedError = StringUtils::rtrim(result->getErrorMessage());
+        std::regex pattern("^.*[\\\\/]+([^\\\\/]+)$");
+        std::smatch match1;
+        bool is_match1 = std::regex_match(expectedError, match1, pattern);
+        std::smatch match2;
+        bool is_match2 = std::regex_match(statement->errorMessage, match2, pattern);
+        if (is_match1 && is_match2) {
+            if (match1[1] == match2[1]) {
+                return true;
+            }
+        }
+        spdlog::info("EXPECTED ERROR: {}", expectedError);
     } else if (statement->expectedOk && result->isSuccess()) {
         return true;
     } else {