From 777418e178f5e780a0f76ebce8fcb1b426b42e2e Mon Sep 17 00:00:00 2001 From: mxyyiyi Date: Fri, 24 May 2024 12:46:52 +0800 Subject: [PATCH] Fix flaky test in BootBroadcastReceiverTest. Bug: 342512308 Test: atest SettingsRoboTests:com.android.settings.fuelgauge.batteryusage Change-Id: Ia4542995137ddbec0740e1da7347bf535f62f849 --- .../batteryusage/BootBroadcastReceiverTest.java | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java index 545f7733f41..704637f14c7 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batteryusage/BootBroadcastReceiverTest.java @@ -43,6 +43,7 @@ import org.robolectric.shadows.ShadowAlarmManager; import java.time.Clock; import java.util.List; +import java.util.TimeZone; import java.util.concurrent.TimeUnit; /** Tests of {@link BootBroadcastReceiver}. */ @@ -56,6 +57,7 @@ public final class BootBroadcastReceiverTest { @Before public void setUp() { + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); mContext = ApplicationProvider.getApplicationContext(); mPeriodicJobManager = PeriodicJobManager.getInstance(mContext); mShadowAlarmManager = shadowOf(mContext.getSystemService(AlarmManager.class)); @@ -136,7 +138,7 @@ public final class BootBroadcastReceiverTest { mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIME_CHANGED)); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(1000); assertThat(mDao.getAllAfter(0)).isEmpty(); assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull(); } @@ -150,7 +152,7 @@ public final class BootBroadcastReceiverTest { mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIME_CHANGED)); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(1000); assertThat(mDao.getAllAfter(0).size()).isEqualTo(1); assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull(); } @@ -168,7 +170,7 @@ public final class BootBroadcastReceiverTest { Intent.EXTRA_TIME_PREF_24_HOUR_FORMAT, Intent.EXTRA_TIME_PREF_VALUE_USE_12_HOUR)); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(1000); assertThat(mDao.getAllAfter(0).size()).isEqualTo(1); assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNull(); } @@ -182,7 +184,7 @@ public final class BootBroadcastReceiverTest { mReceiver.onReceive(mContext, new Intent(Intent.ACTION_TIMEZONE_CHANGED)); - TimeUnit.MILLISECONDS.sleep(100); + TimeUnit.MILLISECONDS.sleep(1000); assertThat(mDao.getAllAfter(0)).isEmpty(); assertThat(mShadowAlarmManager.peekNextScheduledAlarm()).isNotNull(); }