[NS01.wf] Adjust tests for the addition of NetworkScore
No functional changes so far
Bug: None
Test: FrameworksWifiTests
Change-Id: I992cf7f8fa14763a701f4140a1e519760790d5c0
Merged-In: I77c4ea0dd3d9b64bae59b0e1c3fe8e1275de20de
diff --git a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
index 8fbfd29..5c015f9 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/ClientModeImplTest.java
@@ -538,7 +538,7 @@
mIpClientCallback.onQuit();
return null;
}).when(mIpClient).shutdown();
- when(mConnectivityManager.registerNetworkAgent(any(), any(), any(), any(), anyInt(), any(),
+ when(mConnectivityManager.registerNetworkAgent(any(), any(), any(), any(), any(), any(),
anyInt())).thenReturn(mNetwork);
List<SubscriptionInfo> subList = Arrays.asList(mock(SubscriptionInfo.class));
when(mSubscriptionManager.getActiveSubscriptionInfoList()).thenReturn(subList);
@@ -2585,7 +2585,7 @@
verify(mConnectivityManager).registerNetworkAgent(naCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class),
networkCapabilitiesCaptor.capture(),
- anyInt(), configCaptor.capture(), anyInt());
+ any(), configCaptor.capture(), anyInt());
mNetworkAgentBinder = naCaptor.getValue();
configChecker.accept(configCaptor.getValue());
@@ -2711,7 +2711,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
ArrayList<Integer> thresholdsArray = new ArrayList<>();
thresholdsArray.add(RSSI_THRESHOLD_MAX);
@@ -3347,7 +3347,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
agentCaptor.getValue()
.onValidationStatusChanged(NetworkAgent.VALID_NETWORK, null /* captivePortalUrl */);
mLooper.dispatchAll();
@@ -3578,7 +3578,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
WifiConfiguration currentNetwork = new WifiConfiguration();
currentNetwork.networkId = FRAMEWORK_NETWORK_ID;
@@ -3613,7 +3613,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
WifiConfiguration currentNetwork = new WifiConfiguration();
currentNetwork.networkId = FRAMEWORK_NETWORK_ID;
@@ -3645,7 +3645,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
WifiConfiguration currentNetwork = new WifiConfiguration();
currentNetwork.networkId = FRAMEWORK_NETWORK_ID;
@@ -3679,7 +3679,7 @@
ArgumentCaptor<INetworkAgent> agentCaptor = ArgumentCaptor.forClass(INetworkAgent.class);
verify(mConnectivityManager).registerNetworkAgent(agentCaptor.capture(),
any(NetworkInfo.class), any(LinkProperties.class), any(NetworkCapabilities.class),
- anyInt(), any(NetworkAgentConfig.class), anyInt());
+ any(), any(NetworkAgentConfig.class), anyInt());
when(mWifiConfigManager.getLastSelectedNetwork()).thenReturn(FRAMEWORK_NETWORK_ID + 1);
@@ -3730,7 +3730,7 @@
ArgumentCaptor.forClass(NetworkCapabilities.class);
verify(mConnectivityManager).registerNetworkAgent(any(),
any(NetworkInfo.class), any(LinkProperties.class),
- networkCapabilitiesCaptor.capture(), anyInt(), any(NetworkAgentConfig.class),
+ networkCapabilitiesCaptor.capture(), any(), any(NetworkAgentConfig.class),
anyInt());
NetworkCapabilities networkCapabilities = networkCapabilitiesCaptor.getValue();
@@ -3768,7 +3768,7 @@
ArgumentCaptor.forClass(NetworkCapabilities.class);
verify(mConnectivityManager).registerNetworkAgent(any(),
any(NetworkInfo.class), any(LinkProperties.class),
- networkCapabilitiesCaptor.capture(), anyInt(), any(NetworkAgentConfig.class),
+ networkCapabilitiesCaptor.capture(), any(), any(NetworkAgentConfig.class),
anyInt());
NetworkCapabilities networkCapabilities = networkCapabilitiesCaptor.getValue();
diff --git a/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java b/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
index 9ab9f8e..9fdf651 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/WifiScoreReportTest.java
@@ -204,7 +204,7 @@
when(mContext.getResources()).thenReturn(mResources);
final ConnectivityManager cm = mock(ConnectivityManager.class);
when(mContext.getSystemService(Context.CONNECTIVITY_SERVICE)).thenReturn(cm);
- when(cm.registerNetworkAgent(any(), any(), any(), any(), anyInt(), any(), anyInt()))
+ when(cm.registerNetworkAgent(any(), any(), any(), any(), any(), any(), anyInt()))
.thenReturn(mNetwork);
when(mNetwork.getNetId()).thenReturn(0);
mNetworkAgent = spy(new TestNetworkAgent(mContext));
diff --git a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
index c974c4f..fc53136 100644
--- a/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
+++ b/service/tests/wifitests/src/com/android/server/wifi/aware/WifiAwareDataPathStateManagerTest.java
@@ -512,7 +512,7 @@
first = false;
}
inOrder.verify(mMockCm).registerNetworkAgent(agentCaptor.capture(), any(), any(),
- netCapCaptor.capture(), anyInt(), any(), anyInt());
+ netCapCaptor.capture(), any(), any(), anyInt());
agentBinders[i] = agentCaptor.getValue();
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.SUCCESS),
eq(false), anyLong());
@@ -635,7 +635,7 @@
inOrder.verify(mMockNetdWrapper).setInterfaceUp(anyString());
inOrder.verify(mMockNetdWrapper).enableIpv6(anyString());
inOrder.verify(mMockCm).registerNetworkAgent(agentCaptor.capture(), any(), any(),
- netCapCaptor.capture(), anyInt(), any(), anyInt());
+ netCapCaptor.capture(), any(), any(), anyInt());
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.SUCCESS),
eq(true), anyLong());
inOrderM.verify(mAwareMetricsMock).recordNdpCreation(anyInt(), any(), any());
@@ -751,7 +751,7 @@
inOrder.verify(mMockNetdWrapper).setInterfaceUp(anyString());
inOrder.verify(mMockNetdWrapper).enableIpv6(anyString());
inOrder.verify(mMockCm).registerNetworkAgent(any(), any(), any(),
- netCapCaptor.capture(), anyInt(), any(), anyInt());
+ netCapCaptor.capture(), any(), any(), anyInt());
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.SUCCESS),
eq(true), anyLong());
inOrderM.verify(mAwareMetricsMock).recordNdpCreation(anyInt(), any(), any());
@@ -1443,7 +1443,7 @@
mDut.onEndDataPathResponse(transactionId.getValue(), true, 0);
} else {
inOrder.verify(mMockCm).registerNetworkAgent(agentCaptor.capture(), any(),
- any(), netCapCaptor.capture(), anyInt(), any(), anyInt());
+ any(), netCapCaptor.capture(), any(), any(), anyInt());
inOrder.verify(mMockNetworkInterface).setConnected(any());
inOrderM.verify(mAwareMetricsMock).recordNdpStatus(eq(NanStatusType.SUCCESS),
eq(useDirect), anyLong());
