diff options
| author | Daniel Norman <danielnorman@google.com> | 2021-06-18 15:33:36 -0700 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-06-21 23:21:54 +0000 |
| commit | b6d6690a3594cd78966e26508247d4ab1b66776f (patch) | |
| tree | 43afd0520ff98b8729b5c8f73ef2ee1c7e77041a /tests/vcn/java/com/android/server/VcnManagementServiceTest.java | |
| parent | 71c831703ae59baf47e0afe611fecd714c481cdf (diff) | |
| parent | 233ce9ef453bc7b47f7ac5d0eb1d5fda0ce845ab (diff) | |
Merge SP1A.210616.001
Change-Id: I9acdc955f698dbebb8fad19cfd5cb71fcdd27b45
Diffstat (limited to 'tests/vcn/java/com/android/server/VcnManagementServiceTest.java')
| -rw-r--r-- | tests/vcn/java/com/android/server/VcnManagementServiceTest.java | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java index 3360d40062a3..b7a6d0ff7607 100644 --- a/tests/vcn/java/com/android/server/VcnManagementServiceTest.java +++ b/tests/vcn/java/com/android/server/VcnManagementServiceTest.java @@ -57,6 +57,7 @@ import android.app.AppOpsManager; import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; +import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.LinkProperties; import android.net.Network; @@ -707,10 +708,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testAddVcnUnderlyingNetworkPolicyListenerInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.addVcnUnderlyingNetworkPolicyListener(mMockPolicyListener); } @@ -724,10 +724,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testRemoveVcnUnderlyingNetworkPolicyListenerInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.removeVcnUnderlyingNetworkPolicyListener(mMockPolicyListener); } @@ -919,10 +918,9 @@ public class VcnManagementServiceTest { @Test(expected = SecurityException.class) public void testGetUnderlyingNetworkPolicyInvalidPermission() { - doThrow(new SecurityException()) + doReturn(PackageManager.PERMISSION_DENIED) .when(mMockContext) - .enforceCallingOrSelfPermission( - eq(android.Manifest.permission.NETWORK_FACTORY), any()); + .checkCallingOrSelfPermission(any()); mVcnMgmtSvc.getUnderlyingNetworkPolicy(new NetworkCapabilities(), new LinkProperties()); } |