diff options
Diffstat (limited to 'tests')
4 files changed, 4 insertions, 10 deletions
diff --git a/tests/robolectric/Android.bp b/tests/robolectric/Android.bp index 2b3e0c9..dc49a46 100644 --- a/tests/robolectric/Android.bp +++ b/tests/robolectric/Android.bp @@ -30,5 +30,6 @@ android_robolectric_test { "androidx.test.core", "androidx.test.runner", "androidx.test.ext.junit", - ], + ], + upstream: true, } diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java index e11c356..4d9a042 100644 --- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java +++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/QuickAccessWalletClientTest.java @@ -33,7 +33,6 @@ import android.content.pm.PackageInfo; import android.content.pm.PackageManager; import android.content.pm.ResolveInfo; import android.content.pm.ServiceInfo; -import android.os.Build; import android.provider.Settings; import android.service.quickaccesswallet.QuickAccessWalletClient; @@ -58,7 +57,7 @@ import org.robolectric.shadows.ShadowLog; * Ensures compatibility between the {@link QuickAccessWalletClient} and the plugin */ @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.R, shadows = { +@Config(shadows = { QuickAccessWalletClientTest.ShadowActivityManager.class, QuickAccessWalletClientTest.ShadowLockPatternUtils.class}) public class QuickAccessWalletClientTest { diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java index fedc25c..85c67c6 100644 --- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java +++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPanelViewControllerTest.java @@ -38,7 +38,6 @@ import android.content.Intent; import android.graphics.Bitmap; import android.graphics.drawable.Drawable; import android.graphics.drawable.Icon; -import android.os.Build; import android.service.quickaccesswallet.GetWalletCardsError; import android.service.quickaccesswallet.GetWalletCardsRequest; import android.service.quickaccesswallet.GetWalletCardsResponse; @@ -69,7 +68,6 @@ 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.ShadowLog; import java.util.Arrays; @@ -78,7 +76,6 @@ import java.util.List; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.R) public class WalletPanelViewControllerTest { private static final int MAX_CARDS = 10; diff --git a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java index aaf8a80..9205228 100644 --- a/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java +++ b/tests/robolectric/src/com/android/systemui/plugin/globalactions/wallet/WalletPluginServiceTest.java @@ -8,7 +8,6 @@ import static org.mockito.Mockito.when; import android.content.ContentResolver; import android.content.Context; -import android.os.Build; import android.provider.Settings; import android.service.quickaccesswallet.QuickAccessWalletClient; @@ -22,11 +21,9 @@ import org.junit.runner.RunWith; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.robolectric.RobolectricTestRunner; -import org.robolectric.annotation.Config; import org.robolectric.shadows.ShadowLog; @RunWith(RobolectricTestRunner.class) -@Config(sdk = Build.VERSION_CODES.R) public class WalletPluginServiceTest { private final Context mContext = ApplicationProvider.getApplicationContext(); @@ -161,4 +158,4 @@ public class WalletPluginServiceTest { assertThat(viewController).isNull(); } -}
\ No newline at end of file +} |