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

[ntcore] Remove NetworkTable -> nt::NetworkTable shim

Browse Source
This commit is contained in:
Peter Johnson
2021-04-04 14:34:11 -07:00
parent 48ebe5736a
commit 79267f9e60
5 changed files with 22 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ntcore/src/main/native/include/networktables/NetworkTable.h
View File

@@ -549,9 +549,4 @@ class NetworkTable final {
} // namespace nt
// For backwards compatibility
#ifndef NAMESPACED_NT
using nt::NetworkTable; // NOLINT
#endif
#endif // NTCORE_NETWORKTABLES_NETWORKTABLE_H_

38
ntcore/src/test/native/cpp/NetworkTableTest.cpp
View File

@@ -10,51 +10,51 @@
class NetworkTableTest : public ::testing::Test {};
TEST_F(NetworkTableTest, BasenameKey) {
EXPECT_EQ("simple", NetworkTable::BasenameKey("simple"));
EXPECT_EQ("simple", NetworkTable::BasenameKey("one/two/many/simple"));
EXPECT_EQ("simple", nt::NetworkTable::BasenameKey("simple"));
EXPECT_EQ("simple", nt::NetworkTable::BasenameKey("one/two/many/simple"));
EXPECT_EQ("simple",
NetworkTable::BasenameKey("//////an/////awful/key////simple"));
nt::NetworkTable::BasenameKey("//////an/////awful/key////simple"));
}
TEST_F(NetworkTableTest, NormalizeKeySlash) {
EXPECT_EQ("/", NetworkTable::NormalizeKey("///"));
EXPECT_EQ("/no/normal/req", NetworkTable::NormalizeKey("/no/normal/req"));
EXPECT_EQ("/", nt::NetworkTable::NormalizeKey("///"));
EXPECT_EQ("/no/normal/req", nt::NetworkTable::NormalizeKey("/no/normal/req"));
EXPECT_EQ("/no/leading/slash",
NetworkTable::NormalizeKey("no/leading/slash"));
EXPECT_EQ("/what/an/awful/key/",
NetworkTable::NormalizeKey("//////what////an/awful/////key///"));
nt::NetworkTable::NormalizeKey("no/leading/slash"));
EXPECT_EQ("/what/an/awful/key/", nt::NetworkTable::NormalizeKey(
"//////what////an/awful/////key///"));
}
TEST_F(NetworkTableTest, NormalizeKeyNoSlash) {
EXPECT_EQ("a", NetworkTable::NormalizeKey("a", false));
EXPECT_EQ("a", NetworkTable::NormalizeKey("///a", false));
EXPECT_EQ("a", nt::NetworkTable::NormalizeKey("a", false));
EXPECT_EQ("a", nt::NetworkTable::NormalizeKey("///a", false));
EXPECT_EQ("leading/slash",
NetworkTable::NormalizeKey("/leading/slash", false));
nt::NetworkTable::NormalizeKey("/leading/slash", false));
EXPECT_EQ("no/leading/slash",
NetworkTable::NormalizeKey("no/leading/slash", false));
EXPECT_EQ(
"what/an/awful/key/",
NetworkTable::NormalizeKey("//////what////an/awful/////key///", false));
nt::NetworkTable::NormalizeKey("no/leading/slash", false));
EXPECT_EQ("what/an/awful/key/",
nt::NetworkTable::NormalizeKey("//////what////an/awful/////key///",
false));
}
TEST_F(NetworkTableTest, GetHierarchyEmpty) {
std::vector<std::string> expected{"/"};
ASSERT_EQ(expected, NetworkTable::GetHierarchy(""));
ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy(""));
}
TEST_F(NetworkTableTest, GetHierarchyRoot) {
std::vector<std::string> expected{"/"};
ASSERT_EQ(expected, NetworkTable::GetHierarchy("/"));
ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/"));
}
TEST_F(NetworkTableTest, GetHierarchyNormal) {
std::vector<std::string> expected{"/", "/foo", "/foo/bar", "/foo/bar/baz"};
ASSERT_EQ(expected, NetworkTable::GetHierarchy("/foo/bar/baz"));
ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/foo/bar/baz"));
}
TEST_F(NetworkTableTest, GetHierarchyTrailingSlash) {
std::vector<std::string> expected{"/", "/foo", "/foo/bar", "/foo/bar/"};
ASSERT_EQ(expected, NetworkTable::GetHierarchy("/foo/bar/"));
ASSERT_EQ(expected, nt::NetworkTable::GetHierarchy("/foo/bar/"));
}
TEST_F(NetworkTableTest, ContainsKey) {

2
wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
View File

@@ -154,7 +154,7 @@ void LiveWindow::UpdateValuesUnsafe() {
return;
}
auto ssTable = m_impl->liveWindowTable->GetSubTable(cbdata.subsystem);
std::shared_ptr<NetworkTable> table;
std::shared_ptr<nt::NetworkTable> table;
// Treat name==subsystem as top level of subsystem
if (cbdata.name == cbdata.subsystem) {
table = ssTable;

2
wpilibc/src/main/native/cpp/smartdashboard/SendableRegistry.cpp
View File

@@ -352,7 +352,7 @@ Sendable* SendableRegistry::GetSendable(UID uid) {
}
void SendableRegistry::Publish(UID sendableUid,
std::shared_ptr<NetworkTable> table) {
std::shared_ptr<nt::NetworkTable> table) {
std::scoped_lock lock(m_impl->mutex);
if (sendableUid == 0 || (sendableUid - 1) >= m_impl->components.size() ||
!m_impl->components[sendableUid - 1]) {

2
wpilibc/src/main/native/include/frc/smartdashboard/SendableRegistry.h
View File

@@ -285,7 +285,7 @@ class SendableRegistry {
* @param sendableUid sendable unique id
* @param table network table
*/
void Publish(UID sendableUid, std::shared_ptr<NetworkTable> table);
void Publish(UID sendableUid, std::shared_ptr<nt::NetworkTable> table);
/**
* Updates network table information from an object.