Merge changes I81bf8969,I2edba513,Ibb913979 am: c06260b5b5
Original change: https://android-review.googlesource.com/c/platform/packages/modules/Connectivity/+/1744648 Change-Id: I101d828b6cafc7656913a7946062099034ed63db
This commit is contained in:
@@ -192,6 +192,25 @@ class NetworkScoreTest {
|
|||||||
cb.expectAvailableCallbacksValidated(agentEth)
|
cb.expectAvailableCallbacksValidated(agentEth)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTransportPrimary() {
|
||||||
|
val cb = makeTestNetworkCallback()
|
||||||
|
val agent1 = createTestNetworkAgent()
|
||||||
|
cb.expectAvailableThenValidatedCallbacks(agent1)
|
||||||
|
val agent2 = createTestNetworkAgent()
|
||||||
|
// Because the existing network must win, the callback stays on agent1.
|
||||||
|
cb.assertNoCallback(NO_CALLBACK_TIMEOUT)
|
||||||
|
agent2.sendNetworkScore(score(primary = true))
|
||||||
|
// Now that agent2 is primary, the callback is satisfied by agent2.
|
||||||
|
cb.expectAvailableCallbacks(agent2.network)
|
||||||
|
agent1.sendNetworkScore(score(primary = true))
|
||||||
|
// Agent1 is primary too, but agent2 is the current satisfier
|
||||||
|
cb.assertNoCallback(NO_CALLBACK_TIMEOUT)
|
||||||
|
agent2.sendNetworkScore(score(primary = false))
|
||||||
|
// Now agent1 is primary and agent2 isn't
|
||||||
|
cb.expectAvailableCallbacks(agent1.network)
|
||||||
|
}
|
||||||
|
|
||||||
// TODO (b/187929636) : add a test making sure that validated networks win over unvalidated
|
// TODO (b/187929636) : add a test making sure that validated networks win over unvalidated
|
||||||
// ones. Right now this is not possible because this CTS can't directly manipulate the
|
// ones. Right now this is not possible because this CTS can't directly manipulate the
|
||||||
// validation state of a network.
|
// validation state of a network.
|
||||||
|
|||||||
Reference in New Issue
Block a user