From 43b7474c088f12e2801e179bd55c57b0a2aba2bc Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 18 Jul 2017 14:28:27 +0900 Subject: [PATCH] IP connectivity metrics: fix tests after proto update Update to ipconnectivity.proto in commit 6d2f506bfd788a3685292d404dc9d82a27357cfe broke the associated unit tests (Change-Id: I4cf5b95956df721aecd63fddfb026a7266c190b9) Bug: 34901696 Test: runtest frameworks-net Change-Id: I57a6bad8a9836b1c45690c4589b416786ce1dfa0 --- .../IpConnectivityEventBuilderTest.java | 7 +++++++ .../connectivity/IpConnectivityMetricsTest.java | 15 +++++++++++++++ .../NetdEventListenerServiceTest.java | 8 ++++++++ 3 files changed, 30 insertions(+) diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java index d11565abb9..eff04ab5ad 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java @@ -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", " >", ">", diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index e01469b182..cc18b7f322 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -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", diff --git a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java index f98ab3d069..46f395eae2 100644 --- a/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java +++ b/tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java @@ -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",