diff --git a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java index 0738fe0126d..9924cb4b628 100644 --- a/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java @@ -16,19 +16,10 @@ package com.android.settings.display; -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.spy; - import android.content.Context; - import androidx.fragment.app.Fragment; - import com.android.settings.display.darkmode.DarkModePreference; - import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -36,8 +27,11 @@ import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import static com.google.common.truth.Truth.assertThat; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.spy; + @RunWith(RobolectricTestRunner.class) -@Ignore public class DarkUIPreferenceControllerTest { private DarkUIPreferenceController mController; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java index cda5f962da2..63e8a80ccec 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java @@ -50,7 +50,6 @@ import com.android.settingslib.widget.LayoutPreference; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -63,7 +62,6 @@ import org.robolectric.shadows.ShadowPowerManager; @RunWith(RobolectricTestRunner.class) @Config(shadows = ShadowEntityHeaderController.class) -@Ignore public class BatteryHeaderPreferenceControllerTest { private static final String PREF_KEY = "battery_header"; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java index b9f4e06bef2..55020e2281b 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java @@ -28,7 +28,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -42,7 +41,6 @@ import org.robolectric.util.ReflectionHelpers; import java.util.concurrent.TimeUnit; @RunWith(RobolectricTestRunner.class) -@Ignore public class LowBatteryDetectorTest { @Mock diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java index 20bc1bb5f4d..e4ca6c09722 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java @@ -29,7 +29,6 @@ import android.os.PowerManager; import com.android.settings.fuelgauge.BatterySaverReceiver; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; @@ -40,7 +39,6 @@ import org.robolectric.Shadows; import org.robolectric.shadows.ShadowPowerManager; @RunWith(RobolectricTestRunner.class) -@Ignore public class BatterySaverConditionControllerTest { @Mock private ConditionManager mConditionManager;