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

Commit 7c20b348 authored by Paul Hu's avatar Paul Hu Committed by Automerger Merge Worker
Browse files

Merge "Replace ResolvTestBase with common classs NetNativeTestBase" am: 57164e56 

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



Change-Id: Id5b2d8413238a998d2cbd05e3d7d2ce07b17d8f7
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 86bbf3c1 57164e56

DnsQueryLogTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -20,9 +20,9 @@ 
#include <android-base/strings.h>

#include <android-base/test_utils.h>

#include <gtest/gtest.h>

#include <netdutils/NetNativeTestBase.h>



#include "DnsQueryLog.h"

#include "tests/resolv_test_base.h"



using namespace std::chrono_literals;
@@ -59,7 +59,7 @@ void verifyDumpOutput(const std::string& dumpLog, const std::vector<int>& expect 


}  // namespace



class DnsQueryLogTest : public ResolvTestBase {

class DnsQueryLogTest : public NetNativeTestBase {

  protected:

    const std::vector<std::string> serversV4 = {"127.0.0.1", "1.2.3.4"};

    const std::vector<std::string> serversV4V6 = {"127.0.0.1", "1.2.3.4", "2001:db8::1",

DnsStatsTest.cpp

+3 −3
Original line number Diff line number Diff line
@@ -19,9 +19,9 @@ 
#include <android-base/test_utils.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <netdutils/NetNativeTestBase.h>



#include "DnsStats.h"

#include "tests/resolv_test_base.h"



namespace android::net {
@@ -67,7 +67,7 @@ StatsData makeStatsData(const IPSockAddr& server, const int total, const microse 


// TODO: add StatsDataTest to ensure its methods return correct outputs.



class StatsRecordsTest : public ResolvTestBase {};

class StatsRecordsTest : public NetNativeTestBase {};



TEST_F(StatsRecordsTest, PushRecord) {

    const IPSockAddr server = IPSockAddr::toIPSockAddr("127.0.0.2", 53);
@@ -105,7 +105,7 @@ TEST_F(StatsRecordsTest, PushRecord) { 
              makeStatsData(server, 3, 750ms, {{NS_R_NO_ERROR, 0}, {NS_R_TIMEOUT, 3}}));

}



class DnsStatsTest : public ResolvTestBase {

class DnsStatsTest : public NetNativeTestBase {

  protected:

    std::string captureDumpOutput() {

        netdutils::DumpWriter dw(STDOUT_FILENO);

ExperimentsTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -23,13 +23,13 @@ 
#include <android-base/test_utils.h>

#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <netdutils/NetNativeTestBase.h>



#include "Experiments.h"

#include "tests/resolv_test_base.h"



namespace android::net {



class ExperimentsTest : public ResolvTestBase {

class ExperimentsTest : public NetNativeTestBase {

  public:

    ExperimentsTest() : mExperiments(fakeGetExperimentFlagInt) {}

OperationLimiterTest.cpp

+2 −3
Original line number Diff line number Diff line
@@ -17,13 +17,12 @@ 
#include "OperationLimiter.h"



#include <gtest/gtest-spi.h>



#include "resolv_test_base.h"

#include <netdutils/NetNativeTestBase.h>



namespace android {

namespace netdutils {



class OperationLimiterTest : public ResolvTestBase {};

class OperationLimiterTest : public NetNativeTestBase {};



TEST_F(OperationLimiterTest, limits) {

    OperationLimiter<int> limiter(3);

PrivateDnsConfigurationTest.cpp

+2 −2
Original line number Diff line number Diff line
@@ -16,18 +16,18 @@ 


#include <gmock/gmock.h>

#include <gtest/gtest.h>

#include <netdutils/NetNativeTestBase.h>



#include "PrivateDnsConfiguration.h"

#include "tests/dns_responder/dns_responder.h"

#include "tests/dns_responder/dns_tls_frontend.h"

#include "tests/resolv_test_base.h"

#include "tests/resolv_test_utils.h"



namespace android::net {



using namespace std::chrono_literals;



class PrivateDnsConfigurationTest : public ResolvTestBase {

class PrivateDnsConfigurationTest : public NetNativeTestBase {

  public:

    using ServerIdentity = PrivateDnsConfiguration::ServerIdentity;