diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-03-19 17:45:27 +0900 |
|---|---|---|
| committer | Lorenzo Colitti <lorenzo@google.com> | 2021-03-21 01:54:51 +0900 |
| commit | 8b77bf790c66b2a64aa2c106502d3482d3dd3437 (patch) | |
| tree | da80dae0a37000dfa9c78a793939f324635f81c7 /tests/net/java/com/android/server/ConnectivityServiceTest.java | |
| parent | 250710c6879ea3b2fbd33ab67f81081a5d878e0c (diff) | |
Use module resources in NetworkNotificationManager.
Also make getTransportName non-static so it can access the module
resources.
Also fix a duplicate comment in a resource file.
Bug: 183097033
Test: atest FrameworksNetTests
Test: connected to Wi-Fi with no Internet, observed notification
Change-Id: Ic0d24d36af0b87153d527083f8964ddc6cd78482
Merged-In: Ic0d24d36af0b87153d527083f8964ddc6cd78482
Diffstat (limited to 'tests/net/java/com/android/server/ConnectivityServiceTest.java')
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index 3baccc41fd57..f489c9866e20 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -274,6 +274,7 @@ import androidx.test.InstrumentationRegistry; import androidx.test.filters.SmallTest; import androidx.test.runner.AndroidJUnit4; +import com.android.connectivity.resources.R; import com.android.internal.net.VpnConfig; import com.android.internal.net.VpnProfile; import com.android.internal.util.ArrayUtils; @@ -1571,6 +1572,14 @@ public class ConnectivityServiceTest { doReturn(com.android.connectivity.resources.R.array.config_networkSupportedKeepaliveCount) .when(mResources).getIdentifier(eq("config_networkSupportedKeepaliveCount"), eq("array"), any()); + doReturn(com.android.connectivity.resources.R.array.network_switch_type_name) + .when(mResources).getIdentifier(eq("network_switch_type_name"), + eq("array"), any()); + + // We don't test the actual notification value strings, so just return an empty array. + // It doesn't matter what the values are as long as it's not null. + doReturn(new String[0]).when(mResources).getStringArray(R.array.network_switch_type_name); + final ConnectivityResources connRes = mock(ConnectivityResources.class); doReturn(mResources).when(connRes).get(); doReturn(connRes).when(deps).getResources(any()); |