From e4b6fedfb96c8796e92f558b281e0dbdab5f5b66 Mon Sep 17 00:00:00 2001
From: Vaxry <vaxry@vaxry.net>
Date: Fri, 27 Jun 2025 12:18:45 +0200
Subject: [PATCH] tester: simplify adding test files

---
 hyprtester/src/main.cpp                  | 17 +++--------------
 hyprtester/src/tests/main/groups.cpp     |  4 +++-
 hyprtester/src/tests/main/misc.cpp       |  4 +++-
 hyprtester/src/tests/main/tests.hpp      | 14 ++++++++++----
 hyprtester/src/tests/main/window.cpp     |  4 +++-
 hyprtester/src/tests/main/workspaces.cpp |  4 +++-
 6 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/hyprtester/src/main.cpp b/hyprtester/src/main.cpp
index 176eb7020..6fd42e1aa 100644
--- a/hyprtester/src/main.cpp
+++ b/hyprtester/src/main.cpp
@@ -218,20 +218,9 @@ int main(int argc, char** argv, char** envp) {
 
     NLog::log("{}Loaded plugin", Colors::YELLOW);
 
-    // now we can start issuing stuff.
-    NLog::log("{}testing windows", Colors::YELLOW);
-    EXPECT(testWindows(), true);
-
-    std::this_thread::sleep_for(std::chrono::milliseconds(2000));
-
-    NLog::log("{}testing groups", Colors::YELLOW);
-    EXPECT(testGroups(), true);
-
-    NLog::log("{}testing workspaces", Colors::YELLOW);
-    EXPECT(testWorkspaces(), true);
-
-    NLog::log("{}testing misc variables", Colors::YELLOW);
-    EXPECT(testMisc(), true);
+    for (const auto& fn : testFns) {
+        EXPECT(fn(), true);
+    }
 
     NLog::log("{}running plugin test", Colors::YELLOW);
     EXPECT(testPlugin(), true);
diff --git a/hyprtester/src/tests/main/groups.cpp b/hyprtester/src/tests/main/groups.cpp
index ed8e4ba47..3cf15851a 100644
--- a/hyprtester/src/tests/main/groups.cpp
+++ b/hyprtester/src/tests/main/groups.cpp
@@ -18,7 +18,7 @@ using namespace Hyprutils::Memory;
 #define UP CUniquePointer
 #define SP CSharedPointer
 
-bool testGroups() {
+static bool test() {
     NLog::log("{}Testing groups", Colors::GREEN);
 
     // test on workspace "window"
@@ -175,3 +175,5 @@ bool testGroups() {
 
     return !ret;
 }
+
+REGISTER_TEST_FN(test)
diff --git a/hyprtester/src/tests/main/misc.cpp b/hyprtester/src/tests/main/misc.cpp
index db0d9092a..a90214ce1 100644
--- a/hyprtester/src/tests/main/misc.cpp
+++ b/hyprtester/src/tests/main/misc.cpp
@@ -18,7 +18,7 @@ using namespace Hyprutils::Memory;
 #define UP CUniquePointer
 #define SP CSharedPointer
 
-bool testMisc() {
+static bool test() {
     NLog::log("{}Testing config: misc:", Colors::GREEN);
 
     NLog::log("{}Testing close_special_on_empty", Colors::YELLOW);
@@ -140,3 +140,5 @@ bool testMisc() {
 
     return !ret;
 }
+
+REGISTER_TEST_FN(test);
diff --git a/hyprtester/src/tests/main/tests.hpp b/hyprtester/src/tests/main/tests.hpp
index accde951f..757052b60 100644
--- a/hyprtester/src/tests/main/tests.hpp
+++ b/hyprtester/src/tests/main/tests.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-bool testGroups();
-bool testWindows();
-bool testWorkspaces();
-bool testMisc();
\ No newline at end of file
+#include <vector>
+#include <functional>
+
+inline std::vector<std::function<bool()>> testFns;
+
+#define REGISTER_TEST_FN(fn)                                                                                                                                                       \
+    static auto _register_fn = [] {                                                                                                                                                \
+        testFns.emplace_back(fn);                                                                                                                                                  \
+        return 1;                                                                                                                                                                  \
+    }();
diff --git a/hyprtester/src/tests/main/window.cpp b/hyprtester/src/tests/main/window.cpp
index 4eecd68d0..d79e61552 100644
--- a/hyprtester/src/tests/main/window.cpp
+++ b/hyprtester/src/tests/main/window.cpp
@@ -18,7 +18,7 @@ using namespace Hyprutils::Memory;
 #define UP CUniquePointer
 #define SP CSharedPointer
 
-bool testWindows() {
+static bool test() {
     NLog::log("{}Testing windows", Colors::GREEN);
 
     // test on workspace "window"
@@ -94,3 +94,5 @@ bool testWindows() {
 
     return !ret;
 }
+
+REGISTER_TEST_FN(test)
diff --git a/hyprtester/src/tests/main/workspaces.cpp b/hyprtester/src/tests/main/workspaces.cpp
index ccacff28d..96efacfac 100644
--- a/hyprtester/src/tests/main/workspaces.cpp
+++ b/hyprtester/src/tests/main/workspaces.cpp
@@ -18,7 +18,7 @@ using namespace Hyprutils::Memory;
 #define UP CUniquePointer
 #define SP CSharedPointer
 
-bool testWorkspaces() {
+static bool test() {
     NLog::log("{}Testing workspaces", Colors::GREEN);
 
     // test on workspace "window"
@@ -347,3 +347,5 @@ bool testWorkspaces() {
 
     return !ret;
 }
+
+REGISTER_TEST_FN(test)