From e24c5f37d244f729723f591c12a9f4ea9e2fd542 Mon Sep 17 00:00:00 2001 From: Yiling Chuang Date: Mon, 8 Jul 2024 07:39:24 +0000 Subject: [PATCH] Fix test failures in deviceinfo Fixes: 315267179 Flag: EXEMPT bugfix Test: atest SettingsRoboTests Change-Id: I9858374fe101ee5908e16104ed7b4ca6af0308cd --- .../BatteryFirstUseDatePreferenceControllerTest.java | 6 +++--- .../BatteryManufactureDatePreferenceControllerTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java index 7c1650d215a..952af67c384 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryFirstUseDatePreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.os.BatteryManager; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -76,17 +76,17 @@ public class BatteryFirstUseDatePreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } - @Ignore("b/315267179") @Test public void getSummary_available_returnExpectedDate() { when(mFactory.batterySettingsFeatureProvider.isFirstUseDateAvailable(eq(mContext), anyLong())).thenReturn(true); mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_FIRST_USAGE_DATE, 1669680000L); + final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L); final CharSequence result = mController.getSummary(); - assertThat(result.toString()).isEqualTo("November 29, 2022"); + assertThat(result).isEqualTo(expectedDate); } @Test diff --git a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java index e50aa1c497a..6e3b1aa3092 100644 --- a/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/deviceinfo/batteryinfo/BatteryManufactureDatePreferenceControllerTest.java @@ -31,10 +31,10 @@ import android.os.BatteryManager; import androidx.test.core.app.ApplicationProvider; +import com.android.settings.fuelgauge.BatteryUtils; import com.android.settings.testutils.FakeFeatureFactory; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; @@ -77,17 +77,17 @@ public class BatteryManufactureDatePreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE); } - @Ignore("b/315267179") @Test public void getSummary_available_returnExpectedDate() { when(mFactory.batterySettingsFeatureProvider.isManufactureDateAvailable(eq(mContext), anyLong())).thenReturn(true); mShadowBatteryManager.setLongProperty(BatteryManager.BATTERY_PROPERTY_MANUFACTURING_DATE, 1669680000L); + final CharSequence expectedDate = BatteryUtils.getBatteryInfoFormattedDate(1669680000000L); final CharSequence result = mController.getSummary(); - assertThat(result.toString()).isEqualTo("November 29, 2022"); + assertThat(result).isEqualTo(expectedDate); } @Test