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

Merge "Failed ROBO tests" into rvc-dev am: b211395b3f am: 6562d589b2 am: 9dcaa281f9

Browse Source 
Change-Id: Ie11392abcae99ee72fa9d72a73c487b047ebbc60
This commit is contained in:
TreeHugger Robot
2020-04-23 06:31:28 +00:00
committed by Automerger Merge Worker
parent 342f4168c0 9dcaa281f9
commit e42b125400
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java
View File

@@ -16,16 +16,20 @@ package com.android.settings.display;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.when;
import android.content.Context; import android.content.Context;
import android.hardware.display.ColorDisplayManager; import android.hardware.display.ColorDisplayManager;
import android.location.LocationManager;
import com.android.settings.testutils.shadow.SettingsShadowResources; import com.android.settings.testutils.shadow.SettingsShadowResources;
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.Mockito;
import org.robolectric.RobolectricTestRunner; import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment; import org.robolectric.RuntimeEnvironment;
import org.robolectric.annotation.Config; import org.robolectric.annotation.Config;
@@ -36,10 +40,14 @@ public class NightDisplayAutoModePreferenceControllerTest {
private Context mContext; private Context mContext;
private NightDisplayAutoModePreferenceController mController; private NightDisplayAutoModePreferenceController mController;
private LocationManager mLocationManager;
@Before @Before
public void setUp() { public void setUp() {
mContext = RuntimeEnvironment.application; mContext = Mockito.spy(RuntimeEnvironment.application);
mLocationManager = Mockito.mock(LocationManager.class);
when(mLocationManager.isLocationEnabled()).thenReturn(true);
when(mContext.getSystemService(eq(LocationManager.class))).thenReturn(mLocationManager);
mController = new NightDisplayAutoModePreferenceController(mContext, mController = new NightDisplayAutoModePreferenceController(mContext,
"night_display_auto_mode"); "night_display_auto_mode");
} }
@@ -64,7 +72,6 @@ public class NightDisplayAutoModePreferenceControllerTest {
} }
@Test @Test
@Ignore
public void onPreferenceChange_changesAutoMode() { public void onPreferenceChange_changesAutoMode() {
mController.onPreferenceChange(null, mController.onPreferenceChange(null,
String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT)); String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT));

11
tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
View File

@@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
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;
@@ -102,16 +101,6 @@ public class DarkModeScheduleSelectorControllerTest {
verify(mPreference).setValueIndex(0); verify(mPreference).setValueIndex(0);
} }
@Test
@Ignore
public void nightMode_selectNightMode_locationOff() {
when(mLocationManager.isLocationEnabled()).thenReturn(false);
mController.onPreferenceChange(mPreference,
mContext.getString(R.string.dark_ui_auto_mode_never));
assertFalse(mController.onPreferenceChange(mPreference,
mContext.getString(R.string.dark_ui_auto_mode_auto)));
}
@Test @Test
public void nightMode_updateStateNone_dropDownValueChangedToAuto() { public void nightMode_updateStateNone_dropDownValueChangedToAuto() {
when(mUiService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_AUTO); when(mUiService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_AUTO);