test/gestures: Factor out waitForWindowCount

Reduce code duplication in the gestures test.

Author: kolayne

hyprtester/src/tests/main/gestures.cpp

@@ -18,6 +18,20 @@ using namespace Hyprutils::Memory;
 #define UP CUniquePointer
 #define SP CSharedPointer
 
+static bool waitForWindowCount(int expected_window_cnt, std::string_view expectation, int wait_millis = 100, int max_wait_cnt = 50) {
+    int counter = 0;
+    while (Tests::windowCount() != expected_window_cnt) {
+        counter++;
+        std::this_thread::sleep_for(std::chrono::milliseconds(wait_millis));
+
+        if (counter > max_wait_cnt) {
+            NLog::log("{}Unmet expectation: {}", Colors::RED, expectation);
+            return false;
+        }
+    }
+    return true;
+}
+
 static bool test() {
     NLog::log("{}Testing gestures", Colors::GREEN);
 
@@ -34,32 +48,14 @@ static bool test() {
     std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
     OK(getFromSocket("/dispatch plugin:test:gesture up,4"));
-    int counter = 0;
-    while (Tests::windowCount() != 0) {
-        counter++;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
 
-        if (counter > 50) {
-            NLog::log("{}Gesture didnt send ctrl+d to kitty", Colors::RED);
-            return false;
-        }
-    }
+    EXPECT(waitForWindowCount(0, "Gesture sent ctrl+d to kitty"), true);
 
     EXPECT(Tests::windowCount(), 0);
 
     OK(getFromSocket("/dispatch plugin:test:gesture left,3"));
 
-    // wait while kitty spawns
-    counter = 0;
-    while (Tests::windowCount() != 1) {
-        counter++;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-        if (counter > 50) {
-            NLog::log("{}Gesture didnt spawn kitty", Colors::RED);
-            return false;
-        }
-    }
+    EXPECT(waitForWindowCount(1, "Gesture spawned kitty"), true);
 
     EXPECT(Tests::windowCount(), 1);
 
@@ -146,16 +142,7 @@ static bool test() {
 
     OK(getFromSocket("/dispatch plugin:test:gesture up,3"));
 
-    counter = 0;
-    while (Tests::windowCount() != 0) {
-        counter++;
-        std::this_thread::sleep_for(std::chrono::milliseconds(100));
-
-        if (counter > 50) {
-            NLog::log("{}Gesture didnt close kitty", Colors::RED);
-            return false;
-        }
-    }
+    EXPECT(waitForWindowCount(0, "Gesture closed kitty"), true);
 
     EXPECT(Tests::windowCount(), 0);