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

Commit 7304b76a authored Nov 29, 2023 by Frank Li Committed by Automerger Merge Worker Nov 29, 2023

Added the test for UID field of NetwrokDnsEventReported atom am: 21072606

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

Change-Id: I495e565841487ff1e8ececadf7d0ac5750d6c439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

parents 0ab89a61 21072606

tests/resolv_stats_test_utils.cpp

+3 −0

Original line number	Original line	Diff line number	Diff line
	@@ -107,6 +107,8 @@ NetworkDnsEventReported fromNetworkDnsEventReportedStr(const std::string& str) {
	event.set_private_dns_modes(static_cast<PrivateDnsModes>(value));		event.set_private_dns_modes(static_cast<PrivateDnsModes>(value));
	} else if (protoField[1] == "sampling_rate_denom" && ParseInt(protoField[2], &value)) {		} else if (protoField[1] == "sampling_rate_denom" && ParseInt(protoField[2], &value)) {
	event.set_sampling_rate_denom(value);		event.set_sampling_rate_denom(value);
			} else if (protoField[1] == "uid" && ParseInt(protoField[2], &value)) {
			event.set_uid(value);
	}		}
	}		}
	// Parsing each field of the proto DnsQueryEvent		// Parsing each field of the proto DnsQueryEvent
	@@ -169,6 +171,7 @@ void PrintTo(const NetworkDnsEventReported& event, std::ostream* os) {
	*os << " network_type: " << event.network_type() << "\n";		*os << " network_type: " << event.network_type() << "\n";
	*os << " private_dns_modes: " << event.private_dns_modes() << "\n";		*os << " private_dns_modes: " << event.private_dns_modes() << "\n";
	*os << " dns_query_event_size: " << event.dns_query_events().dns_query_event_size() << "\n";		*os << " dns_query_event_size: " << event.dns_query_events().dns_query_event_size() << "\n";
			*os << " uid: " << event.uid() << "\n";
	*os << "}";		*os << "}";
	}		}

tests/resolv_stats_test_utils.h

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -120,7 +120,9 @@ MATCHER_P(NetworkDnsEventEq, other, "") {
	*/		*/
	::testing::Property("dns_query_events",		::testing::Property("dns_query_events",
	&android::net::NetworkDnsEventReported::dns_query_events,		&android::net::NetworkDnsEventReported::dns_query_events,
	DnsQueryEventsEq(other.dns_query_events()))),		DnsQueryEventsEq(other.dns_query_events())),
			::testing::Property("uid", &android::net::NetworkDnsEventReported::uid,
			::testing::Eq(other.uid()))),
	arg, result_listener);		arg, result_listener);
	}		}

tests/resolv_stats_test_utils_test.cpp

+3 −1

Original line number	Original line	Diff line number	Diff line
	@@ -58,7 +58,8 @@ TEST_F(ResolvStatsUtilsTest, NetworkDnsEventEq) {
	latency_micros: 0,		latency_micros: 0,
	}		}
	]		]
	}		},
			uid: 1000,
	})Event";		})Event";

	// TODO: Add integration test to verify Level 1 fields of NetworkDnsEventReported.		// TODO: Add integration test to verify Level 1 fields of NetworkDnsEventReported.
	@@ -83,6 +84,7 @@ TEST_F(ResolvStatsUtilsTest, NetworkDnsEventEq) {
	dnsQueryEvent2->set_dns_server_index(1);		dnsQueryEvent2->set_dns_server_index(1);
	dnsQueryEvent2->set_connected(0);		dnsQueryEvent2->set_connected(0);
	dnsQueryEvent2->set_latency_micros(5);		dnsQueryEvent2->set_latency_micros(5);
			event1.set_uid(1000);
	EXPECT_THAT(event1, NetworkDnsEventEq(fromNetworkDnsEventReportedStr(event2)));		EXPECT_THAT(event1, NetworkDnsEventEq(fromNetworkDnsEventReportedStr(event2)));
	}		}