From df7db9c554c344f55f8dbb8393f3a091630bfc00 Mon Sep 17 00:00:00 2001 From: Xinyi Zhou Date: Tue, 12 Dec 2023 19:52:09 +0000 Subject: [PATCH] [nearby] Fix flakeness in the unit test Test: -m Ignore-AOSP-First: nearby not in aosp yet Fix: 302599461 (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:08356f82527aad27dc9613f3e406f7732b363e42) Merged-In: Id438f453893e4e4adbd341ba36c4a0e3d3dbcb4f Change-Id: Id438f453893e4e4adbd341ba36c4a0e3d3dbcb4f --- .../server/nearby/provider/BleBroadcastProviderTest.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java b/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java index 05b556b098..c064844055 100644 --- a/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java +++ b/nearby/tests/unit/src/com/android/server/nearby/provider/BleBroadcastProviderTest.java @@ -16,6 +16,7 @@ package com.android.server.nearby.provider; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.atLeastOnce; import static org.mockito.Mockito.eq; import static org.mockito.Mockito.times; @@ -69,7 +70,7 @@ public class BleBroadcastProviderTest { AdvertiseSettings settings = new AdvertiseSettings.Builder().build(); mBleBroadcastProvider.onStartSuccess(settings); - verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_OK)); + verify(mBroadcastListener, times(any())).onStatusChanged(eq(BroadcastCallback.STATUS_OK)); } @Test @@ -81,7 +82,7 @@ public class BleBroadcastProviderTest { // advertising set can not be mocked, so we will allow nulls mBleBroadcastProvider.mAdvertisingSetCallback.onAdvertisingSetStarted(null, -30, AdvertisingSetCallback.ADVERTISE_SUCCESS); - verify(mBroadcastListener).onStatusChanged(eq(BroadcastCallback.STATUS_OK)); + verify(mBroadcastListener, times(any())).onStatusChanged(eq(BroadcastCallback.STATUS_OK)); } @Test