diff options
author | Rex Hoffman <rexhoffman@google.com> | 2023-12-14 02:32:34 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-12-14 02:32:34 +0000 |
commit | 738ae9c2bf77283fe9be671cf61d6a91311019e4 (patch) | |
tree | 23a30979401cf4a85581357152ef8b1edaf6e554 | |
parent | 422021bf5f90cfc827c1af16797586529ed9d17b (diff) | |
parent | 94e2490a5f95f3a7a354e54baf60789b08ef1aba (diff) | |
download | TvSettings-738ae9c2bf77283fe9be671cf61d6a91311019e4.tar.gz |
Merge "Uptesting is moving folks to /external/robolectric from /external/robolectric-shadows" into main
6 files changed, 20 insertions, 5 deletions
diff --git a/Settings/tests/robotests/Android.bp b/Settings/tests/robotests/Android.bp index aaa15832f..7a76a2bd7 100644 --- a/Settings/tests/robotests/Android.bp +++ b/Settings/tests/robotests/Android.bp @@ -19,6 +19,13 @@ android_robolectric_test { ], libs: ["services.core"], + + static_libs: [ + "Robolectric_shadows_androidx_fragment_upstream", + "Settings_robolectric_meta_service_file", + "SettingsLib-robo-testutils", + "Settings-robo-testutils", + ], java_resource_dirs: ["config"], @@ -27,4 +34,6 @@ android_robolectric_test { test_options: { timeout: 36000, }, + + upstream: true, } diff --git a/Settings/tests/robotests/config/robolectric.properties b/Settings/tests/robotests/config/robolectric.properties index 9a6053d0a..034345989 100644 --- a/Settings/tests/robotests/config/robolectric.properties +++ b/Settings/tests/robotests/config/robolectric.properties @@ -14,3 +14,5 @@ # limitations under the License. # sdk=NEWEST_SDK +instrumentedPackages=androidx + diff --git a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java index 14d217fab..ed182bc2c 100644 --- a/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java +++ b/Settings/tests/robotests/src/com/android/tv/settings/autofill/AutofillPickerFragmentTest.java @@ -29,6 +29,7 @@ import android.provider.Settings; import androidx.preference.Preference; import androidx.preference.PreferenceScreen; +import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.tv.settings.RadioPreference; import com.android.tv.settings.testutils.ShadowInputMethodManager; import com.android.tv.settings.testutils.Utils; @@ -43,10 +44,9 @@ import org.mockito.Spy; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowUserManager; @RunWith(RobolectricTestRunner.class) -@Config(shadows = {ShadowInputMethodManager.class}) +@Config(shadows = {ShadowInputMethodManager.class, ShadowUserManager.class}) public class AutofillPickerFragmentTest { @Spy private AutofillPickerFragment mFragment; diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java index b70d1762d..87e608582 100644 --- a/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java +++ b/Settings/tests/robotests/src/com/android/tv/settings/device/DevicePrefFragmentTest.java @@ -36,6 +36,7 @@ import android.provider.Settings; import androidx.preference.Preference; +import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.settingslib.development.DevelopmentSettingsEnabler; import com.android.tv.settings.R; import com.android.tv.settings.testutils.Utils; @@ -47,10 +48,11 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowPackageManager; -import org.robolectric.shadows.ShadowUserManager; @RunWith(RobolectricTestRunner.class) +@Config(shadows = {ShadowUserManager.class}) public class DevicePrefFragmentTest { @Spy private DevicePrefFragment mDevicePrefFragment; diff --git a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java index 769a643a4..0c45aa760 100644 --- a/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java +++ b/Settings/tests/robotests/src/com/android/tv/settings/device/displaysound/MatchContentFrameRateFragmentTest.java @@ -35,6 +35,7 @@ import org.mockito.MockitoAnnotations; import org.mockito.Spy; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; +import org.robolectric.annotation.LooperMode; import org.robolectric.shadows.androidx.fragment.FragmentController; @RunWith(RobolectricTestRunner.class) @@ -152,6 +153,7 @@ public class MatchContentFrameRateFragmentTest { } @Test + @LooperMode(LooperMode.Mode.LEGACY) public void testDefaultPreference() { FragmentController.of(mMatchContentFrameRateFragment) .create(); diff --git a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java index 4f968399b..a3d33bbd5 100644 --- a/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java +++ b/Settings/tests/robotests/src/com/android/tv/settings/inputmethod/KeyboardFragmentTest.java @@ -30,6 +30,7 @@ import androidx.preference.Preference; import androidx.preference.PreferenceCategory; import androidx.preference.PreferenceScreen; +import com.android.settings.testutils.shadow.ShadowUserManager; import com.android.tv.settings.R; import com.android.tv.settings.testutils.ShadowInputMethodManager; import com.android.tv.settings.testutils.Utils; @@ -43,10 +44,9 @@ import org.mockito.Spy; import org.robolectric.RobolectricTestRunner; import org.robolectric.RuntimeEnvironment; import org.robolectric.annotation.Config; -import org.robolectric.shadows.ShadowUserManager; @RunWith(RobolectricTestRunner.class) -@Config(shadows = {ShadowInputMethodManager.class}) +@Config(shadows = {ShadowInputMethodManager.class, ShadowUserManager.class}) public class KeyboardFragmentTest { @Spy private KeyboardFragment mKeyboardFragment; |