commit 9b2a20d3cfa1131521456b9ebfde7a7bb8b234bb
author William A. Kennington III <wak@google.com> Sat Jun 17 14:05:48 2023 -0700
committer William A. Kennington III <wak@google.com> Mon Jun 26 16:51:20 2023 -0700
tree f33cee59f4a7ca5ec50d94e1b5ed598ed36189ff
parent e8af05c81036e2f45207c5a3fcbd3de2fcc20316

types: Migrate to stdplus ip

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

test/test_ethernet_interface.cpp

diff --git a/test/test_ethernet_interface.cpp b/test/test_ethernet_interface.cpp
index 0596980..c92b8eb 100644
--- a/test/test_ethernet_interface.cpp
+++ b/test/test_ethernet_interface.cpp
@@ -96,8 +96,8 @@
 TEST_F(TestEthernetInterface, AddIPAddress)
 {
     createIPObject(IP::Protocol::IPv4, "10.10.10.10", 16);
-    EXPECT_THAT(interface.addrs, UnorderedElementsAre(Key(
-                                     IfAddr(in_addr{htonl(0x0a0a0a0a)}, 16))));
+    EXPECT_THAT(interface.addrs, UnorderedElementsAre(Key(stdplus::SubnetAny(
+                                     stdplus::In4Addr{10, 10, 10, 10}, 16))));
 }
 
 TEST_F(TestEthernetInterface, AddMultipleAddress)
@@ -106,17 +106,20 @@
     createIPObject(IP::Protocol::IPv4, "20.20.20.20", 16);
     EXPECT_THAT(
         interface.addrs,
-        UnorderedElementsAre(Key(IfAddr(in_addr{htonl(0x0a0a0a0a)}, 16)),
-                             Key(IfAddr(in_addr{htonl(0x14141414)}, 16))));
+        UnorderedElementsAre(
+            Key(stdplus::SubnetAny(stdplus::In4Addr{10, 10, 10, 10}, 16)),
+            Key(stdplus::SubnetAny(stdplus::In4Addr{20, 20, 20, 20}, 16))));
 }
 
 TEST_F(TestEthernetInterface, DeleteIPAddress)
 {
     createIPObject(IP::Protocol::IPv4, "10.10.10.10", 16);
     createIPObject(IP::Protocol::IPv4, "20.20.20.20", 16);
-    interface.addrs.at(IfAddr(in_addr{htonl(0x0a0a0a0a)}, 16))->delete_();
-    EXPECT_THAT(interface.addrs, UnorderedElementsAre(Key(
-                                     IfAddr(in_addr{htonl(0x14141414)}, 16))));
+    interface.addrs
+        .at(stdplus::SubnetAny(stdplus::In4Addr{10, 10, 10, 10}, 16))
+        ->delete_();
+    EXPECT_THAT(interface.addrs, UnorderedElementsAre(Key(stdplus::SubnetAny(
+                                     stdplus::In4Addr{20, 20, 20, 20}, 16))));
 }
 
 TEST_F(TestEthernetInterface, CheckObjectPath)