From 796ccadc00e776de42e925552f9037dccdef747b Mon Sep 17 00:00:00 2001 From: Chalard Jean Date: Wed, 27 May 2020 13:54:53 +0900 Subject: [PATCH] Add logs to NetworkCallbackTest to diagnose issues Bug: 157391946 Test: NetworkCallbackTests Change-Id: I552a1ad05f97a2a9f83f5f7de77d2e7b64084ddc --- .../cts/net/hostside/NetworkCallbackTest.java | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java index ec884d0c4c..f3cd8a9772 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/NetworkCallbackTest.java @@ -130,14 +130,11 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa setLastCallback(CallbackState.CAPABILITIES, network, cap); } - public void expectLostCallback(Network expectedNetwork) { - expectCallback(CallbackState.LOST, expectedNetwork, null); - } - public Network expectAvailableCallbackAndGetNetwork() { final CallbackInfo cb = nextCallback(TEST_CALLBACK_TIMEOUT_MS); if (cb.state != CallbackState.AVAILABLE) { - fail("Network is not available"); + fail("Network is not available. Instead obtained the following callback :" + + cb); } return cb.network; } @@ -152,7 +149,7 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa do { final CallbackInfo cb = nextCallback((int) (deadline - System.currentTimeMillis())); if (cb.state == CallbackState.BLOCKED_STATUS) { - assertEquals(expectBlocked, (Boolean) cb.arg); + assertEquals(expectBlocked, cb.arg); return; } } while (System.currentTimeMillis() <= deadline); @@ -165,10 +162,10 @@ public class NetworkCallbackTest extends AbstractRestrictBackgroundNetworkTestCa final NetworkCapabilities cap = (NetworkCapabilities) cb.arg; assertEquals(expectedNetwork, cb.network); assertEquals(CallbackState.CAPABILITIES, cb.state); - if (hasCapability) { - assertTrue(cap.hasCapability(capability)); - } else { - assertFalse(cap.hasCapability(capability)); + if (hasCapability != cap.hasCapability(capability)) { + fail("NetworkCapabilities callback " + + (hasCapability ? "missing expected" : "has unexpected") + + " capability. " + cb); } } }