From a865790a5b30a2d5e29e3d443e7b02a5d8aa01a4 Mon Sep 17 00:00:00 2001 From: Hugo Benichi Date: Tue, 20 Dec 2016 09:57:43 +0900 Subject: [PATCH] DO NOT MERGE Stricter NetworkNotificationManagerTest This patch changes NetworkNotificationManagerTest to populate extraInfo of NetworkInfo in order to catch regressions in malformed format Strings of log statements in NetworkNotificationManager. Test: verified that the test fails when reintroducing the format String bug. Bug: 33737715 Change-Id: If14063554b8246d9d80cd222cb41c30dee121c5a --- .../android/server/connectivity/NetworkNotificationManager.java | 2 +- .../server/connectivity/NetworkNotificationManagerTest.java | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) rename {tests/net/java => services/tests/servicestests/src}/com/android/server/connectivity/NetworkNotificationManagerTest.java (98%) diff --git a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java index 9166bb3d87f7..497a6b7234be 100644 --- a/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java +++ b/services/core/java/com/android/server/connectivity/NetworkNotificationManager.java @@ -182,7 +182,7 @@ tag, nameOf(eventId), getTransportName(transportType), extraInfo, details = r.getString(R.string.network_switch_metered_detail, toTransport, fromTransport); } else { - Slog.wtf(TAG, "Unknown notification type " + notifyType + "on network transport " + Slog.wtf(TAG, "Unknown notification type " + notifyType + " on network transport " + getTransportName(transportType)); return; } diff --git a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java b/services/tests/servicestests/src/com/android/server/connectivity/NetworkNotificationManagerTest.java similarity index 98% rename from tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java rename to services/tests/servicestests/src/com/android/server/connectivity/NetworkNotificationManagerTest.java index 98073ce1e59b..21c2de79d68b 100644 --- a/tests/net/java/com/android/server/connectivity/NetworkNotificationManagerTest.java +++ b/services/tests/servicestests/src/com/android/server/connectivity/NetworkNotificationManagerTest.java @@ -80,6 +80,7 @@ public void setUp() { when(mCtx.getResources()).thenReturn(mResources); when(mCtx.getPackageManager()).thenReturn(mPm); when(mCtx.getApplicationInfo()).thenReturn(new ApplicationInfo()); + when(mNetworkInfo.getExtraInfo()).thenReturn("extra"); when(mResources.getColor(anyInt(), any())).thenReturn(0xFF607D8B); mManager = new NetworkNotificationManager(mCtx, mTelephonyManager, mNotificationManager);