diff options
author | 2017-08-16 13:14:13 +0100 | |
---|---|---|
committer | 2017-08-16 13:14:13 +0100 | |
commit | 3da6a1fc82b7e0c7adc88b92e50cceec8173672e (patch) | |
tree | cde147c24a1fbeccf16fcde42ac4f8ae69a53aaf | |
parent | 0dd82c49f1ea174d2638317cc45510741eaed8d7 (diff) |
Unbreak VPN unit tests.
VpnTest was broken earlier due to a change to always-on VPN
notifications. This CL adds the corresponding mocks to the unit test to
fix it.
Bug: 36650087
Test: runtest frameworks-net
Change-Id: Icff57c7e927c135d75a7d70ff347a579c5d45134
-rw-r--r-- | tests/net/java/com/android/server/connectivity/VpnTest.java | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/connectivity/VpnTest.java b/tests/net/java/com/android/server/connectivity/VpnTest.java index f0b3724955aa..d0370665e646 100644 --- a/tests/net/java/com/android/server/connectivity/VpnTest.java +++ b/tests/net/java/com/android/server/connectivity/VpnTest.java @@ -32,6 +32,7 @@ import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; import android.content.pm.UserInfo; +import android.content.res.Resources; import android.net.NetworkInfo.DetailedState; import android.net.UidRange; import android.net.VpnService; @@ -46,6 +47,7 @@ import android.test.suitebuilder.annotation.SmallTest; import android.util.ArrayMap; import android.util.ArraySet; +import com.android.internal.R; import com.android.internal.net.VpnConfig; import org.mockito.Answers; @@ -116,6 +118,9 @@ public class VpnTest extends AndroidTestCase { when(mContext.getSystemService(eq(Context.APP_OPS_SERVICE))).thenReturn(mAppOps); when(mContext.getSystemService(eq(Context.NOTIFICATION_SERVICE))) .thenReturn(mNotificationManager); + when(mContext.getString(R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)) + .thenReturn(Resources.getSystem().getString( + R.string.config_customVpnAlwaysOnDisconnectedDialogComponent)); // Used by {@link Notification.Builder} ApplicationInfo applicationInfo = new ApplicationInfo(); |