commit e5a48ab0ca0f9e6a29a78cd1110337763624a19c
author William A. Kennington III <wak@google.com> Mon Apr 22 03:55:23 2019 -0700
committer William A. Kennington III <wak@google.com> Tue Oct 25 03:06:57 2022 -0700
tree d3adcc5dbffadccb634ab86c96ae463f0f50e38e
parent feb7aab0adf8de2ceaf947c94ee1f98a4c6d7ab0

util: Refactor isValidPrefix to reduce address family re-use

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

test/test_util.cpp

diff --git a/test/test_util.cpp b/test/test_util.cpp
index 677b3f6..5d05ffd 100644
--- a/test/test_util.cpp
+++ b/test/test_util.cpp
@@ -5,6 +5,7 @@
 
 #include <cstddef>
 #include <cstring>
+#include <stdexcept>
 #include <stdplus/raw.hpp>
 #include <string>
 #include <string_view>
@@ -108,23 +109,21 @@
 
 TEST_F(TestUtil, PrefixValidation)
 {
-    uint8_t prefixLength = 1;
-    EXPECT_EQ(true, isValidPrefix(AF_INET, prefixLength));
+    EXPECT_TRUE(isValidPrefix(AF_INET, 0));
+    EXPECT_TRUE(isValidPrefix(AF_INET, 1));
+    EXPECT_TRUE(isValidPrefix(AF_INET, 32));
+    EXPECT_FALSE(isValidPrefix(AF_INET, 33));
+    EXPECT_FALSE(isValidPrefix(AF_INET, 64));
 
-    prefixLength = 32;
-    EXPECT_EQ(true, isValidPrefix(AF_INET, prefixLength));
+    EXPECT_TRUE(isValidPrefix(AF_INET6, 0));
+    EXPECT_TRUE(isValidPrefix(AF_INET6, 1));
+    EXPECT_TRUE(isValidPrefix(AF_INET6, 53));
+    EXPECT_TRUE(isValidPrefix(AF_INET6, 64));
+    EXPECT_TRUE(isValidPrefix(AF_INET6, 128));
+    EXPECT_FALSE(isValidPrefix(AF_INET6, 129));
+    EXPECT_FALSE(isValidPrefix(AF_INET6, 177));
 
-    prefixLength = 0;
-    EXPECT_EQ(false, isValidPrefix(AF_INET, prefixLength));
-
-    prefixLength = 33;
-    EXPECT_EQ(false, isValidPrefix(AF_INET, prefixLength));
-
-    prefixLength = 33;
-    EXPECT_EQ(true, isValidPrefix(AF_INET6, prefixLength));
-
-    prefixLength = 65;
-    EXPECT_EQ(false, isValidPrefix(AF_INET, prefixLength));
+    EXPECT_THROW(isValidPrefix(AF_UNSPEC, 1), std::invalid_argument);
 }
 
 TEST_F(TestUtil, InterfaceToUbootEthAddr)