commit 2606d9c86266ca237f6c54b44de8d4aed29e67fa
author Lorenzo Colitti <lorenzo@google.com> Tue Feb 22 01:59:20 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Feb 22 01:59:20 2022 +0000
tree 648c80aa567b30a00a30e46dee47573a763079f2
parent c6cf669b8df432164a1e199b48fba51f7bd6d1a0
parent 19e61719261bd837504488d185f7b298593da490

Merge "Mock resources used directly by LockdownVpnTracker."

tests/unit/java/com/android/server/ConnectivityServiceTest.java

diff --git a/tests/unit/java/com/android/server/ConnectivityServiceTest.java b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
index 16b3d5a..852043d 100644
--- a/tests/unit/java/com/android/server/ConnectivityServiceTest.java
+++ b/tests/unit/java/com/android/server/ConnectivityServiceTest.java
@@ -573,6 +573,12 @@
         // is "<permission name>,<pid>,<uid>". PID+UID permissons have priority over generic ones.
         private final HashMap<String, Integer> mMockedPermissions = new HashMap<>();
 
+        private void mockStringResource(int resId) {
+            doAnswer((inv) -> {
+                return "Mock string resource ID=" + inv.getArgument(0);
+            }).when(mInternalResources).getString(resId);
+        }
+
         MockContext(Context base, ContentProvider settingsProvider) {
             super(base);
 
@@ -585,6 +591,16 @@
             }).when(mInternalResources)
                     .getStringArray(com.android.internal.R.array.networkAttributes);
 
+            final int[] stringResourcesToMock = new int[] {
+                    com.android.internal.R.string.vpn_lockdown_config,
+                    com.android.internal.R.string.vpn_lockdown_connected,
+                    com.android.internal.R.string.vpn_lockdown_connecting,
+                    com.android.internal.R.string.vpn_lockdown_error,
+            };
+            for (int resId : stringResourcesToMock) {
+                mockStringResource(resId);
+            }
+
             mContentResolver = new MockContentResolver();
             mContentResolver.addProvider(Settings.AUTHORITY, settingsProvider);
         }