diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-19 04:15:35 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-19 04:15:35 +0000 |
commit | 64b87d2d58aafd3c206a3ff3b147670e93a324a9 (patch) | |
tree | 6031357794578b5a6bbb16d8ed5197e9f73dfd9a | |
parent | 613c01dacc967f3a65c33880d0fa70e0c334cea5 (diff) | |
parent | be4b7d616c507557946baa6b0ceda20272c6c9a0 (diff) | |
download | ethernet-64b87d2d58aafd3c206a3ff3b147670e93a324a9.tar.gz |
Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14 am: 3be73388e7 am: be4b7d616c
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355
Change-Id: Ie463a2b48e0b59386ca24535fc0b1396ab2a82e3
-rw-r--r-- | tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java | 16 |
1 files changed, 5 insertions, 11 deletions
diff --git a/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java b/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java index 5d23aaf..2d5bd1d 100644 --- a/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java +++ b/tests/java/com/android/server/ethernet/EthernetNetworkFactoryTest.java @@ -279,19 +279,13 @@ public class EthernetNetworkFactoryTest { // creates an unprovisioned interface private void createUnprovisionedInterface(String iface) throws Exception { - // the only way to create an unprovisioned interface is by calling needNetworkFor - // followed by releaseNetworkFor which will stop the NetworkAgent and IpClient. When - // EthernetNetworkFactory#updateInterfaceLinkState(iface, true) is called, the interface - // is automatically provisioned even if nobody has ever called needNetworkFor + // To create an unprovisioned interface, provision and then "stop" it, i.e. stop its + // NetworkAgent and IpClient. One way this can be done is by provisioning an interface and + // then calling onNetworkUnwanted. createAndVerifyProvisionedInterface(iface); - // Interface is already provisioned, so startProvisioning / register should not be called - // again - mNetFactory.needNetworkFor(createDefaultRequest()); - verify(mIpClient, never()).startProvisioning(any()); - verify(mNetworkAgent, never()).register(); - - mNetFactory.releaseNetworkFor(createDefaultRequest()); + mNetworkAgent.getCallbacks().onNetworkUnwanted(); + mLooper.dispatchAll(); verifyStop(); clearInvocations(mIpClient); |