Skip to content

Commit bd1aa18

Browse files
committed
Update tests
1 parent d899108 commit bd1aa18

2 files changed

Lines changed: 15 additions & 15 deletions

File tree

tests/fake_rtde_server.cpp

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
5353
size += serializer.serialize(buffer + size, accepted);
5454

5555
size_t written;
56-
server_.write(filedescriptor, buffer, size, written);
56+
server_.writeUnchecked(filedescriptor, buffer, size, written);
5757
break;
5858
}
5959
case rtde_interface::PackageType::RTDE_GET_URCONTROL_VERSION:
@@ -70,7 +70,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
7070
size += serializer.serialize(buffer + size, version); // build
7171

7272
size_t written;
73-
server_.write(filedescriptor, buffer, size, written);
73+
server_.writeUnchecked(filedescriptor, buffer, size, written);
7474
break;
7575
}
7676
case rtde_interface::PackageType::RTDE_CONTROL_PACKAGE_SETUP_OUTPUTS:
@@ -98,7 +98,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
9898
// only important, that no field is "NOT_FOUND".
9999

100100
size_t written;
101-
server_.write(filedescriptor, buffer, size, written);
101+
server_.writeUnchecked(filedescriptor, buffer, size, written);
102102
URCL_LOG_INFO("Output recipe set");
103103
break;
104104
}
@@ -124,7 +124,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
124124
// only important, that no field is "NOT_FOUND".
125125

126126
size_t written;
127-
server_.write(filedescriptor, buffer, size, written);
127+
server_.writeUnchecked(filedescriptor, buffer, size, written);
128128

129129
URCL_LOG_INFO("Input recipe set with %zu variables.", input_recipe_.size());
130130
break;
@@ -140,7 +140,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
140140
size += serializer.serialize(buffer + size, accepted);
141141

142142
size_t written;
143-
server_.write(filedescriptor, buffer, size, written);
143+
server_.writeUnchecked(filedescriptor, buffer, size, written);
144144
startSendingDataPackages();
145145
break;
146146
}
@@ -155,7 +155,7 @@ void RTDEServer::messageCallback(const socket_t filedescriptor, char* buffer, in
155155
size += serializer.serialize(buffer + size, accepted);
156156

157157
size_t written;
158-
server_.write(filedescriptor, buffer, size, written);
158+
server_.writeUnchecked(filedescriptor, buffer, size, written);
159159
stopSendingDataPackages();
160160
break;
161161
}

tests/test_tcp_server.cpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -510,8 +510,8 @@ TEST_F(TCPServerTest, rapid_connect_disconnect_with_concurrent_writes)
510510
}
511511
});
512512

513-
constexpr int kIterations = 50;
514-
for (int i = 0; i < kIterations; ++i)
513+
constexpr int num_iterations = 50;
514+
for (int i = 0; i < num_iterations; ++i)
515515
{
516516
Client client(server.getPort());
517517
std::this_thread::sleep_for(std::chrono::milliseconds(1));
@@ -528,35 +528,35 @@ TEST_F(TCPServerTest, concurrent_writes_multiple_clients)
528528
std::mutex fds_mutex;
529529
std::vector<socket_t> connected_fds;
530530
std::condition_variable all_connected_cv;
531-
constexpr size_t kNumClients = 10;
531+
constexpr size_t num_clients = 10;
532532

533533
server.setConnectCallback([&](const socket_t fd) {
534534
std::lock_guard<std::mutex> lk(fds_mutex);
535535
connected_fds.push_back(fd);
536-
if (connected_fds.size() == kNumClients)
536+
if (connected_fds.size() == num_clients)
537537
{
538538
all_connected_cv.notify_all();
539539
}
540540
});
541541
server.start();
542542

543543
std::vector<std::unique_ptr<Client>> clients;
544-
for (size_t i = 0; i < kNumClients; ++i)
544+
for (size_t i = 0; i < num_clients; ++i)
545545
{
546546
clients.push_back(std::make_unique<Client>(server.getPort()));
547547
}
548548

549549
{
550550
std::unique_lock<std::mutex> lk(fds_mutex);
551551
ASSERT_TRUE(
552-
all_connected_cv.wait_for(lk, std::chrono::seconds(5), [&]() { return connected_fds.size() == kNumClients; }));
552+
all_connected_cv.wait_for(lk, std::chrono::seconds(5), [&]() { return connected_fds.size() == num_clients; }));
553553
}
554554

555555
const std::string message = "test data\n";
556556
const auto* data = reinterpret_cast<const uint8_t*>(message.c_str());
557557
const size_t len = message.size();
558558

559-
constexpr int kWritesPerThread = 100;
559+
constexpr int writes_per_thread = 100;
560560
std::atomic<int> total_successes{ 0 };
561561

562562
std::vector<std::thread> writers;
@@ -565,7 +565,7 @@ TEST_F(TCPServerTest, concurrent_writes_multiple_clients)
565565
for (const auto& fd : connected_fds)
566566
{
567567
writers.emplace_back([&server, fd, data, len, &total_successes]() {
568-
for (int j = 0; j < kWritesPerThread; ++j)
568+
for (int j = 0; j < writes_per_thread; ++j)
569569
{
570570
size_t written;
571571
if (server.write(fd, data, len, written))
@@ -582,7 +582,7 @@ TEST_F(TCPServerTest, concurrent_writes_multiple_clients)
582582
t.join();
583583
}
584584

585-
EXPECT_EQ(total_successes.load(), static_cast<int>(kNumClients) * kWritesPerThread);
585+
EXPECT_EQ(total_successes.load(), static_cast<int>(num_clients) * writes_per_thread);
586586
}
587587

588588
TEST_F(TCPServerTest, shutdown_during_active_writes)

0 commit comments

Comments
 (0)