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
@@ -18,7 +18,7 @@
|
||||
#include "wpi/smartdashboard/SmartDashboard.hpp"
|
||||
#include "wpi/util/Alert.hpp"
|
||||
|
||||
using namespace frc;
|
||||
using namespace wpi;
|
||||
using enum Alert::AlertType;
|
||||
class AlertsTest : public ::testing::Test {
|
||||
public:
|
||||
@@ -52,7 +52,7 @@ class AlertsTest : public ::testing::Test {
|
||||
activeAlerts.end();
|
||||
}
|
||||
|
||||
void Update() { frc::SmartDashboard::UpdateValues(); }
|
||||
void Update() { wpi::SmartDashboard::UpdateValues(); }
|
||||
|
||||
private:
|
||||
std::string GetSubtableName(Alert::AlertType type) {
|
||||
@@ -68,8 +68,8 @@ class AlertsTest : public ::testing::Test {
|
||||
}
|
||||
}
|
||||
|
||||
const nt::StringArraySubscriber GetSubscriberForType(Alert::AlertType type) {
|
||||
return nt::NetworkTableInstance::GetDefault()
|
||||
const wpi::nt::StringArraySubscriber GetSubscriberForType(Alert::AlertType type) {
|
||||
return wpi::nt::NetworkTableInstance::GetDefault()
|
||||
.GetStringArrayTopic(fmt::format("/SmartDashboard/{}/{}",
|
||||
GetGroupName(), GetSubtableName(type)))
|
||||
.Subscribe({});
|
||||
@@ -158,16 +158,16 @@ TEST_F(AlertsTest, SetTextWhileSet) {
|
||||
}
|
||||
|
||||
TEST_F(AlertsTest, SetTextDoesNotAffectFirstOrderSort) {
|
||||
frc::sim::PauseTiming();
|
||||
wpi::sim::PauseTiming();
|
||||
|
||||
auto a = MakeAlert("A", kError);
|
||||
auto b = MakeAlert("B", kError);
|
||||
auto c = MakeAlert("C", kError);
|
||||
|
||||
a.Set(true);
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
b.Set(true);
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
c.Set(true);
|
||||
|
||||
auto expectedEndState = GetActiveAlerts(kError);
|
||||
@@ -176,7 +176,7 @@ TEST_F(AlertsTest, SetTextDoesNotAffectFirstOrderSort) {
|
||||
b.SetText("AFTER");
|
||||
|
||||
EXPECT_STATE(kError, expectedEndState);
|
||||
frc::sim::ResumeTiming();
|
||||
wpi::sim::ResumeTiming();
|
||||
}
|
||||
|
||||
TEST_F(AlertsTest, MoveAssign) {
|
||||
@@ -209,42 +209,42 @@ TEST_F(AlertsTest, MoveConstruct) {
|
||||
}
|
||||
|
||||
TEST_F(AlertsTest, SortOrder) {
|
||||
frc::sim::PauseTiming();
|
||||
wpi::sim::PauseTiming();
|
||||
auto a = MakeAlert("A", kInfo);
|
||||
auto b = MakeAlert("B", kInfo);
|
||||
auto c = MakeAlert("C", kInfo);
|
||||
a.Set(true);
|
||||
EXPECT_STATE(kInfo, "A");
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
b.Set(true);
|
||||
EXPECT_STATE(kInfo, "B", "A");
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
c.Set(true);
|
||||
EXPECT_STATE(kInfo, "C", "B", "A");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
c.Set(false);
|
||||
EXPECT_STATE(kInfo, "B", "A");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
c.Set(true);
|
||||
EXPECT_STATE(kInfo, "C", "B", "A");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
a.Set(false);
|
||||
EXPECT_STATE(kInfo, "C", "B");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
b.Set(false);
|
||||
EXPECT_STATE(kInfo, "C");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
b.Set(true);
|
||||
EXPECT_STATE(kInfo, "B", "C");
|
||||
|
||||
frc::sim::StepTiming(1_s);
|
||||
wpi::sim::StepTiming(1_s);
|
||||
a.Set(true);
|
||||
EXPECT_STATE(kInfo, "A", "B", "C");
|
||||
|
||||
frc::sim::ResumeTiming();
|
||||
wpi::sim::ResumeTiming();
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user