commit b01d08fd6607411d4f032b4ddf610f455bbafb86
author William A. Kennington III <wak@google.com> Thu Nov 03 12:50:00 2022 -0700
committer William A. Kennington III <wak@google.com> Wed Nov 09 20:35:07 2022 +0000
tree f88e30ca046ac428f4ccee8a9f82d27f81e34aa0
parent 238ef99258b810e4b0309d6c343fa046b8c74b03

types: Add constexpr ether_addr parser

Change-Id: I0ad21490239ad9b0f25dfff84726b16a9cfda927
Signed-off-by: William A. Kennington III <wak@google.com>

test/test_types.cpp

diff --git a/test/test_types.cpp b/test/test_types.cpp
index 46e8291..f9e49b3 100644
--- a/test/test_types.cpp
+++ b/test/test_types.cpp
@@ -87,6 +87,39 @@
     EXPECT_NE(InAddrAny(in6_addr{1}), InAddrAny(in6_addr{}));
 }
 
+TEST(ToAddr, EtherAddr)
+{
+    EXPECT_THROW(ToAddr<ether_addr>{}("0x:00:00:00:00:00"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00:00:00:00:00"), std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00:00:00:00:00:"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00:00:00:00::00"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}(":00:00:00:00:00"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00::00:00:00:00"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}(":::::"), std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00:0:0:0:0"), std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("00:00:00:00:00:00:00"),
+                 std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}(""), std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("123456789XYZ"), std::invalid_argument);
+    EXPECT_THROW(ToAddr<ether_addr>{}("123456789AB"), std::overflow_error);
+    EXPECT_THROW(ToAddr<ether_addr>{}("123456789ABCD"), std::overflow_error);
+
+    EXPECT_EQ((ether_addr{}), ToAddr<ether_addr>{}("00:00:00:00:00:00"));
+    EXPECT_EQ((ether_addr{0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa}),
+              ToAddr<ether_addr>{}("FF:EE:DD:cc:bb:aa"));
+    EXPECT_EQ((ether_addr{0x00, 0x01, 0x02, 0x03, 0x04, 0x05}),
+              ToAddr<ether_addr>{}("0:1:2:3:4:5"));
+    EXPECT_EQ((ether_addr{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}),
+              ToAddr<ether_addr>{}("0123456789AB"));
+    EXPECT_EQ((ether_addr{0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa}),
+              ToAddr<ether_addr>{}("FFEEDDccbbaa"));
+}
+
 namespace detail
 {
 

test/test_util.cpp

diff --git a/test/test_util.cpp b/test/test_util.cpp
index 39f5c39..b0474ea 100644
--- a/test/test_util.cpp
+++ b/test/test_util.cpp
@@ -121,36 +121,6 @@
 namespace mac_address
 {
 
-TEST(MacFromString, Bad)
-{
-    EXPECT_THROW(fromString("0x:00:00:00:00:00"), std::invalid_argument);
-    EXPECT_THROW(fromString("00:00:00:00:00"), std::invalid_argument);
-    EXPECT_THROW(fromString("00:00:00:00:00:"), std::invalid_argument);
-    EXPECT_THROW(fromString("00:00:00:00::00"), std::invalid_argument);
-    EXPECT_THROW(fromString(":00:00:00:00:00"), std::invalid_argument);
-    EXPECT_THROW(fromString("00::00:00:00:00"), std::invalid_argument);
-    EXPECT_THROW(fromString(":::::"), std::invalid_argument);
-    EXPECT_THROW(fromString("00:0:0:0:0"), std::invalid_argument);
-    EXPECT_THROW(fromString("00:00:00:00:00:00:00"), std::invalid_argument);
-    EXPECT_THROW(fromString(""), std::invalid_argument);
-    EXPECT_THROW(fromString("123456789XYZ"), std::invalid_argument);
-    EXPECT_THROW(fromString("123456789AB"), std::invalid_argument);
-    EXPECT_THROW(fromString("123456789ABCD"), std::invalid_argument);
-}
-
-TEST(MacFromString, Valid)
-{
-    EXPECT_EQ((ether_addr{}), fromString("00:00:00:00:00:00"));
-    EXPECT_EQ((ether_addr{0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa}),
-              fromString("FF:EE:DD:cc:bb:aa"));
-    EXPECT_EQ((ether_addr{0x00, 0x01, 0x02, 0x03, 0x04, 0x05}),
-              fromString("0:1:2:3:4:5"));
-    EXPECT_EQ((ether_addr{0x01, 0x23, 0x45, 0x67, 0x89, 0xab}),
-              fromString("0123456789AB"));
-    EXPECT_EQ((ether_addr{0xff, 0xee, 0xdd, 0xcc, 0xbb, 0xaa}),
-              fromString("FFEEDDccbbaa"));
-}
-
 TEST(MacIsEmpty, True)
 {
     EXPECT_TRUE(isEmpty({}));
@@ -158,34 +128,34 @@
 
 TEST(MacIsEmpty, False)
 {
-    EXPECT_FALSE(isEmpty(fromString("01:00:00:00:00:00")));
-    EXPECT_FALSE(isEmpty(fromString("00:00:00:10:00:00")));
-    EXPECT_FALSE(isEmpty(fromString("00:00:00:00:00:01")));
+    EXPECT_FALSE(isEmpty({1}));
+    EXPECT_FALSE(isEmpty({0, 0, 0, 1}));
+    EXPECT_FALSE(isEmpty({0, 0, 0, 0, 0, 1}));
 }
 
 TEST(MacIsMulticast, True)
 {
-    EXPECT_TRUE(isMulticast(fromString("ff:ff:ff:ff:ff:ff")));
-    EXPECT_TRUE(isMulticast(fromString("01:00:00:00:00:00")));
+    EXPECT_TRUE(isMulticast({255, 255, 255, 255, 255, 255}));
+    EXPECT_TRUE(isMulticast({1}));
 }
 
 TEST(MacIsMulticast, False)
 {
-    EXPECT_FALSE(isMulticast(fromString("00:11:22:33:44:55")));
-    EXPECT_FALSE(isMulticast(fromString("FE:11:22:33:44:55")));
+    EXPECT_FALSE(isMulticast({0, 1, 2, 3, 4, 5}));
+    EXPECT_FALSE(isMulticast({0xfe, 255, 255, 255, 255, 255}));
 }
 
 TEST(MacIsUnicast, True)
 {
-    EXPECT_TRUE(isUnicast(fromString("00:11:22:33:44:55")));
-    EXPECT_TRUE(isUnicast(fromString("FE:11:22:33:44:55")));
+    EXPECT_TRUE(isUnicast({0, 1, 2, 3, 4, 5}));
+    EXPECT_TRUE(isUnicast({0xfe, 255, 255, 255, 255, 255}));
 }
 
 TEST(MacIsUnicast, False)
 {
-    EXPECT_FALSE(isUnicast(fromString("00:00:00:00:00:00")));
-    EXPECT_FALSE(isUnicast(fromString("01:00:00:00:00:00")));
-    EXPECT_FALSE(isUnicast(fromString("ff:ff:ff:ff:ff:ff")));
+    EXPECT_FALSE(isUnicast({}));
+    EXPECT_FALSE(isUnicast({1}));
+    EXPECT_FALSE(isUnicast({255, 255, 255, 255, 255, 255}));
 }
 
 TEST(IgnoredInterfaces, Empty)