diff options
| author | Remi NGUYEN VAN <reminv@google.com> | 2020-05-12 11:23:05 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-12 11:23:05 +0000 |
| commit | 03e1727c0af4c53048b577774fb759a7592c75bc (patch) | |
| tree | 322fdbde1772cdca0a87409cfa5bf354e314b5ea | |
| parent | a3a81e400096c0393ef35bde20bff7fd23f77080 (diff) | |
| parent | 41650bbc32270b62110a22587fc4bc9527401219 (diff) | |
Merge "Finish mocking in finally clause" into rvc-dev am: 5c5a689847 am: 41650bbc32
Change-Id: Ib8b48034e618408b72e7150283cb2a7e027bedfe
| -rw-r--r-- | tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt b/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt index 31b4ffd..d8864e6 100644 --- a/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt +++ b/tests/unit/src/android/net/networkstack/ModuleNetworkStackClientTest.kt @@ -95,15 +95,17 @@ class ModuleNetworkStackClientTest { // Force NetworkStack.getService() to return null: this cannot be done with // setServiceForTest, as passing null just restores default behavior. val session = mockitoSession().spyStatic(NetworkStack::class.java).startMocking() - doReturn(null).`when` { NetworkStack.getService() } - ModuleNetworkStackClient.getInstance(mContext).makeIpClient(TEST_IFNAME, mIpClientCb) - - Thread.sleep(TEST_TIMEOUT_MS) - verify(mConnector, never()).makeIpClient(any(), any()) - NetworkStack.setServiceForTest(mConnectorBinder) + try { + doReturn(null).`when` { NetworkStack.getService() } + ModuleNetworkStackClient.getInstance(mContext).makeIpClient(TEST_IFNAME, mIpClientCb) - // Restore behavior of NetworkStack to return what was set in setServiceForTest - session.finishMocking() + Thread.sleep(TEST_TIMEOUT_MS) + verify(mConnector, never()).makeIpClient(any(), any()) + NetworkStack.setServiceForTest(mConnectorBinder) + } finally { + // Restore behavior of NetworkStack to return what was set in setServiceForTest + session.finishMocking() + } // Use a longer timeout as polling can cause larger delays verify(mConnector, timeout(TEST_TIMEOUT_MS * 4)).makeIpClient(TEST_IFNAME, mIpClientCb) |