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

Commit 8943ac67 authored by Mike Yu's avatar Mike Yu Committed by Automerger Merge Worker
Browse files

Merge "Test: Create single PrivateDnsConfiguration in... 

Merge "Test: Create single PrivateDnsConfiguration in PrivateDnsConfigurationTest and make it static" am: 5289b1b2 am: 500cdbdf am: 34d775b5 am: f1504bb0 am: 14c1ec59

Original change: https://android-review.googlesource.com/c/platform/packages/modules/DnsResolver/+/2600245



Change-Id: Ib16c54c995bd3a24b3720566f626077237e4f2bc
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents cb9c8f03 14c1ec59

PrivateDnsConfigurationTest.cpp

+6 −2
Original line number Diff line number Diff line
@@ -81,7 +81,11 @@ class PrivateDnsConfigurationTest : public NetNativeTestBase { 
        EXPECT_EQ(0, resolv_create_cache_for_net(kNetId));

    }



    void TearDown() { resolv_delete_cache_for_net(kNetId); }

    void TearDown() {

        // Reset the state for the next test.

        resolv_delete_cache_for_net(kNetId);

        mPdc.set(kNetId, kMark, {}, {}, {}, {});

    }



  protected:

    class MockObserver : public PrivateDnsValidationObserver {
@@ -135,7 +139,7 @@ class PrivateDnsConfigurationTest : public NetNativeTestBase { 
    static constexpr char kServer2[] = "127.0.2.3";



    MockObserver mObserver;

    PrivateDnsConfiguration mPdc;

    inline static PrivateDnsConfiguration mPdc;



    // TODO: Because incorrect CAs result in validation failed in strict mode, have

    // PrivateDnsConfiguration run mocked code rather than DnsTlsTransport::validate().