Refactor tests and benchmarks

.github/workflows/test.yml

@@ -7,6 +7,7 @@ on:
 
 env:
   TWITCH_PUBSUB_SERVER_IMAGE: ghcr.io/chatterino/twitch-pubsub-server-test:v1.0.6
+  QT_QPA_PLATFORM: minimal
 
 concurrency:
   group: test-${{ github.ref }}
@@ -74,7 +75,7 @@ jobs:
         if: startsWith(matrix.os, 'ubuntu')
         run: |
           cmake -DBUILD_TESTS=On -DBUILD_APP=OFF ..
-          cmake --build . --config Release
+          cmake --build .
         working-directory: build-test
         shell: bash
 
@@ -85,6 +86,6 @@ jobs:
           docker pull ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
           docker run --network=host --detach ${{ env.TWITCH_PUBSUB_SERVER_IMAGE }}
           docker run -p 9051:80 --detach kennethreitz/httpbin
-          ./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal || ./bin/chatterino-test --platform minimal
+          ./bin/chatterino-test || ./bin/chatterino-test || ./bin/chatterino-test
         working-directory: build-test
         shell: bash

CHANGELOG.md

@@ -28,6 +28,7 @@
 - Dev: Added support for compiling with `sccache`. (#4678)
 - Dev: Added `sccache` in Windows CI. (#4678)
 - Dev: Moved preprocessor Git and date definitions to executables only. (#4681)
+- Dev: Refactored tests to be able to use `ctest` and run in debug builds. (#4700)
 
 ## 2.4.4
 

CMakeLists.txt

@@ -138,6 +138,7 @@ find_package(RapidJSON REQUIRED)
 find_package(Websocketpp REQUIRED)
 
 if (BUILD_TESTS)
+    include(GoogleTest)
     # For MSVC: Prevent overriding the parent project's compiler/linker settings
     # See https://github.com/google/googletest/blob/main/googletest/README.md#visual-studio-dynamic-vs-static-runtimes
     set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)

benchmarks/src/main.cpp

@@ -18,12 +18,12 @@ int main(int argc, char **argv)
     settingsDir.setAutoRemove(false);  // we'll remove it manually
     chatterino::Settings settings(settingsDir.path());
 
-    QtConcurrent::run([&app, &settingsDir]() mutable {
+    QTimer::singleShot(0, [&]() {
         ::benchmark::RunSpecifiedBenchmarks();
 
         settingsDir.remove();
-        app.exit(0);
+        QApplication::exit(0);
     });
 
-    return app.exec();
+    return QApplication::exec();
 }

src/messages/Image.cpp

@@ -595,8 +595,8 @@ ImageExpirationPool::ImageExpirationPool()
 
 ImageExpirationPool &ImageExpirationPool::instance()
 {
-    static ImageExpirationPool instance;
-    return instance;
+    static auto *instance = new ImageExpirationPool;
+    return *instance;
 }
 
 void ImageExpirationPool::addImagePtr(ImagePtr imgPtr)

tests/CMakeLists.txt

@@ -60,10 +60,4 @@ if(CHATTERINO_TEST_USE_PUBLIC_HTTPBIN)
     target_compile_definitions(${PROJECT_NAME} PRIVATE CHATTERINO_TEST_USE_PUBLIC_HTTPBIN)
 endif()
 
-# gtest_add_tests manages to discover the tests because it looks through the source files
-# HOWEVER, it fails to run, because we have some bug that causes the QApplication exit to stall when no network requests have been made.
-# ctest runs each test individually, so for now we require that testers just run the ./bin/chatterino-test binary without any filters applied
-# gtest_add_tests(
-#     TARGET ${PROJECT_NAME}
-#     SOURCES ${test_SOURCES}
-#     )
+gtest_discover_tests(${PROJECT_NAME})