PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Ignore some failed tests."

Browse Source 
This reverts commit db4fd2b1c3.

Reason for revert: Test failures are fixed.

Fixes: 150914017
Change-Id: I561816d51427f1141aae42128659b42cc25221dd
This commit is contained in:
Yi-Ling Chuang
2020-03-10 06:19:44 +00:00
parent db4fd2b1c3
commit ef4550c504
4 changed files with 4 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
tests/robotests/src/com/android/settings/display/DarkUIPreferenceControllerTest.java
View File

@@ -16,19 +16,10 @@
package com.android.settings.display; 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 android.content.Context;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import com.android.settings.display.darkmode.DarkModePreference; import com.android.settings.display.darkmode.DarkModePreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -36,8 +27,11 @@ import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; 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) @RunWith(RobolectricTestRunner.class)
@Ignore
public class DarkUIPreferenceControllerTest { public class DarkUIPreferenceControllerTest {
private DarkUIPreferenceController mController; private DarkUIPreferenceController mController;

2
tests/robotests/src/com/android/settings/fuelgauge/BatteryHeaderPreferenceControllerTest.java
View File

@@ -50,7 +50,6 @@ import com.android.settingslib.widget.LayoutPreference;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -63,7 +62,6 @@ import org.robolectric.shadows.ShadowPowerManager;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Config(shadows = ShadowEntityHeaderController.class) @Config(shadows = ShadowEntityHeaderController.class)
@Ignore
public class BatteryHeaderPreferenceControllerTest { public class BatteryHeaderPreferenceControllerTest {
private static final String PREF_KEY = "battery_header"; private static final String PREF_KEY = "battery_header";

2
tests/robotests/src/com/android/settings/fuelgauge/batterytip/detectors/LowBatteryDetectorTest.java
View File

@@ -28,7 +28,6 @@ import com.android.settings.fuelgauge.batterytip.BatteryTipPolicy;
import com.android.settings.fuelgauge.batterytip.tips.BatteryTip; import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -42,7 +41,6 @@ import org.robolectric.util.ReflectionHelpers;
import java.util.concurrent.TimeUnit; import java.util.concurrent.TimeUnit;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Ignore
public class LowBatteryDetectorTest { public class LowBatteryDetectorTest {
@Mock @Mock

2
tests/robotests/src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionControllerTest.java
View File

@@ -29,7 +29,6 @@ import android.os.PowerManager;
import com.android.settings.fuelgauge.BatterySaverReceiver; import com.android.settings.fuelgauge.BatterySaverReceiver;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
import org.mockito.Mock; import org.mockito.Mock;
@@ -40,7 +39,6 @@ import org.robolectric.Shadows;
import org.robolectric.shadows.ShadowPowerManager; import org.robolectric.shadows.ShadowPowerManager;
@RunWith(RobolectricTestRunner.class) @RunWith(RobolectricTestRunner.class)
@Ignore
public class BatterySaverConditionControllerTest { public class BatterySaverConditionControllerTest {
@Mock @Mock
private ConditionManager mConditionManager; private ConditionManager mConditionManager;