Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-07-05 03:21:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpinet] Unit tests: use UNSCOPED_INFO in several places (#9007)

Browse Source
This commit is contained in:
Peter Johnson
2026-06-21 13:52:38 -07:00
committed by GitHub
parent 7dcb70cfcd
commit 7298d9eafb
4 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpinet/src/test/native/cpp/WebSocketClientTest.cpp
View File

@@ -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);
});
};

30
wpinet/src/test/native/cpp/WebSocketServerTest.cpp
View File

@@ -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);
});
};

14
wpinet/src/test/native/cpp/WebSocketTest.cpp
View File

@@ -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);
});
});

1
wpinet/src/test/native/cpp/WebSocketTest.hpp
View File

@@ -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"