mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-20 00:51:42 +00:00
SCRIPT namespace replacements
This commit is contained in:
committed by
Peter Johnson
parent
ae6c043632
commit
9aca8e0fd6
@@ -11,7 +11,7 @@
|
||||
#include "wpi/hal/handles/HandlesInternal.h"
|
||||
#include "wpi/hal/simulation/AnalogInData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestAnalogInCallbackName;
|
||||
HAL_Value gTestAnalogInCallbackValue;
|
||||
@@ -66,7 +66,7 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
|
||||
EXPECT_STREQ("Unset", gTestAnalogInCallbackName.c_str());
|
||||
|
||||
// Reset, should allow you to re-register
|
||||
hal::HandleBase::ResetGlobalHandles();
|
||||
wpi::hal::HandleBase::ResetGlobalHandles();
|
||||
HALSIM_ResetAnalogInData(INDEX_TO_TEST);
|
||||
callbackId = HALSIM_RegisterAnalogInInitializedCallback(
|
||||
INDEX_TO_TEST, &TestAnalogInInitializationCallback, &callbackParam,
|
||||
@@ -81,4 +81,4 @@ TEST(AnalogInSimTest, AnalogInInitialization) {
|
||||
EXPECT_STREQ("Initialized", gTestAnalogInCallbackName.c_str());
|
||||
HALSIM_CancelAnalogInInitializedCallback(INDEX_TO_TEST, callbackId);
|
||||
}
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "wpi/hal/handles/HandlesInternal.h"
|
||||
#include "wpi/hal/simulation/DIOData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestDigitalIoCallbackName;
|
||||
HAL_Value gTestDigitalIoCallbackValue;
|
||||
@@ -66,7 +66,7 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
|
||||
EXPECT_STREQ("Unset", gTestDigitalIoCallbackName.c_str());
|
||||
|
||||
// Reset, should allow you to re-register
|
||||
hal::HandleBase::ResetGlobalHandles();
|
||||
wpi::hal::HandleBase::ResetGlobalHandles();
|
||||
HALSIM_ResetDIOData(INDEX_TO_TEST);
|
||||
callbackId = HALSIM_RegisterDIOInitializedCallback(
|
||||
INDEX_TO_TEST, &TestDigitalIoInitializationCallback, &callbackParam,
|
||||
@@ -82,4 +82,4 @@ TEST(DigitalIoSimTest, DigitalIoInitialization) {
|
||||
HALSIM_CancelDIOInitializedCallback(INDEX_TO_TEST, callbackId);
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "wpi/hal/simulation/DriverStationData.h"
|
||||
#include "wpi/util/StringExtras.hpp"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
TEST(DriverStationTest, Joystick) {
|
||||
HAL_JoystickAxes axes;
|
||||
@@ -122,8 +122,8 @@ TEST(DriverStationTest, EventInfo) {
|
||||
constexpr std::string_view eventName = "UnitTest";
|
||||
constexpr std::string_view gameData = "Insert game specific info here :D";
|
||||
HAL_MatchInfo info;
|
||||
wpi::format_to_n_c_str(info.eventName, sizeof(info.eventName), eventName);
|
||||
wpi::format_to_n_c_str(reinterpret_cast<char*>(info.gameSpecificMessage),
|
||||
wpi::util::format_to_n_c_str(info.eventName, sizeof(info.eventName), eventName);
|
||||
wpi::util::format_to_n_c_str(reinterpret_cast<char*>(info.gameSpecificMessage),
|
||||
sizeof(info.gameSpecificMessage), gameData);
|
||||
info.gameSpecificMessageSize = gameData.size();
|
||||
info.matchNumber = 5;
|
||||
@@ -146,4 +146,4 @@ TEST(DriverStationTest, EventInfo) {
|
||||
EXPECT_EQ(42, dataBack.replayNumber);
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "wpi/hal/I2C.h"
|
||||
#include "wpi/hal/simulation/I2CData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestI2CCallbackName;
|
||||
HAL_Value gTestI2CCallbackValue;
|
||||
@@ -37,4 +37,4 @@ TEST(I2CSimTest, I2CInitialization) {
|
||||
EXPECT_STREQ("Initialized", gTestI2CCallbackName.c_str());
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "wpi/hal/handles/HandlesInternal.h"
|
||||
#include "wpi/hal/simulation/CTREPCMData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestSolenoidCallbackName;
|
||||
HAL_Value gTestSolenoidCallbackValue;
|
||||
@@ -66,7 +66,7 @@ TEST(PCMDataTest, PCMInitialization) {
|
||||
EXPECT_STREQ("Unset", gTestSolenoidCallbackName.c_str());
|
||||
|
||||
// Reset, should allow you to re-register
|
||||
hal::HandleBase::ResetGlobalHandles();
|
||||
wpi::hal::HandleBase::ResetGlobalHandles();
|
||||
HALSIM_ResetCTREPCMData(MODULE_TO_TEST);
|
||||
callbackId = HALSIM_RegisterCTREPCMInitializedCallback(
|
||||
MODULE_TO_TEST, &TestSolenoidInitializationCallback, &callbackParam,
|
||||
@@ -82,4 +82,4 @@ TEST(PCMDataTest, PCMInitialization) {
|
||||
EXPECT_STREQ("Initialized", gTestSolenoidCallbackName.c_str());
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -9,7 +9,7 @@
|
||||
#include "wpi/hal/PowerDistribution.h"
|
||||
#include "wpi/hal/simulation/PowerDistributionData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestPdpCallbackName;
|
||||
HAL_Value gTestPdpCallbackValue;
|
||||
@@ -38,4 +38,4 @@ TEST(PdpSimTest, PdpInitialization) {
|
||||
EXPECT_STREQ("Initialized", gTestPdpCallbackName.c_str());
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -11,7 +11,7 @@
|
||||
#include "wpi/hal/handles/HandlesInternal.h"
|
||||
#include "wpi/hal/simulation/PWMData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
std::string gTestPwmCallbackName;
|
||||
HAL_Value gTestPwmCallbackValue;
|
||||
@@ -65,7 +65,7 @@ TEST(PWMSimTest, PwmInitialization) {
|
||||
EXPECT_STREQ("Unset", gTestPwmCallbackName.c_str());
|
||||
|
||||
// Reset, should allow you to re-register
|
||||
hal::HandleBase::ResetGlobalHandles();
|
||||
wpi::hal::HandleBase::ResetGlobalHandles();
|
||||
HALSIM_ResetPWMData(INDEX_TO_TEST);
|
||||
callbackId = HALSIM_RegisterPWMInitializedCallback(
|
||||
INDEX_TO_TEST, &TestPwmInitializationCallback, &callbackParam, false);
|
||||
@@ -79,4 +79,4 @@ TEST(PWMSimTest, PwmInitialization) {
|
||||
EXPECT_STREQ("Initialized", gTestPwmCallbackName.c_str());
|
||||
HALSIM_CancelPWMInitializedCallback(INDEX_TO_TEST, callbackId);
|
||||
}
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
@@ -7,7 +7,7 @@
|
||||
#include "wpi/hal/SimDevice.h"
|
||||
#include "wpi/hal/simulation/SimDeviceData.h"
|
||||
|
||||
namespace hal {
|
||||
namespace wpi::hal {
|
||||
|
||||
TEST(SimDeviceSimTest, Enabled) {
|
||||
ASSERT_TRUE(HALSIM_IsSimDeviceEnabled("foo"));
|
||||
@@ -20,4 +20,4 @@ TEST(SimDeviceSimTest, Enabled) {
|
||||
ASSERT_EQ(HAL_CreateSimDevice("foo"), 0);
|
||||
}
|
||||
|
||||
} // namespace hal
|
||||
} // namespace wpi::hal
|
||||
|
||||
Reference in New Issue
Block a user