types: Flesh out address comparison and string formatting
Change-Id: Ib505232e15e8db012d07759163f780b00ea4b7d3
Signed-off-by: William A. Kennington III <wak@google.com>
diff --git a/test/test_neighbor.cpp b/test/test_neighbor.cpp
index 0f0abc4..3cdb209 100644
--- a/test/test_neighbor.cpp
+++ b/test/test_neighbor.cpp
@@ -8,7 +8,6 @@
#include <cstring>
#include <stdexcept>
-#include <stdplus/raw.hpp>
#include <string>
#include <vector>
@@ -118,8 +117,7 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(
- stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_EQ(addr, neighbors[0].address);
}
TEST(ParseNeighbor, FilterInterface)
@@ -155,8 +153,7 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(
- stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_EQ(addr, neighbors[0].address);
}
TEST(ParseNeighbor, FilterState)
@@ -192,8 +189,7 @@
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
EXPECT_FALSE(neighbors[0].mac);
- EXPECT_TRUE(
- stdplus::raw::equal(addr, std::get<in_addr>(neighbors[0].address)));
+ EXPECT_EQ(addr, neighbors[0].address);
}
TEST(ParseNeighbor, Full)
@@ -234,10 +230,8 @@
EXPECT_EQ(1, neighbors.size());
EXPECT_EQ(msg.ndm_ifindex, neighbors[0].interface);
EXPECT_EQ(msg.ndm_state, neighbors[0].state);
- EXPECT_TRUE(neighbors[0].mac);
- EXPECT_TRUE(stdplus::raw::equal(mac, *neighbors[0].mac));
- EXPECT_TRUE(
- stdplus::raw::equal(addr, std::get<in6_addr>(neighbors[0].address)));
+ EXPECT_EQ(mac, neighbors[0].mac);
+ EXPECT_EQ(addr, neighbors[0].address);
}
} // namespace detail