Clean up and modernize //aos/network
Change-Id: Iadc1ff1eb7156a350403fdfb7cab684e38a69029
diff --git a/aos/network/team_number_test.cc b/aos/network/team_number_test.cc
index ee3f2db..03001de 100644
--- a/aos/network/team_number_test.cc
+++ b/aos/network/team_number_test.cc
@@ -2,32 +2,33 @@
#include "gtest/gtest.h"
-#include "aos/macros.h"
-
namespace aos {
namespace network {
-namespace internal {
namespace testing {
-TEST(TeamNumberTest, Parse2015TeamNumber) {
- uint16_t team_number;
- EXPECT_EQ(0, ParseTeamNumber("roboRIO-971", &team_number));
- EXPECT_EQ(971u, team_number);
+using team_number_internal::ParseRoborioTeamNumber;
- EXPECT_EQ(0, ParseTeamNumber("roboRIO-8971", &team_number));
- EXPECT_EQ(8971u, team_number);
+TEST(TeamNumberTest, Parse2015TeamNumber) {
+ EXPECT_EQ(971u, *ParseRoborioTeamNumber("roboRIO-971"));
+
+ EXPECT_EQ(8971u, ParseRoborioTeamNumber("roboRIO-8971"));
+
+ EXPECT_FALSE(ParseRoborioTeamNumber("abc"));
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO-8abc"));
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO-"));
}
TEST(TeamNumberTest, Parse2016TeamNumber) {
- uint16_t team_number;
- EXPECT_EQ(0, ParseTeamNumber("roboRIO-971-FRC", &team_number));
- EXPECT_EQ(971u, team_number);
+ EXPECT_EQ(971u, *ParseRoborioTeamNumber("roboRIO-971-FRC"));
- EXPECT_EQ(0, ParseTeamNumber("roboRIO-8971-FRC", &team_number));
- EXPECT_EQ(8971u, team_number);
+ EXPECT_EQ(8971u, *ParseRoborioTeamNumber("roboRIO-8971-FRC"));
+
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO-8abc-FRC"));
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO-8971-FRC2"));
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO-8971-2FRC"));
+ EXPECT_FALSE(ParseRoborioTeamNumber("roboRIO--FRC"));
}
} // namespace testing
-} // namespace internal
} // namespace network
} // namespace aos