LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Fix a flake with mocking."

Browse Source
This commit is contained in:
Treehugger Robot
2021-07-19 12:16:18 +00:00
committed by Gerrit Code Review
parent 800eff01d0 6519c179bd
commit 527f040944
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/unit/java/com/android/server/ConnectivityServiceTest.java
View File

@@ -1529,7 +1529,7 @@ public class ConnectivityServiceTest {
} }
private <T> T doAsUid(final int uid, @NonNull final Supplier<T> what) { private <T> T doAsUid(final int uid, @NonNull final Supplier<T> what) {
when(mDeps.getCallingUid()).thenReturn(uid); doReturn(uid).when(mDeps).getCallingUid();
try { try {
return what.get(); return what.get();
} finally { } finally {
@@ -9860,9 +9860,9 @@ public class ConnectivityServiceTest {
assertVpnUidRangesUpdated(true, vpnRange, vpnOwnerUid); assertVpnUidRangesUpdated(true, vpnRange, vpnOwnerUid);
final UnderlyingNetworkInfo underlyingNetworkInfo = final UnderlyingNetworkInfo underlyingNetworkInfo =
new UnderlyingNetworkInfo(vpnOwnerUid, VPN_IFNAME, new ArrayList<String>()); new UnderlyingNetworkInfo(vpnOwnerUid, VPN_IFNAME, new ArrayList<>());
mMockVpn.setUnderlyingNetworkInfo(underlyingNetworkInfo); mMockVpn.setUnderlyingNetworkInfo(underlyingNetworkInfo);
when(mDeps.getConnectionOwnerUid(anyInt(), any(), any())).thenReturn(42); doReturn(42).when(mDeps).getConnectionOwnerUid(anyInt(), any(), any());
} }
private void setupConnectionOwnerUidAsVpnApp(int vpnOwnerUid, @VpnManager.VpnType int vpnType) private void setupConnectionOwnerUidAsVpnApp(int vpnOwnerUid, @VpnManager.VpnType int vpnType)