commit 7007085e43f6529cb3f54c012054ec096090c225
author Luke Huang <huangluke@google.com> Mon Nov 25 18:25:50 2019 +0800
committer Luke Huang <huangluke@google.com> Mon Nov 25 16:05:01 2019 +0000
tree 4b125796e504d6f1a76c7feb135f8e27b7d568d7
parent 0f4dd25d89ae2a9563386dea47c9471ada73e0ed

Follow-up changes for running resolv_integration_test on Q devices

Address comments from aosp/1171994

Bug: 144850003
Test: atest
Change-Id: Ifac816e7c834018e5b7aee99f6f0beccb844a843

tests/resolv_integration_test.cpp

diff --git a/tests/resolv_integration_test.cpp b/tests/resolv_integration_test.cpp
index 4baa156..02bb3f1 100644
--- a/tests/resolv_integration_test.cpp
+++ b/tests/resolv_integration_test.cpp
@@ -86,6 +86,7 @@
                                          const addrinfo* hints, unsigned netid, unsigned mark,
                                          struct addrinfo** result);
 
+using aidl::android::net::IDnsResolver;
 using aidl::android::net::INetd;
 using android::base::ParseInt;
 using android::base::StringPrintf;
@@ -136,6 +137,10 @@
         ASSERT_NE(nullptr, resolvService.get());
 
         // Subscribe the death recipient to the service IDnsResolver for detecting Netd death.
+        // GTEST assertion macros are not invoked for generating a test failure in the death
+        // recipient because the macros can't indicate failed test if Netd died between tests.
+        // Moreover, continuing testing may have no meaningful after Netd death. Therefore, the
+        // death recipient aborts process by GTEST_LOG_(FATAL) once Netd died.
         sResolvDeathRecipient = AIBinder_DeathRecipient_new([](void*) {
             constexpr char errorMessage[] = "Netd died";
             LOG(ERROR) << errorMessage;
@@ -161,21 +166,6 @@
         std::string addr;       // ipv4/v6 address
     };
 
-    class ResolvDeathRecipient : public android::IBinder::DeathRecipient {
-      public:
-        ~ResolvDeathRecipient() override = default;
-
-        // GTEST assertion macros are not invoked for generating a test failure in the death
-        // recipient because the macros can't indicate failed test if Netd died between tests.
-        // Moreover, continuing testing may have no meaningful after Netd death. Therefore, the
-        // death recipient aborts process by GTEST_LOG_(FATAL) once Netd died.
-        void binderDied(const android::wp<android::IBinder>& /*who*/) override {
-            constexpr char errorMessage[] = "Netd died";
-            LOG(ERROR) << errorMessage;
-            GTEST_LOG_(FATAL) << errorMessage;
-        }
-    };
-
     void SetUp() { mDnsClient.SetUp(); }
     void TearDown() { mDnsClient.TearDown(); }
 
@@ -414,7 +404,6 @@
 }
 
 TEST_F(ResolverTest, BinderSerialization) {
-    using aidl::android::net::IDnsResolver;
     std::vector<int> params_offsets = {
             IDnsResolver::RESOLVER_PARAMS_SAMPLE_VALIDITY,
             IDnsResolver::RESOLVER_PARAMS_SUCCESS_THRESHOLD,
@@ -432,8 +421,6 @@
 }
 
 TEST_F(ResolverTest, GetHostByName_Binder) {
-    using aidl::android::net::IDnsResolver;
-
     std::vector<std::string> domains = {"example.com"};
     std::vector<std::unique_ptr<test::DNSResponder>> dns;
     std::vector<std::string> servers;
@@ -930,7 +917,6 @@
 }
 
 TEST_F(ResolverTest, EmptySetup) {
-    using aidl::android::net::IDnsResolver;
     std::vector<std::string> servers;
     std::vector<std::string> domains;
     ASSERT_TRUE(mDnsClient.SetResolversForNetwork(servers, domains));