Merge "IP connectivity metrics: fix tests after proto update" (ff6bce1e) · Commits · e / os / android_frameworks_base

tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java

+7 −0

Original line number	Diff line number	Diff line
		@@ -201,9 +201,14 @@ public class IpConnectivityEventBuilderTest extends TestCase {
		" time_ms: 1",
		" transports: 0",
		" default_network_event <",
		" default_network_duration_ms: 0",
		" final_score: 0",
		" initial_score: 0",
		" ip_support: 0",
		" network_id <",
		" network_id: 102",
		" >",
		" no_default_network_duration_ms: 0",
		" previous_network_id <",
		" network_id: 101",
		" >",
		@@ -442,6 +447,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
		" program_updates_all: 7",
		" program_updates_allowing_multicast: 3",
		" received_ras: 10",
		" total_packet_dropped: 0",
		" total_packet_processed: 0",
		" zero_lifetime_ras: 1",
		" >",
		">",

+15 −0

Original line number	Diff line number	Diff line
		@@ -256,9 +256,14 @@ public class IpConnectivityMetricsTest {
		" time_ms: 300",
		" transports: 0",
		" default_network_event <",
		" default_network_duration_ms: 0",
		" final_score: 0",
		" initial_score: 0",
		" ip_support: 0",
		" network_id <",
		" network_id: 102",
		" >",
		" no_default_network_duration_ms: 0",
		" previous_network_id <",
		" network_id: 101",
		" >",
		@@ -308,6 +313,8 @@ public class IpConnectivityMetricsTest {
		" program_updates_all: 7",
		" program_updates_allowing_multicast: 3",
		" received_ras: 10",
		" total_packet_dropped: 0",
		" total_packet_processed: 0",
		" zero_lifetime_ras: 1",
		" >",
		">",
		@@ -367,6 +374,10 @@ public class IpConnectivityMetricsTest {
		" event_types: 1",
		" event_types: 1",
		" event_types: 2",
		" getaddrinfo_error_count: 0",
		" getaddrinfo_query_count: 0",
		" gethostbyname_error_count: 0",
		" gethostbyname_query_count: 0",
		" latencies_ms: 3456",
		" latencies_ms: 45",
		" latencies_ms: 638",
		@@ -384,6 +395,10 @@ public class IpConnectivityMetricsTest {
		" dns_lookup_batch <",
		" event_types: 1",
		" event_types: 2",
		" getaddrinfo_error_count: 0",
		" getaddrinfo_query_count: 0",
		" gethostbyname_error_count: 0",
		" gethostbyname_query_count: 0",
		" latencies_ms: 56",
		" latencies_ms: 34",
		" return_codes: 0",

+8 −0

Original line number	Diff line number	Diff line
		@@ -111,6 +111,10 @@ public class NetdEventListenerServiceTest {
		" event_types: 1",
		" event_types: 2",
		" event_types: 2",
		" getaddrinfo_error_count: 0",
		" getaddrinfo_query_count: 0",
		" gethostbyname_error_count: 0",
		" gethostbyname_query_count: 0",
		" latencies_ms: 3456",
		" latencies_ms: 267",
		" latencies_ms: 1230",
		@@ -142,6 +146,10 @@ public class NetdEventListenerServiceTest {
		" event_types: 2",
		" event_types: 1",
		" event_types: 1",
		" getaddrinfo_error_count: 0",
		" getaddrinfo_query_count: 0",
		" gethostbyname_error_count: 0",
		" gethostbyname_query_count: 0",
		" latencies_ms: 56",
		" latencies_ms: 78",
		" latencies_ms: 14",