Make tests compatible with mockito-extended
This does not change the mockito library to use mockito-extended in FrameworksNetTests, but changes the tests so that they would pass if built against that library. This is useful to run FrameworksNetTests in a common test suite with other tests that use mockito-extended, for example a common connectivity coverage test target. The change includes increasing the test timeout in ConnectivityServiceTest, as mockito-extended can have performance impact (~3 times on hwasan builds). This change does not make tests run slower in the current FrameworksNetTests suite though. Bug: 187935317 Test: atest FrameworksNetTests Original-Change: https://android-review.googlesource.com/1737400 Merged-In: I61fa371e8957037075a2617a014647ff062207c6 Change-Id: I61fa371e8957037075a2617a014647ff062207c6
Showing
- tests/unit/java/android/net/ConnectivityManagerTest.java 5 additions, 2 deletionstests/unit/java/android/net/ConnectivityManagerTest.java
- tests/unit/java/android/net/nsd/NsdManagerTest.java 2 additions, 2 deletionstests/unit/java/android/net/nsd/NsdManagerTest.java
- tests/unit/java/android/net/util/MultinetworkPolicyTrackerTest.kt 5 additions, 0 deletions...it/java/android/net/util/MultinetworkPolicyTrackerTest.kt
- tests/unit/java/com/android/server/ConnectivityServiceTest.java 1 addition, 1 deletion...unit/java/com/android/server/ConnectivityServiceTest.java
- tests/unit/java/com/android/server/connectivity/MultipathPolicyTrackerTest.java 7 additions, 2 deletions...droid/server/connectivity/MultipathPolicyTrackerTest.java
- tests/unit/java/com/android/server/connectivity/PermissionMonitorTest.java 5 additions, 0 deletions...om/android/server/connectivity/PermissionMonitorTest.java
- tests/unit/java/com/android/server/connectivity/VpnTest.java 16 additions, 13 deletionstests/unit/java/com/android/server/connectivity/VpnTest.java
Loading
Please register or sign in to comment