From b4ee096a5477eec8acdd8402b87e0279b02525f9 Mon Sep 17 00:00:00 2001
From: Jay Aliomer <aaliomer@google.com>
Date: Wed, 22 Apr 2020 23:05:40 -0400
Subject: [PATCH] Failed ROBO tests

Modified and removed test to fix errors
a test was removed because it depends on static code

Test: robo tests
Fixes: 154566007
Fixes: 154566012
Change-Id: I66e03469ba2a14f2eb82842a92f64f26eaf21b65
---
 ...ightDisplayAutoModePreferenceControllerTest.java | 13 ++++++++++---
 .../DarkModeScheduleSelectorControllerTest.java     | 11 -----------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java
index d6500dbb927..7c046f84161 100644
--- a/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/NightDisplayAutoModePreferenceControllerTest.java
@@ -16,16 +16,20 @@ package com.android.settings.display;
 
 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.hardware.display.ColorDisplayManager;
+import android.location.LocationManager;
 
 import com.android.settings.testutils.shadow.SettingsShadowResources;
 
 import org.junit.After;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.Mockito;
 import org.robolectric.RobolectricTestRunner;
 import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
@@ -36,10 +40,14 @@ public class NightDisplayAutoModePreferenceControllerTest {
 
     private Context mContext;
     private NightDisplayAutoModePreferenceController mController;
+    private LocationManager mLocationManager;
 
     @Before
     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,
             "night_display_auto_mode");
     }
@@ -64,7 +72,6 @@ public class NightDisplayAutoModePreferenceControllerTest {
     }
 
     @Test
-    @Ignore
     public void onPreferenceChange_changesAutoMode() {
         mController.onPreferenceChange(null,
                 String.valueOf(ColorDisplayManager.AUTO_MODE_TWILIGHT));
diff --git a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
index 92ecdc83315..1bbbe7d21ed 100644
--- a/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
+++ b/tests/robotests/src/com/android/settings/display/darkmode/DarkModeScheduleSelectorControllerTest.java
@@ -37,7 +37,6 @@ import androidx.preference.PreferenceScreen;
 import com.android.settings.R;
 
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
@@ -102,16 +101,6 @@ public class DarkModeScheduleSelectorControllerTest {
         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
     public void nightMode_updateStateNone_dropDownValueChangedToAuto() {
         when(mUiService.getNightMode()).thenReturn(UiModeManager.MODE_NIGHT_AUTO);