test

Author: ReenigneArcher

src/tray_windows.c

@@ -290,21 +290,18 @@ void tray_update(struct tray *tray) {
     MultiByteToWideChar(CP_UTF8, 0, tray->tooltip, -1, nid.szTip, sizeof(nid.szTip) / sizeof(wchar_t));
     nid.uFlags |= NIF_TIP;
   }
-  QUERY_USER_NOTIFICATION_STATE notification_state;
-  HRESULT ns = SHQueryUserNotificationState(&notification_state);
-  int can_show_notifications = ns == S_OK && notification_state == QUNS_ACCEPTS_NOTIFICATIONS;
-  if (can_show_notifications == 1 && tray->notification_title != 0 && strlen(tray->notification_title) > 0) {
+  if (tray->notification_title != 0 && strlen(tray->notification_title) > 0) {
     MultiByteToWideChar(CP_UTF8, 0, tray->notification_title, -1, nid.szInfoTitle, sizeof(nid.szInfoTitle) / sizeof(wchar_t));
     nid.uFlags |= NIF_INFO;
   } else if ((nid.uFlags & NIF_INFO) == NIF_INFO) {
     nid.szInfoTitle[0] = L'\0';
   }
-  if (can_show_notifications == 1 && tray->notification_text != 0 && strlen(tray->notification_text) > 0) {
+  if (tray->notification_text != 0 && strlen(tray->notification_text) > 0) {
     MultiByteToWideChar(CP_UTF8, 0, tray->notification_text, -1, nid.szInfo, sizeof(nid.szInfo) / sizeof(wchar_t));
   } else if ((nid.uFlags & NIF_INFO) == NIF_INFO) {
     nid.szInfo[0] = L'\0';
   }
-  if (can_show_notifications == 1 && tray->notification_cb != NULL) {
+  if (tray->notification_cb != NULL) {
     notification_cb = tray->notification_cb;
   }
 
@@ -330,6 +327,10 @@ void tray_exit(void) {
   UnregisterClass(WC_TRAY_CLASS_NAME, GetModuleHandle(NULL));
 }
 
+/**
+ * @brief Get the window handle of the tray.
+ * @return Window handle.
+ */
 HWND tray_get_hwnd(void) {
   return hwnd;
 }

tests/unit/test_tray.cpp

@@ -7,6 +7,10 @@
 
 #if defined(_WIN32) || defined(_WIN64)
   #include <windows.h>
+  // clang-format off
+  // build fails if shellapi.h is included before windows.h
+  #include <shellapi.h>
+  // clang-format on
   #define TRAY_WINAPI 1
 #elif defined(__linux__) || defined(linux) || defined(__linux)
   #define TRAY_APPINDICATOR 1
@@ -278,6 +282,14 @@ TEST_F(TrayTest, TestNotificationDisplay) {
   GTEST_SKIP() << "Notifications only supported on desktop platforms";
 #endif
 
+#if defined(_WIN32)
+  QUERY_USER_NOTIFICATION_STATE notification_state;
+  HRESULT ns = SHQueryUserNotificationState(&notification_state);
+  if (ns != S_OK || notification_state != QUNS_ACCEPTS_NOTIFICATIONS) {
+    GTEST_SKIP() << "Notifications not accepted in this environment";
+  }
+#endif
+
   int initResult = tray_init(&testTray);
   trayRunning = (initResult == 0);
   ASSERT_EQ(initResult, 0);
@@ -290,6 +302,8 @@ TEST_F(TrayTest, TestNotificationDisplay) {
   tray_update(&testTray);
   tray_loop(1);
 
+  std::this_thread::sleep_for(std::chrono::milliseconds(5000));
+
   EXPECT_TRUE(captureScreenshot("tray_notification_displayed"));
 
   // Clear notification
@@ -304,6 +318,14 @@ TEST_F(TrayTest, TestNotificationCallback) {
   GTEST_SKIP() << "Notifications only supported on desktop platforms";
 #endif
 
+#if defined(_WIN32)
+  QUERY_USER_NOTIFICATION_STATE notification_state;
+  HRESULT ns = SHQueryUserNotificationState(&notification_state);
+  if (ns != S_OK || notification_state != QUNS_ACCEPTS_NOTIFICATIONS) {
+    GTEST_SKIP() << "Notifications not accepted in this environment";
+  }
+#endif
+
   static bool callbackInvoked = false;
   auto notification_callback = []() {
     callbackInvoked = true;
@@ -322,6 +344,8 @@ TEST_F(TrayTest, TestNotificationCallback) {
   tray_update(&testTray);
   tray_loop(1);
 
+  std::this_thread::sleep_for(std::chrono::milliseconds(5000));
+
   EXPECT_TRUE(captureScreenshot("tray_notification_with_callback"));
 
   // Note: callback would be invoked by user interaction in real scenario