Merge "Move test cases to unit test" am: 0bc1031ff3 am: 298e9fe22b am: 1339709449 (a2c12a81) · Commits · e / os / android_packages_modules_DnsResolver

resolv_cache_unit_test.cpp

+0 −60

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@
		#include <ctime>
		#include <thread>

		#include <aidl/android/net/IDnsResolver.h>
		#include <android-base/logging.h>
		#include <android-base/stringprintf.h>
		#include <android/multinetwork.h>
		@@ -39,7 +38,6 @@

		using namespace std::chrono_literals;

		using aidl::android::net::IDnsResolver;
		using android::netdutils::IPSockAddr;

		constexpr int TEST_NETID = 30;
		@@ -839,64 +837,6 @@ TEST_F(ResolvCacheTest, GetHostByAddrFromCache) {
		EXPECT_STREQ(answer, domain_name);
		}

		TEST_F(ResolvCacheTest, GetNetworkTypesForNet) {
		const SetupParams setup = {
		.servers = {"127.0.0.1", "::127.0.0.2", "fe80::3"},
		.domains = {"domain1.com", "domain2.com"},
		.params = kParams,
		.transportTypes = {IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_VPN}};
		EXPECT_EQ(0, cacheCreate(TEST_NETID));
		EXPECT_EQ(0, cacheSetupResolver(TEST_NETID, setup));
		EXPECT_EQ(android::net::NT_WIFI_VPN, resolv_get_network_types_for_net(TEST_NETID));
		}

		TEST_F(ResolvCacheTest, ConvertTransportsToNetworkType) {
		static const struct TestConfig {
		int32_t networkType;
		std::vector<int32_t> transportTypes;
		} testConfigs[] = {
		{android::net::NT_CELLULAR, {IDnsResolver::TRANSPORT_CELLULAR}},
		{android::net::NT_WIFI, {IDnsResolver::TRANSPORT_WIFI}},
		{android::net::NT_BLUETOOTH, {IDnsResolver::TRANSPORT_BLUETOOTH}},
		{android::net::NT_ETHERNET, {IDnsResolver::TRANSPORT_ETHERNET}},
		{android::net::NT_VPN, {IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_AWARE, {IDnsResolver::TRANSPORT_WIFI_AWARE}},
		{android::net::NT_LOWPAN, {IDnsResolver::TRANSPORT_LOWPAN}},
		{android::net::NT_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_CELLULAR}},
		{android::net::NT_WIFI_VPN,
		{IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_WIFI}},
		{android::net::NT_BLUETOOTH_VPN,
		{IDnsResolver::TRANSPORT_BLUETOOTH, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_BLUETOOTH_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_BLUETOOTH}},
		{android::net::NT_ETHERNET_VPN,
		{IDnsResolver::TRANSPORT_ETHERNET, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_ETHERNET_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_ETHERNET}},
		{android::net::NT_UNKNOWN, {IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_UNKNOWN,
		{IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_LOWPAN}},
		{android::net::NT_UNKNOWN, {}},
		{android::net::NT_UNKNOWN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_BLUETOOTH,
		IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_WIFI,
		IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_WIFI,
		IDnsResolver::TRANSPORT_CELLULAR}},
		};
		for (const auto& config : testConfigs) {
		EXPECT_EQ(config.networkType, convert_network_type(config.transportTypes));
		}
		}

		namespace {

		constexpr int EAI_OK = 0;

resolv_unit_test.cpp

+70 −10

Original line number	Diff line number	Diff line
		@@ -16,6 +16,7 @@

		#define LOG_TAG "resolv"

		#include <aidl/android/net/IDnsResolver.h>
		#include <android-base/stringprintf.h>
		#include <arpa/inet.h>
		#include <gmock/gmock-matchers.h>
		@@ -36,6 +37,7 @@
		namespace android {
		namespace net {

		using aidl::android::net::IDnsResolver;
		using android::base::StringPrintf;
		using android::net::NetworkDnsEventReported;
		using android::netdutils::ScopedAddrinfo;
		@@ -122,16 +124,6 @@ class TestBase : public ::testing::Test {
		}

		int SetResolvers() {
		const std::vector<std::string> servers = {test::kDefaultListenAddr};
		const std::vector<std::string> domains = {"example.com"};
		const res_params params = {
		.sample_validity = 300,
		.success_threshold = 25,
		.min_samples = 8,
		.max_samples = 8,
		.base_timeout_msec = 1000,
		.retry_count = 2,
		};
		return resolv_set_nameservers(TEST_NETID, servers, domains, params);
		}

		@@ -142,10 +134,21 @@ class TestBase : public ::testing::Test {
		.dns_mark = MARK_UNSET,
		.uid = NET_CONTEXT_INVALID_UID,
		};
		const std::vector<std::string> servers = {test::kDefaultListenAddr};
		const std::vector<std::string> domains = {"example.com"};
		const res_params params = {
		.sample_validity = 300,
		.success_threshold = 25,
		.min_samples = 8,
		.max_samples = 8,
		.base_timeout_msec = 1000,
		.retry_count = 2,
		};
		};

		class ResolvGetAddrInfoTest : public TestBase {};
		class GetHostByNameForNetContextTest : public TestBase {};
		class ResolvCommonFunctionTest : public TestBase {};

		TEST_F(ResolvGetAddrInfoTest, InvalidParameters) {
		// Both null "netcontext" and null "res" of resolv_getaddrinfo() are not tested
		@@ -1448,6 +1451,63 @@ TEST_F(GetHostByNameForNetContextTest, CnamesInfiniteLoop) {
		}
		}

		TEST_F(ResolvCommonFunctionTest, GetNetworkTypesForNet) {
		const aidl::android::net::ResolverOptionsParcel& resolverOptions = {
		{} /* hosts */, aidl::android::net::IDnsResolver::TC_MODE_DEFAULT};
		const std::vector<int32_t>& transportTypes = {IDnsResolver::TRANSPORT_WIFI,
		IDnsResolver::TRANSPORT_VPN};
		EXPECT_EQ(0, resolv_set_nameservers(TEST_NETID, servers, domains, params, resolverOptions,
		transportTypes));
		EXPECT_EQ(android::net::NT_WIFI_VPN, resolv_get_network_types_for_net(TEST_NETID));
		}

		TEST_F(ResolvCommonFunctionTest, ConvertTransportsToNetworkType) {
		static const struct TestConfig {
		int32_t networkType;
		std::vector<int32_t> transportTypes;
		} testConfigs[] = {
		{android::net::NT_CELLULAR, {IDnsResolver::TRANSPORT_CELLULAR}},
		{android::net::NT_WIFI, {IDnsResolver::TRANSPORT_WIFI}},
		{android::net::NT_BLUETOOTH, {IDnsResolver::TRANSPORT_BLUETOOTH}},
		{android::net::NT_ETHERNET, {IDnsResolver::TRANSPORT_ETHERNET}},
		{android::net::NT_VPN, {IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_AWARE, {IDnsResolver::TRANSPORT_WIFI_AWARE}},
		{android::net::NT_LOWPAN, {IDnsResolver::TRANSPORT_LOWPAN}},
		{android::net::NT_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_CELLULAR}},
		{android::net::NT_WIFI_VPN,
		{IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_WIFI}},
		{android::net::NT_BLUETOOTH_VPN,
		{IDnsResolver::TRANSPORT_BLUETOOTH, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_BLUETOOTH_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_BLUETOOTH}},
		{android::net::NT_ETHERNET_VPN,
		{IDnsResolver::TRANSPORT_ETHERNET, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_ETHERNET_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_ETHERNET}},
		{android::net::NT_UNKNOWN, {IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_UNKNOWN,
		{IDnsResolver::TRANSPORT_WIFI, IDnsResolver::TRANSPORT_LOWPAN}},
		{android::net::NT_UNKNOWN, {}},
		{android::net::NT_UNKNOWN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_BLUETOOTH,
		IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_CELLULAR, IDnsResolver::TRANSPORT_WIFI,
		IDnsResolver::TRANSPORT_VPN}},
		{android::net::NT_WIFI_CELLULAR_VPN,
		{IDnsResolver::TRANSPORT_VPN, IDnsResolver::TRANSPORT_WIFI,
		IDnsResolver::TRANSPORT_CELLULAR}},
		};
		for (const auto& config : testConfigs) {
		EXPECT_EQ(config.networkType, convert_network_type(config.transportTypes));
		}
		}

		// Note that local host file function, files_getaddrinfo(), of resolv_getaddrinfo()
		// is not tested because it only returns a boolean (success or failure) without any error number.