util: Refactor isValidPrefix to reduce address family re-use
Change-Id: I13abd5b110709210b98b4ea74e3129c3ab42bd46
Signed-off-by: William A. Kennington III <wak@google.com>
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)