diff options
| author | Chalard Jean <jchalard@google.com> | 2023-01-13 20:32:54 +0900 |
|---|---|---|
| committer | Chalard Jean <jchalard@google.com> | 2023-02-06 13:49:52 +0900 |
| commit | 47283cc626d4abf5c0dfebdb0b1e095d9454cb8c (patch) | |
| tree | 253ec687184b19aa4d840bac2e6cdefc1d9a0ccc /common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt | |
| parent | fbdb955dbd8891cbd7e919d36e1bf97a80afe8c0 (diff) | |
| download | net-47283cc626d4abf5c0dfebdb0b1e095d9454cb8c.tar.gz | |
Remove expectCapabilitiesWith and without
This is not clearer than using the base method.
Test: ConnectivityServiceTest NetworkStaticLibTests
Bug: 157405399
Change-Id: Iac9aeffb563d0a1cb6c1287b46b9bbfffc0c75ca
Diffstat (limited to 'common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt')
| -rw-r--r-- | common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt index 5acdb347..d36f52a3 100644 --- a/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt +++ b/common/tests/unit/src/com/android/testutils/TestableNetworkCallbackTest.kt @@ -140,20 +140,28 @@ class TestableNetworkCallbackTest { val meteredNc = NetworkCapabilities() val unmeteredNc = NetworkCapabilities().addCapability(NOT_METERED) // Check that expecting caps (with or without) fails when no callback has been received. - assertFails { mCallback.expectCapabilitiesWith(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } - assertFails { mCallback.expectCapabilitiesWithout(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } + assertFails { + mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { it.hasCapability(NOT_METERED) } + } + assertFails { + mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { !it.hasCapability(NOT_METERED) } + } // Add NOT_METERED and check that With succeeds and Without fails. mCallback.onCapabilitiesChanged(net, unmeteredNc) - mCallback.expectCapabilitiesWith(NOT_METERED, matcher) + mCallback.expectCaps(matcher) { it.hasCapability(NOT_METERED) } mCallback.onCapabilitiesChanged(net, unmeteredNc) - assertFails { mCallback.expectCapabilitiesWithout(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } + assertFails { + mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { !it.hasCapability(NOT_METERED) } + } // Don't add NOT_METERED and check that With fails and Without succeeds. mCallback.onCapabilitiesChanged(net, meteredNc) - assertFails { mCallback.expectCapabilitiesWith(NOT_METERED, matcher, SHORT_TIMEOUT_MS) } + assertFails { + mCallback.expectCaps(matcher, SHORT_TIMEOUT_MS) { it.hasCapability(NOT_METERED) } + } mCallback.onCapabilitiesChanged(net, meteredNc) - mCallback.expectCapabilitiesWithout(NOT_METERED, matcher) + mCallback.expectCaps(matcher) { !it.hasCapability(NOT_METERED) } } @Test |