Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b51d5062 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "resolv_integration_test: refactor TestCase to TestSuite" am: 0870a8d6...

Merge "resolv_integration_test: refactor TestCase to TestSuite" am: 0870a8d6 am: 440046d0 am: 5ef5cd9a

Change-Id: I7be104bd79c23639950ad2e0229441014156df46
parents 794e12be 5ef5cd9a
Loading
Loading
Loading
Loading
+4 −4
Original line number Diff line number Diff line
@@ -119,7 +119,7 @@ std::pair<ScopedAddrinfo, int> safe_getaddrinfo_time_taken(const char* node, con

class ResolverTest : public ::testing::Test {
  public:
    static void SetUpTestCase() {
    static void SetUpTestSuite() {
        // Get binder service.
        // Note that |mDnsClient| is not used for getting binder service in this static function.
        // The reason is that wants to keep |mDnsClient| as a non-static data member. |mDnsClient|
@@ -153,7 +153,7 @@ class ResolverTest : public ::testing::Test {
        // recipient.
        ABinderProcess_startThreadPool();
    }
    static void TearDownTestCase() { AIBinder_DeathRecipient_delete(sResolvDeathRecipient); }
    static void TearDownTestSuite() { AIBinder_DeathRecipient_delete(sResolvDeathRecipient); }

  protected:
    void SetUp() { mDnsClient.SetUp(); }
@@ -200,11 +200,11 @@ class ResolverTest : public ::testing::Test {
    // TODO: Perhaps add an unregistering listener binder call or fork a listener process which
    // could be terminated earlier.
    static std::shared_ptr<DnsMetricsListener>
            sDnsMetricsListener;  // Initialized in SetUpTestCase.
            sDnsMetricsListener;  // Initialized in SetUpTestSuite.

    // Use a shared static death recipient to monitor the service death. The static death
    // recipient could monitor the death not only during the test but also between tests.
    static AIBinder_DeathRecipient* sResolvDeathRecipient;  // Initialized in SetUpTestCase.
    static AIBinder_DeathRecipient* sResolvDeathRecipient;  // Initialized in SetUpTestSuite.
};

// Initialize static member of class.