Deprecated test code cleanup (#1677)

kuzudb · Jun 14, 2023 · dc83a58 · dc83a58
1 parent 250f2a1
commit dc83a58
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 90 deletions.
diff --git a/src/include/parser/.DS_Store b/src/include/parser/.DS_Store
diff --git a/src/include/parser/query/.DS_Store b/src/include/parser/query/.DS_Store
diff --git a/src/parser/.DS_Store b/src/parser/.DS_Store
diff --git a/test/include/graph_test/graph_test.h b/test/include/graph_test/graph_test.h
@@ -175,20 +175,6 @@ class DBTest : public BaseGraphTest {
     inline void runTest(const std::vector<std::unique_ptr<TestStatement>>& statements) {
         TestRunner::runTest(statements, *conn);
     }
-
-    // Deprecated
-    inline void runTest(const std::string& queryFile) {
-        auto queryConfigs = TestHelper::parseTestFile(queryFile);
-        ASSERT_TRUE(TestHelper::testQueries(queryConfigs, *conn));
-    }
-
-    inline void runTestAndCheckOrder(const std::string& queryFile) {
-        auto queryConfigs = TestHelper::parseTestFile(queryFile, true /* checkOutputOrder */);
-        for (auto& queryConfig : queryConfigs) {
-            queryConfig->checkOutputOrder = true;
-        }
-        ASSERT_TRUE(TestHelper::testQueries(queryConfigs, *conn));
-    }
 };
 
 } // namespace testing

diff --git a/test/include/test_helper/test_helper.h b/test/include/test_helper/test_helper.h
@@ -26,23 +26,20 @@ struct TestQueryConfig {
 
 class TestHelper {
 public:
+    static constexpr char E2E_TEST_FILES_DIRECTORY[] = "test/test_files";
+    static constexpr char SCHEMA_FILE_NAME[] = "schema.cypher";
+    static constexpr char COPY_FILE_NAME[] = "copy.cypher";
+    static constexpr char PARQUET_TEMP_DATASET_PATH[] = "dataset/parquet_temp_";
+    static constexpr char TMP_TEST_DIR[] = "test/unittest_temp_";
+
     static std::vector<std::unique_ptr<TestQueryConfig>> parseTestFile(
         const std::string& path, bool checkOutputOrder = false);
 
-    static bool testQueries(
-        std::vector<std::unique_ptr<TestQueryConfig>>& configs, Connection& conn);
-
     static std::vector<std::string> convertResultToString(
         QueryResult& queryResult, bool checkOutputOrder = false);
 
     static void executeScript(const std::string& path, Connection& conn);
 
-    static constexpr char E2E_TEST_FILES_DIRECTORY[] = "test/test_files";
-    static constexpr char SCHEMA_FILE_NAME[] = "schema.cypher";
-    static constexpr char COPY_FILE_NAME[] = "copy.cypher";
-    static constexpr char PARQUET_TEMP_DATASET_PATH[] = "dataset/parquet_temp_";
-    static constexpr char TMP_TEST_DIR[] = "test/unittest_temp_";
-
     static std::string getTestListFile() {
         return appendKuzuRootPath(std::string(E2E_TEST_FILES_DIRECTORY) + "/test_list");
     }
@@ -58,7 +55,6 @@ class TestHelper {
 
 private:
     static void initializeConnection(TestQueryConfig* config, Connection& conn);
-    static bool testQuery(TestQueryConfig* config, Connection& conn);
 };
 
 } // namespace testing

diff --git a/test/test_helper/test_helper.cpp b/test/test_helper/test_helper.cpp
@@ -57,29 +57,6 @@ std::vector<std::unique_ptr<TestQueryConfig>> TestHelper::parseTestFile(
     return result;
 }
 
-bool TestHelper::testQueries(
-    std::vector<std::unique_ptr<TestQueryConfig>>& configs, Connection& conn) {
-    spdlog::set_level(spdlog::level::info);
-    auto numPassedQueries = 0u;
-    std::vector<uint64_t> failedQueries;
-    for (auto i = 0u; i < configs.size(); i++) {
-        if (testQuery(configs[i].get(), conn)) {
-            numPassedQueries++;
-        } else {
-            failedQueries.push_back(i);
-        }
-    }
-    spdlog::info("SUMMARY:");
-    if (failedQueries.empty()) {
-        spdlog::info("ALL QUERIES PASSED.");
-    } else {
-        for (auto& idx : failedQueries) {
-            spdlog::info("QUERY {} NOT PASSED.", configs[idx]->name);
-        }
-    }
-    return numPassedQueries == configs.size();
-}
-
 std::vector<std::string> TestHelper::convertResultToString(
     QueryResult& queryResult, bool checkOutputOrder) {
     std::vector<std::string> actualOutput;
@@ -99,49 +76,6 @@ void TestHelper::initializeConnection(TestQueryConfig* config, Connection& conn)
     conn.setMaxNumThreadForExec(config->numThreads);
 }
 
-bool TestHelper::testQuery(TestQueryConfig* config, Connection& conn) {
-    initializeConnection(config, conn);
-    std::unique_ptr<PreparedStatement> preparedStatement;
-    if (config->encodedJoin.empty()) {
-        preparedStatement = conn.prepareNoLock(config->query, config->enumerate);
-    } else {
-        preparedStatement =
-            conn.prepareNoLock(config->query, true /* enumerate*/, config->encodedJoin);
-    }
-    if (!preparedStatement->isSuccess()) {
-        spdlog::error(preparedStatement->getErrorMessage());
-        return false;
-    }
-    auto numPlans = preparedStatement->logicalPlans.size();
-    if (numPlans == 0) {
-        spdlog::error("Query {} has no plans" + config->name);
-        return false;
-    }
-    auto numPassedPlans = 0u;
-    for (auto i = 0u; i < numPlans; ++i) {
-        auto planStr = preparedStatement->logicalPlans[i]->toString();
-        auto result = conn.executeAndAutoCommitIfNecessaryNoLock(preparedStatement.get(), i);
-        assert(result->isSuccess());
-        std::vector<std::string> resultTuples =
-            convertResultToString(*result, config->checkOutputOrder);
-        if (resultTuples.size() == result->getNumTuples() &&
-            resultTuples == config->expectedTuples) {
-            spdlog::info(
-                "PLAN{} PASSED in {}ms.", i, result->getQuerySummary()->getExecutionTime());
-            numPassedPlans++;
-        } else {
-            spdlog::error("PLAN{} NOT PASSED.", i);
-            spdlog::info("PLAN: \n{}", planStr);
-            spdlog::info("RESULT: \n");
-            for (auto& tuple : resultTuples) {
-                spdlog::info(tuple);
-            }
-        }
-    }
-    spdlog::info("{}/{} plans passed.", numPassedPlans, numPlans);
-    return numPassedPlans == numPlans;
-}
-
 std::string TestHelper::getMillisecondsSuffix() {
     uint64_t ms = duration_cast<std::chrono::milliseconds>(
         std::chrono::system_clock::now().time_since_epoch())

diff --git a/third_party/antlr4_runtime/src/.DS_Store b/third_party/antlr4_runtime/src/.DS_Store