diff options
| author | Lorenzo Colitti <lorenzo@google.com> | 2021-03-17 09:14:59 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-03-17 09:14:59 +0000 |
| commit | 04daf7b175d5cdb6580b169f4d7ec4e422fb3ac3 (patch) | |
| tree | a4c27113f1b72d395fbd78b58700a4952e1da9d0 | |
| parent | 6056ae9588f86f372f212dddf8401af2e9abff9d (diff) | |
| parent | be317557fe11d9a27412712556c9203778fab645 (diff) | |
| download | base-04daf7b175d5cdb6580b169f4d7ec4e422fb3ac3.tar.gz | |
Backport some helpers in ConnectivityServiceTest. am: be317557fe
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425318
Change-Id: I7ffa0faf61ccc7238b65e0f9ed863939e5089f06
| -rw-r--r-- | tests/net/java/com/android/server/ConnectivityServiceTest.java | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/tests/net/java/com/android/server/ConnectivityServiceTest.java b/tests/net/java/com/android/server/ConnectivityServiceTest.java index ffd6b28e8b0d..d8e1f0a434f1 100644 --- a/tests/net/java/com/android/server/ConnectivityServiceTest.java +++ b/tests/net/java/com/android/server/ConnectivityServiceTest.java @@ -36,6 +36,7 @@ import static android.net.ConnectivityManager.TYPE_MOBILE; import static android.net.ConnectivityManager.TYPE_MOBILE_FOTA; import static android.net.ConnectivityManager.TYPE_MOBILE_MMS; import static android.net.ConnectivityManager.TYPE_MOBILE_SUPL; +import static android.net.ConnectivityManager.TYPE_VPN; import static android.net.ConnectivityManager.TYPE_WIFI; import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_DNS; import static android.net.INetworkMonitor.NETWORK_VALIDATION_PROBE_FALLBACK; @@ -6289,6 +6290,19 @@ public class ConnectivityServiceTest { mCm.unregisterNetworkCallback(defaultCallback); } + private void checkNetworkInfo(NetworkInfo ni, int type, DetailedState state) { + assertNotNull(ni); + assertEquals(type, ni.getType()); + assertEquals(ConnectivityManager.getNetworkTypeName(type), state, ni.getDetailedState()); + } + + private void assertActiveNetworkInfo(int type, DetailedState state) { + checkNetworkInfo(mCm.getActiveNetworkInfo(), type, state); + } + private void assertNetworkInfo(int type, DetailedState state) { + checkNetworkInfo(mCm.getNetworkInfo(type), type, state); + } + @Test public final void testLoseTrusted() throws Exception { final NetworkRequest trustedRequest = new NetworkRequest.Builder() |