Address comments from aosp/1284557

Test: this
Bug: 139268426
Change-Id: I5d90fe2716032b7ebd2b425225fe8e96900fe63b
Merged-In: I5edbff1d7eed2f939ba26f1ebd7ead49ac67b978
(cherry picked from commit 55d7923c1d75e3d91b79461e2bd3846abdd9eed2, aosp/1284569)
This commit is contained in:
Chalard Jean
2020-04-14 03:06:14 +00:00
parent 6a96996525
commit 5217786c6c

View File

@@ -281,7 +281,8 @@ class NetworkAgentTest {
}
fun assertNoCallback() {
assertTrue(waitForIdle(DEFAULT_TIMEOUT_MS), "Handler never became idle")
assertTrue(waitForIdle(DEFAULT_TIMEOUT_MS),
"Handler didn't became idle after ${DEFAULT_TIMEOUT_MS}ms")
assertNull(history.peek())
}
}
@@ -536,6 +537,10 @@ class NetworkAgentTest {
}
agent.assertNoCallback()
}
}
@Test
fun testSetAcceptUnvalidatedPreventAutomaticReconnect() {
createNetworkAgentWithFakeCS().let { agent ->
mFakeConnectivityService.sendMessage(CMD_SAVE_ACCEPT_UNVALIDATED, 0)
mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
@@ -552,6 +557,10 @@ class NetworkAgentTest {
mFakeConnectivityService.expectMessage(AsyncChannel.CMD_CHANNEL_DISCONNECTED)
agent.expectCallback<OnNetworkUnwanted>()
}
}
@Test
fun testPreventAutomaticReconnect() {
createNetworkAgentWithFakeCS().let { agent ->
mFakeConnectivityService.sendMessage(CMD_PREVENT_AUTOMATIC_RECONNECT)
agent.expectCallback<OnAutomaticReconnectDisabled>()