Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6aa40f6e authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Revert "Ignore some failed tests."" into rvc-dev

parents bff23479 ef4550c5
Loading
Loading
Loading
Loading
+4 −10
Original line number Diff line number Diff line
@@ -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;
+0 −2
Original line number Diff line number Diff line
@@ -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";
+0 −2
Original line number Diff line number Diff line
@@ -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
+0 −2
Original line number Diff line number Diff line
@@ -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;