Skip to content

Commit 679cbb3

Browse files
committed
Committing clang-format changes
1 parent 17b76f8 commit 679cbb3

File tree

2 files changed

+21
-16
lines changed

2 files changed

+21
-16
lines changed

include/glaze/net/websocket_client.hpp

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
#include <memory>
88
#include <mutex>
99
#include <random>
10-
#include <vector>
1110
#include <variant>
11+
#include <vector>
1212

1313
#include "glaze/net/http_client.hpp"
1414
#include "glaze/net/websocket_connection.hpp"
@@ -17,8 +17,7 @@ namespace glz
1717
{
1818
struct websocket_client
1919
{
20-
enum class header_validation_error : uint8_t
21-
{
20+
enum class header_validation_error : uint8_t {
2221
none,
2322
empty_name,
2423
reserved_name,
@@ -568,10 +567,7 @@ namespace glz
568567
// Clear all additional handshake headers previously set via set_header().
569568
void clear_headers() { impl_->clear_request_headers(); }
570569

571-
[[nodiscard]] header_validation_error last_header_error() const
572-
{
573-
return impl_->last_header_validation_error();
574-
}
570+
[[nodiscard]] header_validation_error last_header_error() const { return impl_->last_header_validation_error(); }
575571

576572
std::shared_ptr<asio::io_context>& context() { return impl_->ctx; }
577573

tests/networking_tests/websocket_test/websocket_client_test.cpp

Lines changed: 18 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,8 @@ suite websocket_client_tests = [] {
10431043
client.connect(client_url);
10441044
std::thread client_thread([&client]() { client.context()->run(); });
10451045

1046-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1046+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1047+
<< "Handshake did not complete";
10471048
expect(open_called.load()) << "Client should connect when required Authorization header is provided";
10481049
expect(!error_called.load()) << "No error expected when Authorization header is valid";
10491050

@@ -1096,7 +1097,8 @@ suite websocket_client_tests = [] {
10961097
client.connect(client_url);
10971098
std::thread client_thread([&client]() { client.context()->run(); });
10981099

1099-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1100+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1101+
<< "Handshake did not complete";
11001102
expect(!open_called.load()) << "Client should fail when required header has been cleared";
11011103
expect(error_called.load()) << "Missing auth header should fail the handshake";
11021104

@@ -1150,7 +1152,8 @@ suite websocket_client_tests = [] {
11501152
client.connect(client_url);
11511153
std::thread client_thread([&client]() { client.context()->run(); });
11521154

1153-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1155+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1156+
<< "Handshake did not complete";
11541157
expect(open_called.load()) << "Rejected non-ASCII header name should not affect valid Authorization header";
11551158
expect(!error_called.load()) << "No error expected when non-ASCII override is rejected";
11561159

@@ -1196,7 +1199,8 @@ suite websocket_client_tests = [] {
11961199
client.connect(client_url);
11971200
std::thread client_thread([&client]() { client.context()->run(); });
11981201

1199-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1202+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1203+
<< "Handshake did not complete";
12001204
expect(open_called.load()) << "Latest header value should replace prior value case-insensitively";
12011205
expect(!error_called.load()) << "No error expected when replacement header value is valid";
12021206

@@ -1242,7 +1246,8 @@ suite websocket_client_tests = [] {
12421246
client.connect(client_url);
12431247
std::thread client_thread([&client]() { client.context()->run(); });
12441248

1245-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1249+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1250+
<< "Handshake did not complete";
12461251
expect(!open_called.load()) << "Invalid header value should be rejected";
12471252
expect(error_called.load()) << "Rejected header should result in handshake failure";
12481253

@@ -1291,7 +1296,8 @@ suite websocket_client_tests = [] {
12911296
client.connect(client_url);
12921297
std::thread client_thread([&client]() { client.context()->run(); });
12931298

1294-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1299+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1300+
<< "Handshake did not complete";
12951301
expect(open_called.load()) << "Reserved handshake header names should be ignored, not override handshake";
12961302
expect(!error_called.load()) << "No error expected when reserved header overrides are rejected";
12971303

@@ -1339,9 +1345,11 @@ suite websocket_client_tests = [] {
13391345
client.connect(client_url);
13401346
std::thread client_thread([&client]() { client.context()->run(); });
13411347

1342-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1348+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1349+
<< "Handshake did not complete";
13431350
expect(open_called.load()) << "Client should still connect with the valid Authorization header";
1344-
expect(!error_called.load()) << "Invalid header name should be rejected before handshake, not break valid headers";
1351+
expect(!error_called.load())
1352+
<< "Invalid header name should be rejected before handshake, not break valid headers";
13451353

13461354
if (!client.context()->stopped()) client.context()->stop();
13471355
if (client_thread.joinable()) client_thread.join();
@@ -1387,7 +1395,8 @@ suite websocket_client_tests = [] {
13871395
client.connect(client_url);
13881396
std::thread client_thread([&client]() { client.context()->run(); });
13891397

1390-
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); })) << "Handshake did not complete";
1398+
expect(wait_for_condition([&] { return open_called.load() || error_called.load(); }))
1399+
<< "Handshake did not complete";
13911400
expect(open_called.load()) << "Reserved Sec-WebSocket-* rejection should not affect valid auth header";
13921401
expect(!error_called.load()) << "No error expected when reserved mixed-case override is rejected";
13931402

0 commit comments

Comments
 (0)