commit eb8f22c800dfe4c377b03f8f4ed9283ffd674c65
author Mike Yu <yumike@google.com> Tue Sep 22 11:58:13 2020 +0800
committer Mike Yu <yumike@google.com> Tue Sep 22 13:47:43 2020 +0800
tree 0a55d47e5649f20e82db709ac0b79adfd9e2572d
parent 10832aaa42f57a319ac202a706fa64ba0419c3e7

Fix typo in DnsServerSelection test

This is a follow up change for aosp/1409908.
No functionality change.

Bug: 137169582
Test: m resolv_integration_test
Change-Id: If5022453ebe6836285e87e58733ce0b8b9c65cac

tests/resolv_integration_test.cpp

diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index b8b15f9..7cb6f9c 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -5226,15 +5226,14 @@
 
     ScopedSystemProperties scopedSystemProperties(kSortNameserversFlag, "1");
 
-    const std::vector<std::vector<std::string>> testConfig = {
-            {dns1.listen_address(), dns2.listen_address(), dns3.listen_address()},
-            {dns1.listen_address(), dns3.listen_address(), dns2.listen_address()},
-            {dns2.listen_address(), dns1.listen_address(), dns3.listen_address()},
-            {dns2.listen_address(), dns3.listen_address(), dns1.listen_address()},
-            {dns3.listen_address(), dns1.listen_address(), dns2.listen_address()},
-            {dns3.listen_address(), dns2.listen_address(), dns1.listen_address()},
+    // NOTE: the servers must be sorted alphabetically.
+    std::vector<std::string> serverList = {
+            dns1.listen_address(),
+            dns2.listen_address(),
+            dns3.listen_address(),
     };
-    for (const auto& serverList : testConfig) {
+
+    do {
         SCOPED_TRACE(fmt::format("testConfig: [{}]", fmt::join(serverList, ", ")));
         const int queryNum = 50;
         int64_t accumulatedTime = 0;
@@ -5270,18 +5269,18 @@
         EXPECT_GT(dns1Count, dns2Count);
         EXPECT_GT(dns2Count, dns3Count);
 
-        const int avergeTime = accumulatedTime / queryNum;
-        LOG(INFO) << "ResolverTest#DnsServerSelection: avergeTime " << avergeTime << "us";
+        const int averageTime = accumulatedTime / queryNum;
+        LOG(INFO) << "ResolverTest#DnsServerSelection: averageTime " << averageTime << "us";
 
-        // Since the avergeTime might differ depending on parameters, set [10ms, 20ms] as
+        // Since the average Time might differ depending on parameters, set [10ms, 20ms] as
         // acceptable range.
-        EXPECT_GE(avergeTime, 10000);
-        EXPECT_LE(avergeTime, 20000);
+        EXPECT_GE(averageTime, 10000);
+        EXPECT_LE(averageTime, 20000);
 
         dns1.clearQueries();
         dns2.clearQueries();
         dns3.clearQueries();
-    }
+    } while (std::next_permutation(serverList.begin(), serverList.end()));
 }
 
 // ResolverMultinetworkTest is used to verify multinetwork functionality. Here's how it works: