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

Merge "Fix inexact argument type warning"

Browse Source
This commit is contained in:
Chiachang Wang
2023-04-17 01:48:31 +00:00
committed by Gerrit Code Review
parent 885854c9ee 25c74bd250
commit baefd61455
1 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
tests/unit/java/com/android/server/connectivity/VpnTest.java
View File

@@ -1293,12 +1293,12 @@ public class VpnTest extends VpnTestBase {
}
private void verifyVpnManagerEvent(String sessionKey, String category, int errorClass,
int errorCode, String[] packageName, VpnProfileState... profileState) {
int errorCode, String[] packageName, @NonNull VpnProfileState... profileState) {
final Context userContext =
mContext.createContextAsUser(UserHandle.of(PRIMARY_USER.id), 0 /* flags */);
final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
final int verifyTimes = (profileState == null) ? 1 : profileState.length;
final int verifyTimes = profileState.length;
verify(userContext, times(verifyTimes)).startService(intentArgumentCaptor.capture());
for (int i = 0; i < verifyTimes; i++) {
@@ -1329,10 +1329,8 @@ public class VpnTest extends VpnTestBase {
VpnManager.EXTRA_UNDERLYING_LINK_PROPERTIES));
}
if (profileState != null) {
assertEquals(profileState[i], intent.getParcelableExtra(
VpnManager.EXTRA_VPN_PROFILE_STATE, VpnProfileState.class));
}
assertEquals(profileState[i], intent.getParcelableExtra(
VpnManager.EXTRA_VPN_PROFILE_STATE, VpnProfileState.class));
}
reset(userContext);
}
@@ -1341,7 +1339,11 @@ public class VpnTest extends VpnTestBase {
// CATEGORY_EVENT_DEACTIVATED_BY_USER is not an error event, so both of errorClass and
// errorCode won't be set.
verifyVpnManagerEvent(sessionKey, VpnManager.CATEGORY_EVENT_DEACTIVATED_BY_USER,
-1 /* errorClass */, -1 /* errorCode */, packageName, null /* profileState */);
-1 /* errorClass */, -1 /* errorCode */, packageName,
// VPN NetworkAgnet does not switch to CONNECTED in the test, and the state is not
// important here. Verify that the state as it is, i.e. CONNECTING state.
new VpnProfileState(VpnProfileState.STATE_CONNECTING,
sessionKey, false /* alwaysOn */, false /* lockdown */));
}
private void verifyAlwaysOnStateChanged(String[] packageName, VpnProfileState... profileState) {
@@ -1586,7 +1588,10 @@ public class VpnTest extends VpnTestBase {
verifyPowerSaveTempWhitelistApp(TEST_VPN_PKG);
reset(mDeviceIdleInternal);
verifyVpnManagerEvent(sessionKey, category, errorType, errorCode,
new String[] {TEST_VPN_PKG}, null /* profileState */);
// VPN NetworkAgnet does not switch to CONNECTED in the test, and the state is not
// important here. Verify that the state as it is, i.e. CONNECTING state.
new String[] {TEST_VPN_PKG}, new VpnProfileState(VpnProfileState.STATE_CONNECTING,
sessionKey, false /* alwaysOn */, false /* lockdown */));
if (errorType == VpnManager.ERROR_CLASS_NOT_RECOVERABLE) {
verify(mConnectivityManager, timeout(TEST_TIMEOUT_MS))
.unregisterNetworkCallback(eq(cb));