From 4953ce3d1575f7f30b62b6fa63ab5eef66e25cd1 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Wed, 15 Mar 2017 15:07:42 +0900 Subject: [PATCH] Connectivity metrics: simplify ConnectivityMetricsEvent Now that ConnectivityMetricsEvent is only used for core networking metrics and is not @SystemApi anymore, remove unused fields and prepare for additional new fields. Test: updated unit tests, $ runtest frameworks-net passes Bug: 34901696 Change-Id: I15abad19981d491f16f2a3afe401f1e833079907 --- .../server/connectivity/IpConnectivityMetricsTest.java | 7 ++++--- .../com/android/server/connectivity/MetricsTestUtil.java | 5 ++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java index 1f7c5f418d..5d34c5cda3 100644 --- a/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java +++ b/tests/net/java/com/android/server/connectivity/IpConnectivityMetricsTest.java @@ -304,14 +304,15 @@ public class IpConnectivityMetricsTest extends TestCase { } static ConnectivityMetricsEvent expectedEvent(int timestamp) { - return new ConnectivityMetricsEvent((long)timestamp, 0, 0, FAKE_EV); + ConnectivityMetricsEvent ev = new ConnectivityMetricsEvent(); + ev.timestamp = timestamp; + ev.data = FAKE_EV; + return ev; } /** Outer equality for ConnectivityMetricsEvent to avoid overriding equals() and hashCode(). */ static void assertEventsEqual(ConnectivityMetricsEvent expected, ConnectivityMetricsEvent got) { assertEquals(expected.timestamp, got.timestamp); - assertEquals(expected.componentTag, got.componentTag); - assertEquals(expected.eventTag, got.eventTag); assertEquals(expected.data, got.data); } diff --git a/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java b/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java index c5965e8ea8..5064b9bd91 100644 --- a/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java +++ b/tests/net/java/com/android/server/connectivity/MetricsTestUtil.java @@ -28,7 +28,10 @@ abstract public class MetricsTestUtil { } static ConnectivityMetricsEvent ev(Parcelable p) { - return new ConnectivityMetricsEvent(1L, 0, 0, p); + ConnectivityMetricsEvent ev = new ConnectivityMetricsEvent(); + ev.timestamp = 1L; + ev.data = p; + return ev; } static ConnectivityMetricsEvent describeIpEvent(Consumer... fs) {