From e4a9287bfee4cf4dc15d5b9dc8a6b0a782a5b9ed Mon Sep 17 00:00:00 2001 From: Dominic Lemire Date: Wed, 15 Apr 2020 19:20:48 -0700 Subject: [PATCH] Fix error message in RestrictBackgroundNetworkTest Fixed the error message when the expected number of broadcasts is exceeded. Bug: 147139427 Test: atest hostsidetests/net/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java Change-Id: I7e69dca81abdb29a9eb7d110266edbe483e17a01 Merged-In: I7e69dca81abdb29a9eb7d110266edbe483e17a01 --- .../hostside/AbstractRestrictBackgroundNetworkTestCase.java | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 29ba68c4cf..1db0417fc9 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -30,6 +30,7 @@ import static com.android.cts.net.hostside.NetworkPolicyTestUtils.isDozeModeSupp import static com.android.cts.net.hostside.NetworkPolicyTestUtils.restrictBackgroundValueToString; import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; @@ -177,7 +178,9 @@ public abstract class AbstractRestrictBackgroundNetworkTestCase { do { attempts++; count = getNumberBroadcastsReceived(receiverName, ACTION_RESTRICT_BACKGROUND_CHANGED); - if (count >= expectedCount) { + assertFalse("Expected count " + expectedCount + " but actual is " + count, + count > expectedCount); + if (count == expectedCount) { break; } Log.d(TAG, "Expecting count " + expectedCount + " but actual is " + count + " after "