diff options
author | Maurice Lam <yukl@google.com> | 2017-09-13 21:44:22 -0700 |
---|---|---|
committer | Maurice Lam <yukl@google.com> | 2017-09-13 21:47:05 -0700 |
commit | 96b54f3cd7c66a21ae39390d155b310a0e575eb5 (patch) | |
tree | 6861c60d3cce1313135384ed7194703a2652374d /library/test/robotest/src | |
parent | 66ec7416c4d1b61a687ec0ef526e46a2412df5b5 (diff) | |
download | setupwizard-96b54f3cd7c66a21ae39390d155b310a0e575eb5.tar.gz |
Update to Robolectric 3.4.2
Test: ./gradlew test
Bug: 65652792
Change-Id: I8e0093fd956a885c8f1404e2a17b5f4aaec87dfc
Diffstat (limited to 'library/test/robotest/src')
-rw-r--r-- | library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java | 28 | ||||
-rw-r--r-- | library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java | 2 |
2 files changed, 21 insertions, 9 deletions
diff --git a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java index f47eef1..aeb678f 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/util/PartnerTest.java @@ -31,6 +31,7 @@ import android.content.Context; import android.content.Intent; import android.content.pm.ActivityInfo; import android.content.pm.ApplicationInfo; +import android.content.pm.PackageManager.NameNotFoundException; import android.content.pm.ResolveInfo; import android.content.res.Resources; import android.os.Build.VERSION; @@ -40,20 +41,25 @@ import com.android.setupwizardlib.BuildConfig; import com.android.setupwizardlib.R; import com.android.setupwizardlib.robolectric.SuwLibRobolectricTestRunner; import com.android.setupwizardlib.util.Partner.ResourceEntry; +import com.android.setupwizardlib.util.PartnerTest.ShadowApplicationPackageManager; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; -import org.robolectric.RuntimeEnvironment; +import org.robolectric.Shadows; import org.robolectric.annotation.Config; -import org.robolectric.res.builder.DefaultPackageManager; +import org.robolectric.annotation.Implementation; +import org.robolectric.annotation.Implements; import org.robolectric.shadows.ShadowResources; import java.util.Arrays; import java.util.Collections; @RunWith(SuwLibRobolectricTestRunner.class) -@Config(constants = BuildConfig.class, sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }) +@Config( + constants = BuildConfig.class, + sdk = { Config.OLDEST_SDK, Config.NEWEST_SDK }, + shadows = ShadowApplicationPackageManager.class) public class PartnerTest { private static final String ACTION_PARTNER_CUSTOMIZATION = @@ -62,7 +68,7 @@ public class PartnerTest { private Context mContext; private Resources mPartnerResources; - private TestPackageManager mPackageManager; + private ShadowApplicationPackageManager mPackageManager; @Before public void setUp() throws Exception { @@ -71,8 +77,9 @@ public class PartnerTest { mContext = spy(application); mPartnerResources = spy(ShadowResources.getSystem()); - mPackageManager = new TestPackageManager(); - RuntimeEnvironment.setRobolectricPackageManager(mPackageManager); + mPackageManager = + (ShadowApplicationPackageManager) Shadows.shadowOf(application.getPackageManager()); + mPackageManager.partnerResources = mPartnerResources; } @Test @@ -173,13 +180,18 @@ public class PartnerTest { return info; } - private class TestPackageManager extends DefaultPackageManager { + @Implements(className = "android.app.ApplicationPackageManager") + public static class ShadowApplicationPackageManager extends + org.robolectric.shadows.ShadowApplicationPackageManager { + public Resources partnerResources; + + @Implementation @Override public Resources getResourcesForApplication(ApplicationInfo app) throws NameNotFoundException { if (app != null && "test.partner.package".equals(app.packageName)) { - return mPartnerResources; + return partnerResources; } else { return super.getResourcesForApplication(app); } diff --git a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java index ffa228d..ddf59ca 100644 --- a/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java +++ b/library/test/robotest/src/com/android/setupwizardlib/view/IllustrationVideoViewTest.java @@ -48,7 +48,7 @@ import org.robolectric.annotation.Config; import org.robolectric.annotation.Implementation; import org.robolectric.annotation.Implements; import org.robolectric.annotation.RealObject; -import org.robolectric.internal.Shadow; +import org.robolectric.shadow.api.Shadow; import org.robolectric.shadows.ShadowMediaPlayer; import org.robolectric.util.ReflectionHelpers; |