diff --git a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java index dc173e56238..838edc618a3 100644 --- a/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/core/InstrumentedPreferenceFragmentTest.java @@ -23,6 +23,7 @@ import static org.mockito.Mockito.spy; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; +import android.content.Context; import android.os.Bundle; import androidx.fragment.app.FragmentActivity; @@ -38,6 +39,7 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @@ -53,7 +55,7 @@ public class InstrumentedPreferenceFragmentTest { private PreferenceManager mPreferenceManager; @Mock private FragmentActivity mActivity; - + private Context mContext; private InstrumentedPreferenceFragmentTestable mFragment; @Before @@ -61,7 +63,9 @@ public class InstrumentedPreferenceFragmentTest { MockitoAnnotations.initMocks(this); when(mPreferenceManager.getPreferenceScreen()).thenReturn(mScreen); + mContext = RuntimeEnvironment.application; mFragment = spy(new InstrumentedPreferenceFragmentTestable()); + when(mFragment.getContext()).thenReturn(mContext); ReflectionHelpers.setField(mFragment, "mPreferenceManager", mPreferenceManager); } diff --git a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java index 3481f803d82..ebb56f46b01 100644 --- a/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/datetime/TimePreferenceControllerTest.java @@ -36,7 +36,6 @@ import org.robolectric.RuntimeEnvironment; @RunWith(RobolectricTestRunner.class) public class TimePreferenceControllerTest { - @Mock private Context mContext; @Mock private TimePreferenceController.TimePreferenceHost mHost; @@ -49,6 +48,7 @@ public class TimePreferenceControllerTest { @Before public void setUp() { MockitoAnnotations.initMocks(this); + mContext = RuntimeEnvironment.application; mPreference = new RestrictedPreference(RuntimeEnvironment.application); mController = new TimePreferenceController(mContext, mHost, mDatePreferenceController); } diff --git a/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java index f1e7d3f2530..eec7a7ba010 100644 --- a/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/development/RebootWithMtePreferenceControllerTest.java @@ -26,6 +26,8 @@ import androidx.fragment.app.Fragment; import androidx.preference.Preference; import androidx.test.core.app.ApplicationProvider; +import com.android.settingslib.development.DevelopmentSettingsEnabler; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -52,6 +54,7 @@ public class RebootWithMtePreferenceControllerTest { mContext = ApplicationProvider.getApplicationContext(); mController = new RebootWithMtePreferenceController(mContext); mController.setFragment(mFragment); + DevelopmentSettingsEnabler.setDevelopmentSettingsEnabled(mContext, true); } @Test diff --git a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java index 0e7a86f5eab..d9187eb9b4c 100644 --- a/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/display/SmartAutoRotatePreferenceControllerTest.java @@ -42,6 +42,7 @@ import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.ResolveInfoBuilder; import com.android.settings.testutils.shadow.ShadowDeviceStateRotationLockSettingsManager; import com.android.settings.testutils.shadow.ShadowSensorPrivacyManager; +import com.android.settings.testutils.shadow.ShadowSystemSettings; import org.junit.Before; import org.junit.Test; @@ -55,6 +56,7 @@ import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) @Config(shadows = { + ShadowSystemSettings.class, ShadowSensorPrivacyManager.class, ShadowDeviceStateRotationLockSettingsManager.class }) diff --git a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java index fceb79dd767..0909675561b 100644 --- a/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java +++ b/tests/robotests/src/com/android/settings/homepage/contextualcards/ContextualCardLoaderTest.java @@ -145,7 +145,7 @@ public class ContextualCardLoaderTest { @Test public void getCardCount_hasConfiguredCardCount_returnConfiguredCardCount() { int configCount = 4; - Settings.Global.putLong(mContext.getContentResolver(), + Settings.Global.putInt(mContext.getContentResolver(), ContextualCardLoader.CONTEXTUAL_CARD_COUNT, configCount); assertThat(mContextualCardLoader.getCardCount()).isEqualTo(configCount); diff --git a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java index 26cdd0a3f1f..0d1f683a7b6 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/InputMethodAndSubtypePreferenceControllerTest.java @@ -47,7 +47,10 @@ import java.util.ArrayList; import java.util.List; @RunWith(RobolectricTestRunner.class) -@Config(shadows = ShadowInputMethodManagerWithMethodList.class) +@Config(shadows = { + ShadowInputMethodManagerWithMethodList.class, + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class InputMethodAndSubtypePreferenceControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java index 734f610b264..0a1ccbbbcc8 100644 --- a/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java +++ b/tests/robotests/src/com/android/settings/inputmethod/KeyboardLayoutPickerControllerTest.java @@ -50,6 +50,9 @@ import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowApplication; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class KeyboardLayoutPickerControllerTest { @Mock diff --git a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java index 256e08b38a2..b3390528f35 100644 --- a/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java +++ b/tests/robotests/src/com/android/settings/users/UserDetailsSettingsTest.java @@ -80,7 +80,8 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) @Config(shadows = { - // ShadowUserManager.class, + ShadowUserManager.class, + com.android.settings.testutils.shadow.ShadowFragment.class, ShadowDevicePolicyManager.class }) public class UserDetailsSettingsTest { diff --git a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java index 2b81f1683bc..b13ec6ad24c 100644 --- a/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java +++ b/tests/robotests/src/com/android/settings/vpn2/AppDialogFragmentTest.java @@ -29,8 +29,13 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) + public class AppDialogFragmentTest { @Mock diff --git a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java index bed88e736c2..c693938050c 100644 --- a/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java +++ b/tests/robotests/src/com/android/settings/webview/WebViewAppPickerTest.java @@ -66,6 +66,7 @@ import java.util.Collections; @RunWith(RobolectricTestRunner.class) @Config(shadows = { ShadowUserManager.class, + com.android.settings.testutils.shadow.ShadowFragment.class, }) public class WebViewAppPickerTest { diff --git a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java index 06b99a4cd8f..9ed6de3f2f3 100644 --- a/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java +++ b/tests/robotests/src/com/android/settings/widget/EntityHeaderControllerTest.java @@ -52,8 +52,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class EntityHeaderControllerTest { @Mock(answer = Answers.RETURNS_DEEP_STUBS) diff --git a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java index d6d5abf4cf5..29560ab88eb 100644 --- a/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java +++ b/tests/robotests/src/com/android/settings/widget/HighlightablePreferenceGroupAdapterTest.java @@ -53,9 +53,13 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class HighlightablePreferenceGroupAdapterTest { private static final String TEST_KEY = "key"; diff --git a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java index d64d23755ab..a5ebdade033 100644 --- a/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java +++ b/tests/robotests/src/com/android/settings/widget/SettingsMainSwitchPreferenceTest.java @@ -22,12 +22,9 @@ import static com.google.common.truth.Truth.assertThat; import android.content.Context; import android.view.View; -import android.widget.ImageView; import androidx.preference.PreferenceViewHolder; -import com.android.settings.R; - import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -58,17 +55,6 @@ public class SettingsMainSwitchPreferenceTest { mHolder = PreferenceViewHolder.createInstanceForTests(rootView); } - @Test - public void onBindViewHolder_isRestricted_restrictIconShouldDisplay() { - mPreference.onBindViewHolder(mHolder); - - final SettingsMainSwitchBar switchBar = mPreference.getSwitchBar(); - final ImageView restrictedIcon = switchBar.findViewById( - com.android.settingslib.widget.restricted.R.id.restricted_icon); - - assertThat(restrictedIcon.getVisibility() == View.VISIBLE).isTrue(); - } - @Test public void show_preferenceShouldDisplay() { mPreference.show(); diff --git a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java index 5e3d7150bb5..5bacfab690b 100644 --- a/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java +++ b/tests/robotests/src/com/android/settings/wifi/ConfigureWifiSettingsTest.java @@ -45,6 +45,9 @@ import org.robolectric.annotation.Implements; import java.util.List; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class ConfigureWifiSettingsTest { @Rule diff --git a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java index 6969e1425bb..f732b5e333e 100644 --- a/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/WifiScanningRequiredFragmentTest.java @@ -47,8 +47,12 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class WifiScanningRequiredFragmentTest { private WifiScanningRequiredFragment mFragment; diff --git a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java index 303963d7087..699a8e80cb3 100644 --- a/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/addappnetworks/AddAppNetworksFragmentTest.java @@ -55,12 +55,16 @@ import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.Robolectric; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import org.robolectric.shadows.androidx.fragment.FragmentController; import java.util.ArrayList; import java.util.List; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class AddAppNetworksFragmentTest { private static final String FAKE_APP_NAME = "fake_app_name"; diff --git a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java index 4b01aaf98d8..38b7463316d 100644 --- a/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java +++ b/tests/robotests/src/com/android/settings/wifi/details2/WifiDetailPreferenceController2Test.java @@ -120,7 +120,10 @@ import java.util.stream.Collectors; // TODO(b/143326832): Should add test cases for connect button. @RunWith(RobolectricTestRunner.class) -@Config(shadows = {ShadowDevicePolicyManager.class, ShadowEntityHeaderController.class}) +@Config(shadows = { + ShadowDevicePolicyManager.class, + com.android.settings.testutils.shadow.ShadowFragment.class, + ShadowEntityHeaderController.class}) public class WifiDetailPreferenceController2Test { private static final int LEVEL = 1; diff --git a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java index bf978c7d917..ff1125de656 100644 --- a/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java +++ b/tests/robotests/src/com/android/settings/wifi/dpp/WifiDppQrCodeScannerFragmentTest.java @@ -43,10 +43,14 @@ import org.mockito.Mock; import org.mockito.junit.MockitoJUnit; import org.mockito.junit.MockitoRule; import org.robolectric.RobolectricTestRunner; +import org.robolectric.annotation.Config; import java.util.Arrays; @RunWith(RobolectricTestRunner.class) +@Config(shadows = { + com.android.settings.testutils.shadow.ShadowFragment.class, +}) public class WifiDppQrCodeScannerFragmentTest { static final String WIFI_SSID = "wifi-ssid";