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

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

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) {