From 7298d9eafb76cb1e873bb9ae21f9366092442436 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sun, 21 Jun 2026 13:52:38 -0700
Subject: [PATCH] [wpinet] Unit tests: use UNSCOPED_INFO in several places
 (#9007)

---
 .../test/native/cpp/WebSocketClientTest.cpp   | 10 +++----
 .../test/native/cpp/WebSocketServerTest.cpp   | 30 +++++++++----------
 wpinet/src/test/native/cpp/WebSocketTest.cpp  | 14 ++++-----
 wpinet/src/test/native/cpp/WebSocketTest.hpp  |  1 +
 4 files changed, 28 insertions(+), 27 deletions(-)

diff --git a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
index cce9af9a32..956b10e29f 100644
--- a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
@@ -82,7 +82,7 @@ class WebSocketClientTest : public WebSocketTest {
           if (req.HasError()) {
             Finish();
           }
-          INFO(http_errno_name(req.GetError()));
+          UNSCOPED_INFO(http_errno_name(req.GetError()));
           REQUIRE(req.GetError() == HPE_OK);
           if (data.empty()) {
             return;
@@ -138,7 +138,7 @@ TEST_CASE_METHOD(WebSocketClientTest, "WebSocketClientTest BadAccept",
     ws->closed.connect([&](uint16_t code, std::string_view msg) {
       Finish();
       ++gotClosed;
-      INFO("Message: " << msg);
+      UNSCOPED_INFO("Message: " << msg);
       REQUIRE(code == 1002);
     });
     ws->open.connect([&](std::string_view protocol) {
@@ -188,7 +188,7 @@ TEST_CASE_METHOD(WebSocketClientTest, "WebSocketClientTest ProtocolRespNotReq",
     ws->closed.connect([&](uint16_t code, std::string_view msg) {
       Finish();
       ++gotClosed;
-      INFO("Message: " << msg);
+      UNSCOPED_INFO("Message: " << msg);
       REQUIRE(code == 1003);
     });
     ws->open.connect([&](std::string_view protocol) {
@@ -211,7 +211,7 @@ TEST_CASE_METHOD(WebSocketClientTest, "WebSocketClientTest ProtocolReqNotResp",
     ws->closed.connect([&](uint16_t code, std::string_view msg) {
       Finish();
       ++gotClosed;
-      INFO("Message: " << msg);
+      UNSCOPED_INFO("Message: " << msg);
       REQUIRE(code == 1002);
     });
     ws->open.connect([&](std::string_view protocol) {
@@ -311,7 +311,7 @@ TEST_CASE_METHOD(WebSocketClientDataTest,
     });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
diff --git a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
index 4d9b05c17c..1b6a8f7c07 100644
--- a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
@@ -41,7 +41,7 @@ class WebSocketServerTest : public WebSocketTest {
           if (resp.HasError()) {
             Finish();
           }
-          INFO(http_errno_name(resp.GetError()));
+          UNSCOPED_INFO(http_errno_name(resp.GetError()));
           REQUIRE(resp.GetError() == HPE_OK);
           if (data.empty()) {
             return;
@@ -75,7 +75,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest Terminate",
     ws->open.connect([&](std::string_view) { ws->Terminate(); });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1006);
     });
   };
@@ -93,7 +93,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest TerminateCode",
     ws->open.connect([&](std::string_view) { ws->Terminate(1000); });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1000);
     });
   };
@@ -133,7 +133,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest CloseBasic",
     ws->open.connect([&](std::string_view) { ws->Close(); });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1005);
     });
   };
@@ -157,7 +157,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest CloseCode",
     ws->open.connect([&](std::string_view) { ws->Close(1000); });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1000);
     });
   };
@@ -210,7 +210,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest ReceiveCloseBasic",
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1005);
     });
   };
@@ -233,7 +233,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest ReceiveCloseCode",
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotClosed;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1000);
     });
   };
@@ -292,7 +292,7 @@ TEST_CASE_METHOD(WebSocketServerBadOpcodeTest,
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
@@ -321,7 +321,7 @@ TEST_CASE_METHOD(WebSocketServerControlFrameTest,
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
@@ -351,7 +351,7 @@ TEST_CASE_METHOD(WebSocketServerTest,
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
@@ -374,7 +374,7 @@ TEST_CASE_METHOD(WebSocketServerTest,
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
@@ -397,7 +397,7 @@ TEST_CASE_METHOD(WebSocketServerTest,
   setupWebSocket = [&] {
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
@@ -576,7 +576,7 @@ TEST_CASE_METHOD(WebSocketServerTest, "WebSocketServerTest ReceiveTooLarge",
     });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1009);
     });
   };
@@ -604,7 +604,7 @@ TEST_CASE_METHOD(WebSocketServerTest,
     });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1009);
     });
   };
@@ -839,7 +839,7 @@ TEST_CASE_METHOD(WebSocketServerDataTest,
     });
     ws->closed.connect([&](uint16_t code, std::string_view reason) {
       ++gotCallback;
-      INFO("reason: " << reason);
+      UNSCOPED_INFO("reason: " << reason);
       REQUIRE(code == 1002);
     });
   };
diff --git a/wpinet/src/test/native/cpp/WebSocketTest.cpp b/wpinet/src/test/native/cpp/WebSocketTest.cpp
index 704d0bea2a..f2b3568742 100644
--- a/wpinet/src/test/native/cpp/WebSocketTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketTest.cpp
@@ -143,7 +143,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateClientBasic",
       if (req.HasError()) {
         Finish();
       }
-      INFO(http_errno_name(req.GetError()));
+      UNSCOPED_INFO(http_errno_name(req.GetError()));
       REQUIRE(req.GetError() == HPE_OK);
     });
   });
@@ -183,7 +183,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateClientExtraHeaders",
       if (req.HasError()) {
         Finish();
       }
-      INFO(http_errno_name(req.GetError()));
+      UNSCOPED_INFO(http_errno_name(req.GetError()));
       REQUIRE(req.GetError() == HPE_OK);
     });
   });
@@ -234,7 +234,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateServerBasic",
   HttpParser resp{HttpParser::Type::RESPONSE};
   resp.status.connect([&](std::string_view status) {
     ++gotStatus;
-    INFO("status: " << status);
+    UNSCOPED_INFO("status: " << status);
     REQUIRE(resp.GetStatusCode() == 101u);
   });
   resp.header.connect([&](std::string_view name, std::string_view value) {
@@ -268,7 +268,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateServerBasic",
       if (resp.HasError()) {
         Finish();
       }
-      INFO(http_errno_name(resp.GetError()));
+      UNSCOPED_INFO(http_errno_name(resp.GetError()));
       REQUIRE(resp.GetError() == HPE_OK);
     });
   });
@@ -310,7 +310,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateServerProtocol",
       if (resp.HasError()) {
         Finish();
       }
-      INFO(http_errno_name(resp.GetError()));
+      UNSCOPED_INFO(http_errno_name(resp.GetError()));
       REQUIRE(resp.GetError() == HPE_OK);
     });
   });
@@ -329,7 +329,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateServerBadVersion",
   HttpParser resp{HttpParser::Type::RESPONSE};
   resp.status.connect([&](std::string_view status) {
     ++gotStatus;
-    INFO("status: " << status);
+    UNSCOPED_INFO("status: " << status);
     REQUIRE(resp.GetStatusCode() == 426u);
   });
   resp.header.connect([&](std::string_view name, std::string_view value) {
@@ -360,7 +360,7 @@ TEST_CASE_METHOD(WebSocketTest, "WebSocketTest CreateServerBadVersion",
       if (resp.HasError()) {
         Finish();
       }
-      INFO(http_errno_name(resp.GetError()));
+      UNSCOPED_INFO(http_errno_name(resp.GetError()));
       REQUIRE(resp.GetError() == HPE_OK);
     });
   });
diff --git a/wpinet/src/test/native/cpp/WebSocketTest.hpp b/wpinet/src/test/native/cpp/WebSocketTest.hpp
index 3bfe19a9c7..85386e61c5 100644
--- a/wpinet/src/test/native/cpp/WebSocketTest.hpp
+++ b/wpinet/src/test/native/cpp/WebSocketTest.hpp
@@ -9,6 +9,7 @@
 #include <span>
 #include <vector>
 
+#include <catch2/catch_message.hpp>
 #include <catch2/catch_test_macros.hpp>
 
 #include "wpi/net/uv/Loop.hpp"