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

[ntcore] Rename constants to all caps style (#8676)

Browse Source
This commit is contained in:
Peter Johnson
2026-03-15 20:44:45 -07:00
committed by GitHub
parent 86dd3ca2b7
commit ab7e4766f6
99 changed files with 736 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ntcore/src/test/java/org/wpilib/networktables/ConnectionListenerTest.java
View File

@@ -66,7 +66,7 @@ class ConnectionListenerTest {
assertNotSame(poller, 0, "bad poller handle");
int handle =
NetworkTablesJNI.addListener(
poller, m_serverInst.getHandle(), EnumSet.of(NetworkTableEvent.Kind.kConnection));
poller, m_serverInst.getHandle(), EnumSet.of(NetworkTableEvent.Kind.CONNECTION));
assertNotSame(handle, 0, "bad listener handle");
// trigger a connect event
@@ -84,7 +84,7 @@ class ConnectionListenerTest {
assertEquals(1, events.length);
assertEquals(handle, events[0].listener);
assertNotNull(events[0].connInfo);
assertTrue(events[0].is(NetworkTableEvent.Kind.kConnected));
assertTrue(events[0].is(NetworkTableEvent.Kind.CONNECTED));
// trigger a disconnect event
m_clientInst.stopClient();
@@ -105,7 +105,7 @@ class ConnectionListenerTest {
assertNotNull(events);
assertEquals(1, events.length);
assertEquals(handle, events[0].listener);
assertTrue(events[0].is(NetworkTableEvent.Kind.kDisconnected));
assertTrue(events[0].is(NetworkTableEvent.Kind.DISCONNECTED));
}
private static int threadedPort = 10001;
@@ -157,7 +157,7 @@ class ConnectionListenerTest {
assertEquals(1, events.size());
assertEquals(handle, events.get(0).listener);
assertNotNull(events.get(0).connInfo);
assertTrue(events.get(0).is(NetworkTableEvent.Kind.kConnected));
assertTrue(events.get(0).is(NetworkTableEvent.Kind.CONNECTED));
events.clear();
}
@@ -182,7 +182,7 @@ class ConnectionListenerTest {
assertEquals(1, events.size());
assertEquals(handle, events.get(0).listener);
assertNotNull(events.get(0).connInfo);
assertTrue(events.get(0).is(NetworkTableEvent.Kind.kDisconnected));
assertTrue(events.get(0).is(NetworkTableEvent.Kind.DISCONNECTED));
}
}
}

4
ntcore/src/test/java/org/wpilib/networktables/LoggerTest.java
View File

@@ -29,7 +29,7 @@ class LoggerTest {
@Test
void addMessageTest() {
List<NetworkTableEvent> msgs = new ArrayList<>();
m_clientInst.addLogger(LogMessage.kInfo, 100, msgs::add);
m_clientInst.addLogger(LogMessage.INFO, 100, msgs::add);
m_clientInst.startClient("client");
m_clientInst.setServer("127.0.0.1", 10000);
@@ -37,7 +37,7 @@ class LoggerTest {
// wait for client to report it's started, then wait another 0.1 sec
try {
int count = 0;
while (!m_clientInst.getNetworkMode().contains(NetworkTableInstance.NetworkMode.kClient)) {
while (!m_clientInst.getNetworkMode().contains(NetworkTableInstance.NetworkMode.CLIENT)) {
Thread.sleep(100);
count++;
if (count > 30) {

2
ntcore/src/test/java/org/wpilib/networktables/TableListenerTest.java
View File

@@ -37,7 +37,7 @@ class TableListenerTest {
NetworkTable table = m_inst.getTable("/foo");
AtomicInteger count = new AtomicInteger();
table.addListener(
EnumSet.of(NetworkTableEvent.Kind.kTopic),
EnumSet.of(NetworkTableEvent.Kind.TOPIC),
(atable, key, event) -> {
count.incrementAndGet();
assertEquals(atable, table);

6
ntcore/src/test/java/org/wpilib/networktables/TopicListenerTest.java
View File

@@ -40,7 +40,7 @@ class TopicListenerTest {
// Use connection listener to ensure we've connected
int poller = NetworkTablesJNI.createListenerPoller(m_clientInst.getHandle());
NetworkTablesJNI.addListener(
poller, m_clientInst.getHandle(), EnumSet.of(NetworkTableEvent.Kind.kConnected));
poller, m_clientInst.getHandle(), EnumSet.of(NetworkTableEvent.Kind.CONNECTED));
try {
if (WPIUtilJNI.waitForObjectTimeout(poller, 1.0)) {
fail("client didn't connect to server");
@@ -59,7 +59,7 @@ class TopicListenerTest {
final int poller = NetworkTablesJNI.createListenerPoller(m_serverInst.getHandle());
final int handle =
NetworkTablesJNI.addListener(
poller, new String[] {"/foo"}, EnumSet.of(NetworkTableEvent.Kind.kPublish));
poller, new String[] {"/foo"}, EnumSet.of(NetworkTableEvent.Kind.PUBLISH));
// Trigger an event
m_clientInst.getEntry("/foo/bar").setDouble(1.0);
@@ -87,6 +87,6 @@ class TopicListenerTest {
assertNotNull(events[0].topicInfo);
assertEquals(m_serverInst.getTopic("/foo/bar"), events[0].topicInfo.getTopic());
assertEquals("/foo/bar", events[0].topicInfo.name);
assertTrue(events[0].is(NetworkTableEvent.Kind.kPublish));
assertTrue(events[0].is(NetworkTableEvent.Kind.PUBLISH));
}
}

12
ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
View File

@@ -53,7 +53,7 @@ TEST_F(ConnectionListenerTest, Polled) {
NT_ListenerPoller poller = wpi::nt::CreateListenerPoller(server_inst);
ASSERT_NE(poller, 0u);
NT_Listener handle = wpi::nt::AddPolledListener(
poller, server_inst, wpi::nt::EventFlags::kConnection);
poller, server_inst, wpi::nt::EventFlags::CONNECTION);
ASSERT_NE(handle, 0u);
// trigger a connect event
@@ -67,7 +67,7 @@ TEST_F(ConnectionListenerTest, Polled) {
ASSERT_EQ(result.size(), 1u);
EXPECT_EQ(handle, result[0].listener);
EXPECT_TRUE(result[0].GetConnectionInfo());
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::kConnected);
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::CONNECTED);
// trigger a disconnect event
wpi::nt::StopClient(client_inst);
@@ -81,7 +81,7 @@ TEST_F(ConnectionListenerTest, Polled) {
ASSERT_EQ(result.size(), 1u);
EXPECT_EQ(handle, result[0].listener);
EXPECT_TRUE(result[0].GetConnectionInfo());
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::kDisconnected);
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::DISCONNECTED);
}
class ConnectionListenerVariantTest
@@ -92,7 +92,7 @@ TEST_P(ConnectionListenerVariantTest, Threaded) {
wpi::util::mutex m;
std::vector<wpi::nt::Event> result;
auto handle = wpi::nt::AddListener(
server_inst, wpi::nt::EventFlags::kConnection, [&](auto& event) {
server_inst, wpi::nt::EventFlags::CONNECTION, [&](auto& event) {
std::scoped_lock lock{m};
result.push_back(event);
});
@@ -110,7 +110,7 @@ TEST_P(ConnectionListenerVariantTest, Threaded) {
ASSERT_EQ(result.size(), 1u);
EXPECT_EQ(handle, result[0].listener);
EXPECT_TRUE(result[0].GetConnectionInfo());
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::kConnected);
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::CONNECTED);
result.clear();
}
@@ -127,7 +127,7 @@ TEST_P(ConnectionListenerVariantTest, Threaded) {
ASSERT_EQ(result.size(), 1u);
EXPECT_EQ(handle, result[0].listener);
EXPECT_TRUE(result[0].GetConnectionInfo());
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::kDisconnected);
EXPECT_EQ(result[0].flags, wpi::nt::EventFlags::DISCONNECTED);
}
}

6
ntcore/src/test/native/cpp/LocalStorageTest.cpp
View File

@@ -979,7 +979,7 @@ TEST_F(LocalStorageTest, ReadQueueLocalRemote) {
EXPECT_CALL(network, ClientPublish(_, _, _, _, _)).Times(1);
auto subBoth =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", kDefaultPubSubOptions);
storage.Subscribe(fooTopic, NT_DOUBLE, "double", DEFAULT_PUB_SUB_OPTIONS);
auto subLocal =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", {.disableRemote = true});
auto subRemote =
@@ -1061,7 +1061,7 @@ TEST_F(LocalStorageTest, ReadQueueInitialLocal) {
storage.SetEntryValue(pub, Value::MakeDouble(1.0, 50));
auto subBoth =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", kDefaultPubSubOptions);
storage.Subscribe(fooTopic, NT_DOUBLE, "double", DEFAULT_PUB_SUB_OPTIONS);
auto subLocal =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", {.disableRemote = true});
auto subRemote =
@@ -1082,7 +1082,7 @@ TEST_F(LocalStorageTest, ReadQueueInitialRemote) {
storage.ServerSetValue(remoteTopic, Value::MakeDouble(2.0, 60));
auto subBoth =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", kDefaultPubSubOptions);
storage.Subscribe(fooTopic, NT_DOUBLE, "double", DEFAULT_PUB_SUB_OPTIONS);
auto subLocal =
storage.Subscribe(fooTopic, NT_DOUBLE, "double", {.disableRemote = true});
auto subRemote =

6
ntcore/src/test/native/cpp/LoggerTest.cpp
View File

@@ -41,8 +41,8 @@ void LoggerTest::Check(const std::vector<wpi::nt::Event>& events,
ASSERT_EQ(events.size(), count);
for (size_t i = 0; i < count; ++i) {
ASSERT_EQ(events[i].listener, handle);
ASSERT_EQ(events[i].flags & wpi::nt::EventFlags::kLogMessage,
wpi::nt::EventFlags::kLogMessage);
ASSERT_EQ(events[i].flags & wpi::nt::EventFlags::LOG_MESSAGE,
wpi::nt::EventFlags::LOG_MESSAGE);
auto log = events[i].GetLogMessage();
ASSERT_TRUE(log);
if (infoMsg) {
@@ -61,7 +61,7 @@ void LoggerTest::Check(const std::vector<wpi::nt::Event>& events,
TEST_F(LoggerTest, DefaultLogRange) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto handle = wpi::nt::AddPolledListener(poller, m_inst,
wpi::nt::EventFlags::kLogMessage);
wpi::nt::EventFlags::LOG_MESSAGE);
Generate();

56
ntcore/src/test/native/cpp/TopicListenerTest.cpp
View File

@@ -59,7 +59,7 @@ void TopicListenerTest::Connect(unsigned int port) {
// Use connection listener to ensure we've connected
NT_ListenerPoller poller = wpi::nt::CreateListenerPoller(m_clientInst);
wpi::nt::AddPolledListener(poller, m_clientInst,
wpi::nt::EventFlags::kConnected);
wpi::nt::EventFlags::CONNECTED);
bool timedOut = false;
if (!wpi::util::WaitForObject(poller, 1.0, &timedOut)) {
FAIL() << "client didn't connect to server";
@@ -88,14 +88,14 @@ TEST_F(TopicListenerTest, TopicNewLocal) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kPublish);
wpi::nt::EventFlags::PUBLISH);
PublishTopics(m_serverInst);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kPublish, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::PUBLISH, "/foo");
}
TEST_F(TopicListenerTest, DISABLED_TopicNewRemote) {
@@ -106,7 +106,7 @@ TEST_F(TopicListenerTest, DISABLED_TopicNewRemote) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kPublish);
wpi::nt::EventFlags::PUBLISH);
PublishTopics(m_clientInst);
@@ -116,7 +116,7 @@ TEST_F(TopicListenerTest, DISABLED_TopicNewRemote) {
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kPublish, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::PUBLISH, "/foo");
}
TEST_F(TopicListenerTest, TopicPublishImm) {
@@ -125,13 +125,13 @@ TEST_F(TopicListenerTest, TopicPublishImm) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kPublish | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::PUBLISH | wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle,
wpi::nt::EventFlags::kPublish | wpi::nt::EventFlags::kImmediate,
wpi::nt::EventFlags::PUBLISH | wpi::nt::EventFlags::IMMEDIATE,
"/foo");
}
@@ -140,9 +140,9 @@ TEST_F(TopicListenerTest, TopicUnpublishPropsImm) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
wpi::nt::AddPolledListener(poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kUnpublish |
wpi::nt::EventFlags::kProperties |
wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::UNPUBLISH |
wpi::nt::EventFlags::PROPERTIES |
wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_FALSE(wpi::util::WaitForObject(poller, 0.02, &timedOut));
@@ -154,8 +154,8 @@ TEST_F(TopicListenerTest, TopicUnpublishLocal) {
auto topic = wpi::nt::GetTopic(m_serverInst, "/foo");
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(poller, topic,
wpi::nt::EventFlags::kUnpublish);
auto handle =
wpi::nt::AddPolledListener(poller, topic, wpi::nt::EventFlags::UNPUBLISH);
auto pub = wpi::nt::Publish(topic, NT_DOUBLE, "double");
wpi::nt::Unpublish(pub);
@@ -163,7 +163,7 @@ TEST_F(TopicListenerTest, TopicUnpublishLocal) {
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kUnpublish, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::UNPUBLISH, "/foo");
}
TEST_F(TopicListenerTest, DISABLED_TopicUnpublishRemote) {
@@ -174,7 +174,7 @@ TEST_F(TopicListenerTest, DISABLED_TopicUnpublishRemote) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kUnpublish);
wpi::nt::EventFlags::UNPUBLISH);
auto pub = wpi::nt::Publish(wpi::nt::GetTopic(m_clientInst, "/foo"),
NT_DOUBLE, "double");
@@ -189,7 +189,7 @@ TEST_F(TopicListenerTest, DISABLED_TopicUnpublishRemote) {
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kUnpublish, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::UNPUBLISH, "/foo");
}
TEST_F(TopicListenerTest, TopicPropertiesLocal) {
@@ -197,14 +197,14 @@ TEST_F(TopicListenerTest, TopicPropertiesLocal) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(poller, topic,
wpi::nt::EventFlags::kProperties);
wpi::nt::EventFlags::PROPERTIES);
wpi::nt::SetTopicProperty(topic, "foo", 5);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kProperties, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::PROPERTIES, "/foo");
}
TEST_F(TopicListenerTest, DISABLED_TopicPropertiesRemote) {
@@ -219,7 +219,7 @@ TEST_F(TopicListenerTest, DISABLED_TopicPropertiesRemote) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, wpi::nt::GetTopic(m_serverInst, "/foo"),
wpi::nt::EventFlags::kProperties);
wpi::nt::EventFlags::PROPERTIES);
wpi::nt::FlushLocal(m_serverInst);
wpi::nt::SetTopicProperty(wpi::nt::GetTopic(m_clientInst, "/foo"), "foo", 5);
@@ -229,20 +229,20 @@ TEST_F(TopicListenerTest, DISABLED_TopicPropertiesRemote) {
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kProperties, "/foo");
CheckEvents(events, handle, wpi::nt::EventFlags::PROPERTIES, "/foo");
}
TEST_F(TopicListenerTest, PrefixPublishLocal) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(poller, {{"/foo/"}},
wpi::nt::EventFlags::kPublish);
wpi::nt::EventFlags::PUBLISH);
PublishTopics(m_serverInst);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kPublish);
CheckEvents(events, handle, wpi::nt::EventFlags::PUBLISH);
}
TEST_F(TopicListenerTest, DISABLED_PrefixPublishRemote) {
@@ -252,7 +252,7 @@ TEST_F(TopicListenerTest, DISABLED_PrefixPublishRemote) {
}
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(poller, {{"/foo/"}},
wpi::nt::EventFlags::kPublish);
wpi::nt::EventFlags::PUBLISH);
PublishTopics(m_clientInst);
@@ -262,7 +262,7 @@ TEST_F(TopicListenerTest, DISABLED_PrefixPublishRemote) {
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle, wpi::nt::EventFlags::kPublish);
CheckEvents(events, handle, wpi::nt::EventFlags::PUBLISH);
}
TEST_F(TopicListenerTest, PrefixPublishImm) {
@@ -271,13 +271,13 @@ TEST_F(TopicListenerTest, PrefixPublishImm) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
auto handle = wpi::nt::AddPolledListener(
poller, {{"/foo/"}},
wpi::nt::EventFlags::kPublish | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::PUBLISH | wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
auto events = wpi::nt::ReadListenerQueue(poller);
CheckEvents(events, handle,
wpi::nt::EventFlags::kPublish | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::PUBLISH | wpi::nt::EventFlags::IMMEDIATE);
}
TEST_F(TopicListenerTest, PrefixUnpublishPropsImm) {
@@ -285,9 +285,9 @@ TEST_F(TopicListenerTest, PrefixUnpublishPropsImm) {
auto poller = wpi::nt::CreateListenerPoller(m_serverInst);
wpi::nt::AddPolledListener(poller, {{"/foo/"}},
wpi::nt::EventFlags::kUnpublish |
wpi::nt::EventFlags::kProperties |
wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::UNPUBLISH |
wpi::nt::EventFlags::PROPERTIES |
wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_FALSE(wpi::util::WaitForObject(poller, 0.02, &timedOut));

82
ntcore/src/test/native/cpp/ValueListenerTest.cpp
View File

@@ -37,11 +37,11 @@ TEST_F(ValueListenerTest, MultiPollSub) {
auto poller2 = wpi::nt::CreateListenerPoller(m_inst);
auto poller3 = wpi::nt::CreateListenerPoller(m_inst);
auto h1 = wpi::nt::AddPolledListener(poller1, sub,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
auto h2 = wpi::nt::AddPolledListener(poller2, sub,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
auto h3 = wpi::nt::AddPolledListener(poller3, sub,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
wpi::nt::SetDouble(pub, 0);
@@ -57,7 +57,7 @@ TEST_F(ValueListenerTest, MultiPollSub) {
auto results3 = wpi::nt::ReadListenerQueue(poller3);
ASSERT_EQ(results1.size(), 1u);
EXPECT_EQ(results1[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results1[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results1[0].listener, h1);
auto valueData = results1[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -66,7 +66,7 @@ TEST_F(ValueListenerTest, MultiPollSub) {
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
ASSERT_EQ(results2.size(), 1u);
EXPECT_EQ(results2[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results2[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results2[0].listener, h2);
valueData = results2[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -75,7 +75,7 @@ TEST_F(ValueListenerTest, MultiPollSub) {
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
ASSERT_EQ(results3.size(), 1u);
EXPECT_EQ(results3[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results3[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results3[0].listener, h3);
valueData = results3[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -92,9 +92,9 @@ TEST_F(ValueListenerTest, PollMultiSub) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h1 = wpi::nt::AddPolledListener(poller, sub1,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
auto h2 = wpi::nt::AddPolledListener(poller, sub2,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
wpi::nt::SetDouble(pub, 0);
@@ -104,7 +104,7 @@ TEST_F(ValueListenerTest, PollMultiSub) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 2u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h1);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -112,7 +112,7 @@ TEST_F(ValueListenerTest, PollMultiSub) {
EXPECT_EQ(valueData->topic, topic);
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[1].listener, h2);
valueData = results[1].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -131,9 +131,9 @@ TEST_F(ValueListenerTest, PollMultiSubTopic) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h1 = wpi::nt::AddPolledListener(poller, sub1,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
auto h2 = wpi::nt::AddPolledListener(poller, sub2,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
wpi::nt::SetDouble(pub1, 0);
wpi::nt::SetDouble(pub2, 1);
@@ -144,7 +144,7 @@ TEST_F(ValueListenerTest, PollMultiSubTopic) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 2u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h1);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -152,7 +152,7 @@ TEST_F(ValueListenerTest, PollMultiSubTopic) {
EXPECT_EQ(valueData->topic, topic1);
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[1].listener, h2);
valueData = results[1].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -170,7 +170,7 @@ TEST_F(ValueListenerTest, PollSubMultiple) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h =
wpi::nt::AddPolledListener(poller, sub, wpi::nt::EventFlags::kValueLocal);
wpi::nt::AddPolledListener(poller, sub, wpi::nt::EventFlags::VALUE_LOCAL);
wpi::nt::SetDouble(pub1, 0);
wpi::nt::SetDouble(pub2, 1);
@@ -181,7 +181,7 @@ TEST_F(ValueListenerTest, PollSubMultiple) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 2u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -189,7 +189,7 @@ TEST_F(ValueListenerTest, PollSubMultiple) {
EXPECT_EQ(valueData->topic, topic1);
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[1].listener, h);
valueData = results[1].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -201,7 +201,7 @@ TEST_F(ValueListenerTest, PollSubMultiple) {
TEST_F(ValueListenerTest, PollSubPrefixCreated) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(poller, {{"foo"}},
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
auto topic1 = wpi::nt::GetTopic(m_inst, "foo/1");
auto topic2 = wpi::nt::GetTopic(m_inst, "foo/2");
@@ -220,14 +220,14 @@ TEST_F(ValueListenerTest, PollSubPrefixCreated) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 2u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
EXPECT_EQ(valueData->topic, topic1);
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[1].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[1].listener, h);
valueData = results[1].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -240,7 +240,7 @@ TEST_F(ValueListenerTest, PollEntry) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(poller, entry,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
ASSERT_TRUE(wpi::nt::SetDouble(entry, 0));
@@ -250,7 +250,7 @@ TEST_F(ValueListenerTest, PollEntry) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 1u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -266,7 +266,7 @@ TEST_F(ValueListenerTest, PollImmediate) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(
poller, entry,
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
@@ -274,9 +274,9 @@ TEST_F(ValueListenerTest, PollImmediate) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 1u);
EXPECT_EQ(results[0].flags & (wpi::nt::EventFlags::kValueLocal |
wpi::nt::EventFlags::kImmediate),
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
EXPECT_EQ(results[0].flags & (wpi::nt::EventFlags::VALUE_LOCAL |
wpi::nt::EventFlags::IMMEDIATE),
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -291,7 +291,7 @@ TEST_F(ValueListenerTest, PollImmediateNoValue) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(
poller, entry,
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_FALSE(wpi::util::WaitForObject(poller, 0.02, &timedOut));
@@ -307,7 +307,7 @@ TEST_F(ValueListenerTest, PollImmediateNoValue) {
ASSERT_FALSE(timedOut);
ASSERT_EQ(results.size(), 1u);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags, wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -328,7 +328,7 @@ TEST_F(ValueListenerTest, PollImmediateSubMultiple) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(
poller, sub,
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
bool timedOut = false;
ASSERT_TRUE(wpi::util::WaitForObject(poller, 1.0, &timedOut));
@@ -336,9 +336,9 @@ TEST_F(ValueListenerTest, PollImmediateSubMultiple) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 2u);
EXPECT_EQ(results[0].flags & (wpi::nt::EventFlags::kValueLocal |
wpi::nt::EventFlags::kImmediate),
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
EXPECT_EQ(results[0].flags & (wpi::nt::EventFlags::VALUE_LOCAL |
wpi::nt::EventFlags::IMMEDIATE),
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -346,9 +346,9 @@ TEST_F(ValueListenerTest, PollImmediateSubMultiple) {
EXPECT_EQ(valueData->topic, topic1);
EXPECT_EQ(valueData->value, wpi::nt::Value::MakeDouble(0.0));
EXPECT_EQ(results[1].flags & (wpi::nt::EventFlags::kValueLocal |
wpi::nt::EventFlags::kImmediate),
wpi::nt::EventFlags::kValueLocal | wpi::nt::EventFlags::kImmediate);
EXPECT_EQ(results[1].flags & (wpi::nt::EventFlags::VALUE_LOCAL |
wpi::nt::EventFlags::IMMEDIATE),
wpi::nt::EventFlags::VALUE_LOCAL | wpi::nt::EventFlags::IMMEDIATE);
EXPECT_EQ(results[1].listener, h);
valueData = results[1].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -366,7 +366,7 @@ TEST_F(ValueListenerTest, TwoSubOneListener) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(poller, sub1,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
(void)sub2;
(void)sub3;
@@ -378,8 +378,8 @@ TEST_F(ValueListenerTest, TwoSubOneListener) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 1u);
EXPECT_EQ(results[0].flags & wpi::nt::EventFlags::kValueLocal,
wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags & wpi::nt::EventFlags::VALUE_LOCAL,
wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);
@@ -397,7 +397,7 @@ TEST_F(ValueListenerTest, TwoSubOneMultiListener) {
auto poller = wpi::nt::CreateListenerPoller(m_inst);
auto h = wpi::nt::AddPolledListener(poller, sub3,
wpi::nt::EventFlags::kValueLocal);
wpi::nt::EventFlags::VALUE_LOCAL);
(void)sub1;
(void)sub2;
@@ -409,8 +409,8 @@ TEST_F(ValueListenerTest, TwoSubOneMultiListener) {
auto results = wpi::nt::ReadListenerQueue(poller);
ASSERT_EQ(results.size(), 1u);
EXPECT_EQ(results[0].flags & wpi::nt::EventFlags::kValueLocal,
wpi::nt::EventFlags::kValueLocal);
EXPECT_EQ(results[0].flags & wpi::nt::EventFlags::VALUE_LOCAL,
wpi::nt::EventFlags::VALUE_LOCAL);
EXPECT_EQ(results[0].listener, h);
auto valueData = results[0].GetValueEventData();
ASSERT_TRUE(valueData);

2
ntcore/src/test/python/test_util.py
View File

@@ -43,7 +43,7 @@ def test_ntproperty(nt: NetworkTableInstance):
"/SmartDashboard/testFloatArray",
[1.1, 1.2, 1.3],
writeDefault=True,
type=NetworkTableType.kFloatArray,
type=NetworkTableType.FLOAT_ARRAY,
inst=nt,
)

22
ntcore/src/test/python/test_value.py
View File

@@ -15,7 +15,7 @@ def test_mkvalue_bool():
def test_bool_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kBoolean)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.BOOLEAN)
v = f(True)
assert v.getBoolean() == True
@@ -33,7 +33,7 @@ def test_mkvalue_int():
def test_int_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kInteger)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.INTEGER)
v = f(2)
assert v.getInteger() == 2
@@ -51,7 +51,7 @@ def test_mkvalue_double():
def test_double_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kDouble)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.DOUBLE)
v = f(2.2)
assert v.getDouble() == pytest.approx(2.2)
@@ -67,7 +67,7 @@ def test_mkvalue_float():
def test_float_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kFloat)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.FLOAT)
v = f(2.2)
assert v.getFloat() == pytest.approx(2.2)
@@ -85,7 +85,7 @@ def test_mkvalue_str():
def test_str_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kString)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.STRING)
v = f("abc")
assert v.getString() == "abc"
@@ -103,7 +103,7 @@ def test_mkvalue_raw():
def test_raw_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kRaw)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.RAW)
v = f(b"raw")
assert v.getRaw() == b"raw"
@@ -121,7 +121,7 @@ def test_mkvalue_bool_list():
def test_bool_list_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kBooleanArray)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.BOOLEAN_ARRAY)
v = f([True, False])
assert v.getBooleanArray() == [True, False]
@@ -139,7 +139,7 @@ def test_mkvalue_int_list():
def test_int_list_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kIntegerArray)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.INTEGER_ARRAY)
v = f([1, 2])
assert v.getIntegerArray() == [1, 2]
@@ -157,7 +157,7 @@ def test_mkvalue_double_list():
def test_double_list_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kDoubleArray)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.DOUBLE_ARRAY)
v = f([1.1, 2.2])
assert v.getDoubleArray() == [pytest.approx(1.1), pytest.approx(2.2)]
@@ -173,7 +173,7 @@ def test_mkvalue_float_list():
def test_float_list_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kFloatArray)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.FLOAT_ARRAY)
v = f([1.1, 2.2])
assert v.getFloatArray() == [pytest.approx(1.1), pytest.approx(2.2)]
@@ -191,6 +191,6 @@ def test_mkvalue_str_list():
def test_str_list_factory():
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.kStringArray)
f = ntcore.Value.getFactoryByType(ntcore.NetworkTableType.STRING_ARRAY)
v = f(["a", "b"])
assert v.getStringArray() == ["a", "b"]