fix tests

bradh352 · Dec 27, 2024 · 2be799d · 2be799d
1 parent ee16733
commit 2be799d
Showing 1 changed file with 20 additions and 18 deletions.
diff --git a/test/ares-test-mock-ai.cc b/test/ares-test-mock-ai.cc
@@ -1007,9 +1007,9 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, NoHostsLocalHostv4,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[127.0.0.1]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(1));
+  EXPECT_THAT(result.ai_, IncludesV4Address("127.0.0.1"));
   return HasFailure();
 }
 
@@ -1022,9 +1022,9 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, NoHostsLocalHostv6,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[0000:0000:0000:0000:0000:0000:0000:0001]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(1));
+  EXPECT_THAT(result.ai_, IncludesV6Address("0000:0000:0000:0000:0000:0000:0000:0001"));
   return HasFailure();
 }
 
@@ -1037,9 +1037,10 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, NoHostsLocalHostUnspec,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[127.0.0.1], addr=[0000:0000:0000:0000:0000:0000:0000:0001]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(2));
+  EXPECT_THAT(result.ai_, IncludesV4Address("127.0.0.1"));
+  EXPECT_THAT(result.ai_, IncludesV6Address("0000:0000:0000:0000:0000:0000:0000:0001"));
   return HasFailure();
 }
 
@@ -1061,9 +1062,9 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, v4OnlyLocalHostv4,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[127.0.0.1]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(1));
+  EXPECT_THAT(result.ai_, IncludesV4Address("127.0.0.1"));
   return HasFailure();
 }
 
@@ -1076,9 +1077,9 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, v4OnlyLocalHostv6,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[0000:0000:0000:0000:0000:0000:0000:0001]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(1));
+  EXPECT_THAT(result.ai_, IncludesV6Address("0000:0000:0000:0000:0000:0000:0000:0001"));
   return HasFailure();
 }
 
@@ -1091,9 +1092,10 @@ CONTAINED_TEST_P(ContainedMockChannelAISysConfig, v4OnlyLocalHostUnspec,
   ares_getaddrinfo(channel_, "localhost", NULL, &hints, AddrInfoCallback, &result);
   Process();
   EXPECT_TRUE(result.done_);
-  std::stringstream ss;
-  ss << result.ai_;
-  EXPECT_EQ("{addr=[127.0.0.1], addr=[0000:0000:0000:0000:0000:0000:0000:0001]}", ss.str());
+  EXPECT_EQ(result.status_, ARES_SUCCESS);
+  EXPECT_THAT(result.ai_, IncludesNumAddresses(2));
+  EXPECT_THAT(result.ai_, IncludesV4Address("127.0.0.1"));
+  EXPECT_THAT(result.ai_, IncludesV6Address("0000:0000:0000:0000:0000:0000:0000:0001"));
   return HasFailure();
 }