LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "IP connectivity metrics: fix tests"

Browse Source
This commit is contained in:
Hugo Benichi
2017-01-16 08:28:43 +00:00
committed by Android (Google) Code Review
parent 2d26b0e4b0 968c0ea3a3
commit 1db5dfef30
3 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
tests/net/java/com/android/server/connectivity/IpConnectivityEventBuilderTest.java
View File

@@ -58,8 +58,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" default_network_event <", " default_network_event <",
" network_id <", " network_id <",
" network_id: 102", " network_id: 102",
@@ -89,8 +89,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" dhcp_event <", " dhcp_event <",
" duration_ms: 192", " duration_ms: 192",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -112,8 +112,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" dhcp_event <", " dhcp_event <",
" duration_ms: 0", " duration_ms: 0",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -137,8 +137,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" dns_lookup_batch <", " dns_lookup_batch <",
" event_types: 1", " event_types: 1",
" event_types: 1", " event_types: 1",
@@ -185,8 +185,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" ip_provisioning_event <", " ip_provisioning_event <",
" event_type: 1", " event_type: 1",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -208,8 +208,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" ip_reachability_event <", " ip_reachability_event <",
" event_type: 512", " event_type: 512",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -231,8 +231,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" network_event <", " network_event <",
" event_type: 5", " event_type: 5",
" latency_ms: 20410", " latency_ms: 20410",
@@ -258,8 +258,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" validation_probe_event <", " validation_probe_event <",
" latency_ms: 40730", " latency_ms: 40730",
" network_id <", " network_id <",
@@ -287,8 +287,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" apf_program_event <", " apf_program_event <",
" current_ras: 9", " current_ras: 9",
" drop_multicast: true", " drop_multicast: true",
@@ -319,8 +319,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" apf_statistics <", " apf_statistics <",
" dropped_ras: 2", " dropped_ras: 2",
" duration_ms: 45000", " duration_ms: 45000",
@@ -351,8 +351,8 @@ public class IpConnectivityEventBuilderTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 1", " time_ms: 1",
" transport: 0",
" ra_event <", " ra_event <",
" dnssl_lifetime: -1", " dnssl_lifetime: -1",
" prefix_preferred_lifetime: 300", " prefix_preferred_lifetime: 300",

14
tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java
View File

@@ -158,16 +158,16 @@ public class IpConnectivityMetricsTest extends TestCase {
String want = joinLines( String want = joinLines(
"dropped_events: 0", "dropped_events: 0",
"events <", "events <",
" link_layer: 0",
" time_ms: 100", " time_ms: 100",
" transport: 0",
" ip_reachability_event <", " ip_reachability_event <",
" event_type: 512", " event_type: 512",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 200", " time_ms: 200",
" transport: 0",
" dhcp_event <", " dhcp_event <",
" duration_ms: 192", " duration_ms: 192",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -175,8 +175,8 @@ public class IpConnectivityMetricsTest extends TestCase {
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 300", " time_ms: 300",
" transport: 0",
" default_network_event <", " default_network_event <",
" network_id <", " network_id <",
" network_id: 102", " network_id: 102",
@@ -191,8 +191,8 @@ public class IpConnectivityMetricsTest extends TestCase {
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 400", " time_ms: 400",
" transport: 0",
" ip_provisioning_event <", " ip_provisioning_event <",
" event_type: 1", " event_type: 1",
" if_name: \"wlan0\"", " if_name: \"wlan0\"",
@@ -200,8 +200,8 @@ public class IpConnectivityMetricsTest extends TestCase {
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 500", " time_ms: 500",
" transport: 0",
" validation_probe_event <", " validation_probe_event <",
" latency_ms: 40730", " latency_ms: 40730",
" network_id <", " network_id <",
@@ -212,8 +212,8 @@ public class IpConnectivityMetricsTest extends TestCase {
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 600", " time_ms: 600",
" transport: 0",
" apf_statistics <", " apf_statistics <",
" dropped_ras: 2", " dropped_ras: 2",
" duration_ms: 45000", " duration_ms: 45000",
@@ -226,8 +226,8 @@ public class IpConnectivityMetricsTest extends TestCase {
" >", " >",
">", ">",
"events <", "events <",
" link_layer: 0",
" time_ms: 700", " time_ms: 700",
" transport: 0",
" ra_event <", " ra_event <",
" dnssl_lifetime: -1", " dnssl_lifetime: -1",
" prefix_preferred_lifetime: 300", " prefix_preferred_lifetime: 300",

2
tests/net/java/com/android/server/connectivity/NetdEventListenerServiceTest.java
View File

@@ -213,8 +213,8 @@ public class NetdEventListenerServiceTest extends TestCase {
IpConnectivityEvent got = events.get(0); IpConnectivityEvent got = events.get(0);
String want = String.join("\n", String want = String.join("\n",
"link_layer: 0",
"time_ms: 0", "time_ms: 0",
"transport: 0",
"connect_statistics <", "connect_statistics <",
" connect_count: 12", " connect_count: 12",
" errnos_counters <", " errnos_counters <",