Moved a few tests to gtest

dbms/src/Common/tests/CMakeLists.txt

@@ -41,9 +41,6 @@ target_link_libraries (compact_array PRIVATE clickhouse_common_io ${Boost_FILESY
 add_executable (radix_sort radix_sort.cpp)
 target_link_libraries (radix_sort PRIVATE clickhouse_common_io)
 
-add_executable (shell_command_test shell_command_test.cpp)
-target_link_libraries (shell_command_test PRIVATE clickhouse_common_io)
-
 add_executable (arena_with_free_lists arena_with_free_lists.cpp)
 target_link_libraries (arena_with_free_lists PRIVATE clickhouse_compression clickhouse_common_io)
 
@@ -53,18 +50,6 @@ target_link_libraries (pod_array PRIVATE clickhouse_common_io)
 add_executable (thread_creation_latency thread_creation_latency.cpp)
 target_link_libraries (thread_creation_latency PRIVATE clickhouse_common_io)
 
-add_executable (thread_pool thread_pool.cpp)
-target_link_libraries (thread_pool PRIVATE clickhouse_common_io)
-
-add_executable (thread_pool_2 thread_pool_2.cpp)
-target_link_libraries (thread_pool_2 PRIVATE clickhouse_common_io)
-
-add_executable (thread_pool_3 thread_pool_3.cpp)
-target_link_libraries (thread_pool_3 PRIVATE clickhouse_common_io)
-
-add_executable (thread_pool_schedule_exception thread_pool_schedule_exception.cpp)
-target_link_libraries (thread_pool_schedule_exception PRIVATE clickhouse_common_io)
-
 add_executable (multi_version multi_version.cpp)
 target_link_libraries (multi_version PRIVATE clickhouse_common_io)
 add_check(multi_version)

dbms/src/Common/tests/shell_command_test.cpp → dbms/src/Common/tests/gtest_shell_command.cpp

@@ -4,48 +4,62 @@
 #include <IO/copyData.h>
 #include <IO/WriteBufferFromFileDescriptor.h>
 #include <IO/ReadBufferFromString.h>
+#include <IO/ReadHelpers.h>
 
 #include <chrono>
 #include <thread>
 
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#ifdef __clang__
+    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+    #pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gtest/gtest.h>
+
+
 using namespace DB;
 
 
-int main(int, char **)
-try
+TEST(ShellCommand, Execute)
 {
-    {
-        auto command = ShellCommand::execute("echo 'Hello, world!'");
+    auto command = ShellCommand::execute("echo 'Hello, world!'");
 
-        WriteBufferFromFileDescriptor out(STDOUT_FILENO);
-        copyData(command->out, out);
+    std::string res;
+    readStringUntilEOF(res, command->out);
+    command->wait();
 
-        command->wait();
-    }
+    EXPECT_EQ(res, "Hello, world!\n");
+}
 
-    {
-        auto command = ShellCommand::executeDirect("/bin/echo", {"Hello, world!"});
+TEST(ShellCommand, ExecuteDirect)
+{
+    auto command = ShellCommand::executeDirect("/bin/echo", {"Hello, world!"});
 
-        WriteBufferFromFileDescriptor out(STDOUT_FILENO);
-        copyData(command->out, out);
+    std::string res;
+    readStringUntilEOF(res, command->out);
+    command->wait();
 
-        command->wait();
-    }
+    EXPECT_EQ(res, "Hello, world!\n");
+}
 
-    {
-        auto command = ShellCommand::execute("cat");
+TEST(ShellCommand, ExecuteWithInput)
+{
+    auto command = ShellCommand::execute("cat");
 
-        String in_str = "Hello, world!\n";
-        ReadBufferFromString in(in_str);
-        copyData(in, command->in);
-        command->in.close();
+    String in_str = "Hello, world!\n";
+    ReadBufferFromString in(in_str);
+    copyData(in, command->in);
+    command->in.close();
 
-        WriteBufferFromFileDescriptor out(STDOUT_FILENO);
-        copyData(command->out, out);
+    std::string res;
+    readStringUntilEOF(res, command->out);
+    command->wait();
 
-        command->wait();
-    }
+    EXPECT_EQ(res, "Hello, world!\n");
+}
 
+TEST(ShellCommand, AutoWait)
+{
     // <defunct> hunting:
     for (int i = 0; i < 1000; ++i)
     {
@@ -56,8 +70,3 @@ try
     // std::cerr << "inspect me: ps auxwwf" << "\n";
     // std::this_thread::sleep_for(std::chrono::seconds(100));
 }
-catch (...)
-{
-    std::cerr << getCurrentExceptionMessage(false) << "\n";
-    return 1;
-}

dbms/src/Common/tests/thread_pool.cpp → dbms/src/Common/tests/gtest_thread_pool_concurrent_wait.cpp

 #include <Common/ThreadPool.h>
 
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#ifdef __clang__
+    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+    #pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gtest/gtest.h>
+
 /** Reproduces bug in ThreadPool.
   * It get stuck if we call 'wait' many times from many other threads simultaneously.
   */
 
 
-int main(int, char **)
+TEST(ThreadPool, ConcurrentWait)
 {
     auto worker = []
     {
@@ -29,6 +36,4 @@ int main(int, char **)
         waiting_pool.schedule([&pool]{ pool.wait(); });
 
     waiting_pool.wait();
-
-    return 0;
 }

dbms/src/Common/tests/thread_pool_3.cpp → dbms/src/Common/tests/gtest_thread_pool_limit.cpp

-#include <mutex>
+#include <atomic>
 #include <iostream>
 #include <Common/ThreadPool.h>
 
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#ifdef __clang__
+    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+    #pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gtest/gtest.h>
+
 /// Test for thread self-removal when number of free threads in pool is too large.
 /// Just checks that nothing weird happens.
 
 template <typename Pool>
-void test()
+int test()
 {
     Pool pool(10, 2, 10);
 
-    std::mutex mutex;
+    std::atomic<int> counter{0};
     for (size_t i = 0; i < 10; ++i)
-        pool.schedule([&]{ std::lock_guard lock(mutex); std::cerr << '.'; });
+        pool.schedule([&]{ ++counter; });
     pool.wait();
+
+    return counter;
 }
 
-int main(int, char **)
+TEST(ThreadPool, ThreadRemoval)
 {
-    test<FreeThreadPool>();
-    std::cerr << '\n';
-    test<ThreadPool>();
-    std::cerr << '\n';
-
-    return 0;
+    EXPECT_EQ(test<FreeThreadPool>(), 10);
+    EXPECT_EQ(test<ThreadPool>(), 10);
 }

dbms/src/Common/tests/thread_pool_2.cpp → dbms/src/Common/tests/gtest_thread_pool_loop.cpp

@@ -2,10 +2,17 @@
 #include <iostream>
 #include <Common/ThreadPool.h>
 
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#ifdef __clang__
+    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+    #pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gtest/gtest.h>
 
-int main(int, char **)
+
+TEST(ThreadPool, Loop)
 {
-    std::atomic<size_t> res{0};
+    std::atomic<int> res{0};
 
     for (size_t i = 0; i < 1000; ++i)
     {
@@ -16,6 +23,5 @@ int main(int, char **)
         pool.wait();
     }
 
-    std::cerr << res << "\n";
-    return 0;
+    EXPECT_EQ(res, 16000);
 }

dbms/src/Common/tests/thread_pool_schedule_exception.cpp → dbms/src/Common/tests/gtest_thread_pool_schedule_exception.cpp

@@ -2,8 +2,15 @@
 #include <stdexcept>
 #include <Common/ThreadPool.h>
 
+#pragma GCC diagnostic ignored "-Wsign-compare"
+#ifdef __clang__
+    #pragma clang diagnostic ignored "-Wzero-as-null-pointer-constant"
+    #pragma clang diagnostic ignored "-Wundef"
+#endif
+#include <gtest/gtest.h>
 
-int main(int, char **)
+
+bool check()
 {
     ThreadPool pool(10);
 
@@ -11,15 +18,21 @@ int main(int, char **)
 
     try
     {
-        while (true)
+        for (size_t i = 0; i < 100; ++i)
             pool.schedule([]{});    /// An exception will be rethrown from this method.
     }
-    catch (const std::runtime_error & e)
+    catch (const std::runtime_error &)
     {
-        std::cerr << e.what() << "\n";
+        return true;
     }
 
     pool.wait();
 
-    return 0;
+    return false;
+}
+
+
+TEST(ThreadPool, ExceptionFromSchedule)
+{
+    EXPECT_TRUE(check());
 }