Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-21 01:01:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

SCRIPT namespace replacements

Browse Source
This commit is contained in:
PJ Reiniger
2025-11-07 20:00:05 -05:00
committed by Peter Johnson
parent ae6c043632
commit 9aca8e0fd6
2622 changed files with 22275 additions and 22275 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
View File

@@ -17,15 +17,15 @@
static constexpr int kTcpConnectAttemptTimeout = 1000;
namespace uv = wpi::uv;
namespace uv = wpi::net::uv;
namespace wpilibws {
// Create Web Socket and specify event callbacks
void WebServerClientTest::InitializeWebSocket(const std::string& host, int port,
const std::string& uri) {
wpi::print("Will attempt to connect to: {}:{}{}\n", host, port, uri);
m_websocket = wpi::WebSocket::CreateClient(*m_tcp_client.get(), uri,
wpi::util::print("Will attempt to connect to: {}:{}{}\n", host, port, uri);
m_websocket = wpi::net::WebSocket::CreateClient(*m_tcp_client.get(), uri,
fmt::format("{}:{}", host, port));
// Hook up events
@@ -44,13 +44,13 @@ void WebServerClientTest::InitializeWebSocket(const std::string& host, int port,
});
m_websocket->text.connect([this](auto msg, bool) {
wpi::json j;
wpi::util::json j;
try {
j = wpi::json::parse(msg);
} catch (const wpi::json::parse_error& e) {
j = wpi::util::json::parse(msg);
} catch (const wpi::util::json::parse_error& e) {
std::string err("JSON parse failed: ");
err += e.what();
wpi::print(stderr, "{}\n", err);
wpi::util::print(stderr, "{}\n", err);
m_websocket->Fail(1003, err);
return;
}
@@ -69,7 +69,7 @@ void WebServerClientTest::InitializeWebSocket(const std::string& host, int port,
// Create tcp client, specify callbacks, and create timers for loop
bool WebServerClientTest::Initialize() {
m_loop.error.connect(
[](uv::Error err) { wpi::print(stderr, "uv Error: {}\n", err.str()); });
[](uv::Error err) { wpi::util::print(stderr, "uv Error: {}\n", err.str()); });
m_tcp_client = uv::Tcp::Create(m_loop);
if (!m_tcp_client) {
@@ -79,7 +79,7 @@ bool WebServerClientTest::Initialize() {
// Hook up TCP client events
m_tcp_client->error.connect(
[this, socket = m_tcp_client.get()](wpi::uv::Error err) {
[this, socket = m_tcp_client.get()](wpi::net::uv::Error err) {
if (m_tcp_connected) {
m_tcp_connected = false;
m_connect_attempts = 0;
@@ -110,7 +110,7 @@ bool WebServerClientTest::Initialize() {
void WebServerClientTest::AttemptConnect() {
m_connect_attempts++;
wpi::print("Test Client Connection Attempt {}\n", m_connect_attempts);
wpi::util::print("Test Client Connection Attempt {}\n", m_connect_attempts);
if (m_connect_attempts >= 5) {
std::fputs("Test Client Timeout. Unable to connect\n", stderr);
@@ -126,15 +126,15 @@ void WebServerClientTest::AttemptConnect() {
});
}
void WebServerClientTest::SendMessage(const wpi::json& msg) {
void WebServerClientTest::SendMessage(const wpi::util::json& msg) {
if (msg.empty()) {
std::fputs("Message to send is empty\n", stderr);
return;
}
wpi::SmallVector<uv::Buffer, 4> sendBufs;
wpi::util::SmallVector<uv::Buffer, 4> sendBufs;
wpi::raw_uv_ostream os{sendBufs, [this]() -> uv::Buffer {
wpi::net::raw_uv_ostream os{sendBufs, [this]() -> uv::Buffer {
std::lock_guard lock(m_buffers_mutex);
return m_buffers->Allocate();
}};
@@ -142,20 +142,20 @@ void WebServerClientTest::SendMessage(const wpi::json& msg) {
// Call the websocket send function on the uv loop
m_exec->Call([this, sendBufs]() mutable {
m_websocket->SendText(sendBufs, [this](auto bufs, wpi::uv::Error err) {
m_websocket->SendText(sendBufs, [this](auto bufs, wpi::net::uv::Error err) {
{
std::lock_guard lock(m_buffers_mutex);
m_buffers->Release(bufs);
}
if (err) {
wpi::print(stderr, "{}\n", err.str());
wpi::util::print(stderr, "{}\n", err.str());
std::fflush(stderr);
}
});
});
}
const wpi::json& WebServerClientTest::GetLastMessage() {
const wpi::util::json& WebServerClientTest::GetLastMessage() {
return m_json;
}

24
simulation/halsim_ws_server/src/test/native/cpp/main.cpp
View File

@@ -17,7 +17,7 @@
#include "wpi/net/uv/Loop.hpp"
#include "wpi/util/print.hpp"
namespace uv = wpi::uv;
namespace uv = wpi::net::uv;
using namespace wpilibws;
@@ -51,13 +51,13 @@ TEST_F(WebServerIntegrationTest, DISABLED_DigitalOutput) {
// Attach timer to loop for test function
m_server.runner.ExecSync([&](auto& loop) {
auto timer = wpi::uv::Timer::Create(loop);
auto timer = wpi::net::uv::Timer::Create(loop);
timer->timeout.connect([&] {
if (done) {
return;
}
if (IsConnectedClientWS()) {
wpi::print("***** Setting DIO value for pin {} to {}\n", PIN,
wpi::util::print("***** Setting DIO value for pin {} to {}\n", PIN,
(EXPECTED_VALUE ? "true" : "false"));
HALSIM_SetDIOValue(PIN, EXPECTED_VALUE);
done = true;
@@ -80,12 +80,12 @@ TEST_F(WebServerIntegrationTest, DISABLED_DigitalOutput) {
test_type = msg.at("type").get_ref<const std::string&>();
test_device = msg.at("device").get_ref<const std::string&>();
auto& data = msg.at("data");
wpi::json::const_iterator it = data.find("<>value");
wpi::util::json::const_iterator it = data.find("<>value");
if (it != data.end()) {
test_value = it.value();
}
} catch (wpi::json::exception& e) {
wpi::print(stderr, "Error with incoming message: {}\n", e.what());
} catch (wpi::util::json::exception& e) {
wpi::util::print(stderr, "Error with incoming message: {}\n", e.what());
}
// Compare results
@@ -102,16 +102,16 @@ TEST_F(WebServerIntegrationTest, DISABLED_DigitalInput) {
// Attach timer to loop for test function
m_server.runner.ExecSync([&](auto& loop) {
auto timer = wpi::uv::Timer::Create(loop);
auto timer = wpi::net::uv::Timer::Create(loop);
timer->timeout.connect([&] {
if (done) {
return;
}
if (IsConnectedClientWS()) {
wpi::json msg = {{"type", "DIO"},
wpi::util::json msg = {{"type", "DIO"},
{"device", std::to_string(PIN)},
{"data", {{"<>value", EXPECTED_VALUE}}}};
wpi::print("***** Input JSON: {}\n", msg.dump());
wpi::util::print("***** Input JSON: {}\n", msg.dump());
m_webserverClient->SendMessage(msg);
done = true;
}
@@ -136,17 +136,17 @@ TEST_F(WebServerIntegrationTest, DriverStation) {
// Attach timer to loop for test function
m_server.runner.ExecSync([&](auto& loop) {
auto timer = wpi::uv::Timer::Create(loop);
auto timer = wpi::net::uv::Timer::Create(loop);
timer->timeout.connect([&] {
if (done) {
return;
}
if (IsConnectedClientWS()) {
wpi::json msg = {
wpi::util::json msg = {
{"type", "DriverStation"},
{"device", ""},
{"data", {{">enabled", EXPECTED_VALUE}, {">new_data", true}}}};
wpi::print("***** Input JSON: {}\n", msg.dump());
wpi::util::print("***** Input JSON: {}\n", msg.dump());
m_webserverClient->SendMessage(msg);
done = true;
}