diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2022-03-19 04:03:13 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-03-19 04:03:13 +0000 |
commit | be4b7d616c507557946baa6b0ceda20272c6c9a0 (patch) | |
tree | b5751d9ba577548393cfeef704efb05b0959f089 | |
parent | 6ce84fe2b5b4f93d417cab3b7e87c27cc69755d9 (diff) | |
parent | 3be73388e7960314981ae5bfe6b7f3e2ffc2e06c (diff) | |
download | ethernet-be4b7d616c507557946baa6b0ceda20272c6c9a0.tar.gz |
Merge "Cleaning EthernetNetworkFactoryTest Unprovisioned" am: d9c8ae8d14 am: 3be73388e7
Original change: https://android-review.googlesource.com/c/platform/frameworks/opt/net/ethernet/+/2017355
Change-Id: Ieb945164c7d245195ea653b3bb4b6f16f92da9cb
-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 726833f..e256add 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); |