Update to Robolectric 3.x snapshot.

KalpeshVedak · Feb 8, 2015 · 2756dfc · 2756dfc
1 parent 2c2a6ef
commit 2756dfc
Show file tree

Hide file tree

Showing 49 changed files with 260 additions and 250 deletions.
diff --git a/build.gradle b/build.gradle
@@ -1,6 +1,9 @@
 buildscript {
     repositories {
         jcenter()
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots"
+        }
     }
 
     dependencies {
@@ -13,6 +16,9 @@ buildscript {
 subprojects { project ->
     repositories {
         jcenter()
+        maven {
+            url "https://oss.sonatype.org/content/repositories/snapshots"
+        }
     }
 
     apply plugin: 'checkstyle'

diff --git a/gradle.properties b/gradle.properties
@@ -24,7 +24,7 @@ ROBOLECTRIC_GRADLE_VERSION=0.14.1
 COVERALLS_GRADLE_VERSION=2.0.1
 JUNIT_VERSION=4.11
 MOCKITO_VERSION=1.9.5
-ROBOLECTRIC_VERSION=2.4
+ROBOLECTRIC_VERSION=3.0-SNAPSHOT
 MOCKWEBSERVER_VERSION=2.2.0
 TRUTH_VERSION=0.24
 

diff --git a/...androidTest/java/com/bumptech/glide/integration/volley/VolleyStreamFetcherServerTest.java b/...androidTest/java/com/bumptech/glide/integration/volley/VolleyStreamFetcherServerTest.java
@@ -22,11 +22,12 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
+import org.robolectric.shadows.ShadowLooper;
 import org.robolectric.shadows.ShadowSystemClock;
 
 import java.io.IOException;
@@ -48,7 +49,7 @@ public class VolleyStreamFetcherServerTest {
 
     @Before
     public void setUp() throws IOException {
-        requestQueue = Volley.newRequestQueue(Robolectric.application);
+        requestQueue = Volley.newRequestQueue(RuntimeEnvironment.application);
         mockWebServer = new MockWebServer();
         mockWebServer.play();
     }
@@ -189,7 +190,7 @@ private DataFetcher<InputStream> getFetcher() {
             public InputStream get() throws InterruptedException, ExecutionException {
                 for (int i = 0; i < 251 && !isDone(); i++) {
                     Thread.sleep(10);
-                    Robolectric.runUiThreadTasks();
+                    ShadowLooper.runUiThreadTasks();
                 }
                 if (!isDone()) {
                     fail("Failed to get response from Volley in time");

diff --git a/integration/volley/volley.iml b/integration/volley/volley.iml
@@ -91,30 +91,33 @@
     </content>
     <orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
-    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="okio-1.2.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" name="library-1.0.10" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="truth-0.24" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk15on-1.50" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="mockwebserver-2.2.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="okhttp-2.2.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" name="library-1.0.10" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="truth-0.24" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0-SNAPSHOT-21" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-all-1.9.5" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk15on-1.50" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="guava-17.0" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="mockwebserver-2.2.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
     <orderEntry type="module" module-name="testutil" exported="" />
     <orderEntry type="module" module-name="glide" exported="" />
   </component>

diff --git a/library/library.iml b/library/library.iml
@@ -92,28 +92,31 @@
     <orderEntry type="sourceFolder" forTests="false" />
     <orderEntry type="library" exported="" scope="TEST" name="okio-1.2.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="objenesis-1.3" level="project" />
     <orderEntry type="library" exported="" name="support-v4-21.0.3" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-3.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="guava-18.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="truth-0.24" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-3.0-SNAPSHOT" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="bcprov-jdk15on-1.50" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockwebserver-2.2.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="sqlite4java-0.282" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="maven-ant-tasks-2.1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-annotations-2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="jsr305-1.3.9" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="commons-codec-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="robolectric-2.4" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="okhttp-2.2.0" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-utils-3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="guava-testlib-18.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-commons-5.0.1" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="vtd-xml-2.11" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="hamcrest-core-1.3" level="project" />
-    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="junit-4.11" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="asm-tree-5.0.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-analysis-5.0.1" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="robolectric-resources-3.0-SNAPSHOT" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="icu4j-53.1" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="mockito-all-1.9.5" level="project" />
+    <orderEntry type="library" exported="" scope="TEST" name="shadows-core-3.0-SNAPSHOT-21" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-21.0.3" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="ant-launcher-1.8.0" level="project" />
     <orderEntry type="library" exported="" scope="TEST" name="asm-util-5.0.1" level="project" />

diff --git a/library/src/androidTest/java/com/bumptech/glide/GlideTest.java b/library/src/androidTest/java/com/bumptech/glide/GlideTest.java
@@ -56,12 +56,14 @@
 import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
+import org.robolectric.Shadows;
 import org.robolectric.annotation.Config;
 import org.robolectric.annotation.Implementation;
 import org.robolectric.annotation.Implements;
 import org.robolectric.annotation.Resetter;
+import org.robolectric.internal.ShadowExtractor;
 import org.robolectric.res.builder.RobolectricPackageManager;
 import org.robolectric.shadows.ShadowBitmap;
 
@@ -92,14 +94,14 @@ public class GlideTest {
     public void setUp() throws Exception {
         Glide.tearDown();
 
-        RobolectricPackageManager pm = (RobolectricPackageManager) Robolectric.application.getPackageManager();
-        ApplicationInfo info = pm.getApplicationInfo(Robolectric.application.getPackageName(), 0);
+        RobolectricPackageManager pm = (RobolectricPackageManager) RuntimeEnvironment.application.getPackageManager();
+        ApplicationInfo info = pm.getApplicationInfo(RuntimeEnvironment.application.getPackageName(), 0);
         info.metaData = new Bundle();
         info.metaData.putString(SetupModule.class.getName(), "GlideModule");
 
         // Ensure that target's size ready callback will be called synchronously.
         target = mock(Target.class);
-        imageView = new ImageView(Robolectric.application);
+        imageView = new ImageView(RuntimeEnvironment.application);
         imageView.setLayoutParams(new ViewGroup.LayoutParams(100, 100));
         doAnswer(new CallCallback()).when(target).getSize(any(SizeReadyCallback.class));
 
@@ -271,7 +273,7 @@ public void testToBytesOption() {
 
         requestManager
                 .as(byte[].class)
-                .decode(through(Robolectric.application, Bitmap.class))
+                .decode(through(RuntimeEnvironment.application, Bitmap.class))
                 .load(uri)
                 .into(target);
 
@@ -478,7 +480,7 @@ public void testReceivesGifBytes() throws IOException {
 
         requestManager
                 .as(byte[].class)
-                .decode(through(Robolectric.application, GifDrawable.class))
+                .decode(through(RuntimeEnvironment.application, GifDrawable.class))
                 .load(fakeUri)
                 .into(target);
 
@@ -491,7 +493,7 @@ public void testReceivesBitmapBytes() {
         mockUri(fakeUri);
         requestManager
                 .as(byte[].class)
-                .decode(through(Robolectric.application, Bitmap.class))
+                .decode(through(RuntimeEnvironment.application, Bitmap.class))
                 .load(fakeUri)
                 .into(target);
 
@@ -675,8 +677,9 @@ private String mockUri(Uri uri, InputStream is) {
         if (is == null) {
             is = new ByteArrayInputStream(new byte[0]);
         }
-        ContentResolver contentResolver = Robolectric.application.getContentResolver();
-        ShadowFileDescriptorContentResolver shadowContentResolver = Robolectric.shadowOf_(contentResolver);
+        ContentResolver contentResolver = RuntimeEnvironment.application.getContentResolver();
+        ShadowFileDescriptorContentResolver shadowContentResolver =
+                (ShadowFileDescriptorContentResolver) ShadowExtractor.extract(contentResolver);
         shadowContentResolver.registerInputStream(uri, is);
 
         AssetFileDescriptor assetFileDescriptor = mock(AssetFileDescriptor.class);
@@ -688,7 +691,7 @@ private String mockUri(Uri uri, InputStream is) {
     }
 
     private Context getContext() {
-        return Robolectric.application;
+        return RuntimeEnvironment.application;
     }
 
     @SuppressWarnings("unchecked")
@@ -698,7 +701,7 @@ private <T> void registerMockStreamModelLoader(final Class<T> modelClass) {
         when(modelLoaderFactory.build(any(Context.class), any(MultiModelLoaderFactory.class)))
                 .thenReturn(modelLoader);
 
-        Glide.get(Robolectric.application).getRegistry()
+        Glide.get(RuntimeEnvironment.application).getRegistry()
                 .prepend(modelClass, InputStream.class, modelLoaderFactory);
     }
 
@@ -834,7 +837,7 @@ public static class MutableShadowBitmap extends ShadowBitmap {
         @Implementation
         public static Bitmap createBitmap(int width, int height, Bitmap.Config config) {
             Bitmap bitmap = ShadowBitmap.createBitmap(width, height, config);
-            Robolectric.shadowOf(bitmap).setMutable(true);
+            Shadows.shadowOf(bitmap).setMutable(true);
             return bitmap;
         }
     }
@@ -846,7 +849,7 @@ public static class ShadowMediaMetadataRetriever {
         @SuppressWarnings("unused")
         public Bitmap getFrameAtTime() {
             Bitmap bitmap = Bitmap.createBitmap(100, 100, Bitmap.Config.ARGB_8888);
-            Robolectric.shadowOf(bitmap).appendDescription(" from MediaMetadataRetriever");
+            Shadows.shadowOf(bitmap).appendDescription(" from MediaMetadataRetriever");
             return bitmap;
         }
     }

diff --git a/library/src/androidTest/java/com/bumptech/glide/RequestBuilderTest.java b/library/src/androidTest/java/com/bumptech/glide/RequestBuilderTest.java
@@ -21,8 +21,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @SuppressWarnings("unchecked")
@@ -110,7 +110,7 @@ public void testThrowsIfGivenNullView() {
 
     @Test(expected = RuntimeException.class)
     public void testThrowsIfIntoViewCalledOnBackgroundThread() throws InterruptedException {
-        final ImageView imageView = new ImageView(Robolectric.application);
+        final ImageView imageView = new ImageView(RuntimeEnvironment.application);
         testInBackground(new BackgroundUtil.BackgroundTester() {
             @Override
             public void runTest() throws Exception {
@@ -133,7 +133,7 @@ public void runTest() throws Exception {
 
     private RequestBuilder getNullModelRequest() {
         when(glideContext.buildImageViewTarget(any(ImageView.class), any(Class.class))).thenReturn(mock(Target.class));
-        when(glideContext.getDecodeOptions()).thenReturn(new DecodeOptions(Robolectric.application));
+        when(glideContext.getDecodeOptions()).thenReturn(new DecodeOptions(RuntimeEnvironment.application));
         return new RequestBuilder(glideContext, Object.class, requestTracker, lifecycle)
                 .load((Object) null);
     }

diff --git a/library/src/androidTest/java/com/bumptech/glide/RequestManagerTest.java b/library/src/androidTest/java/com/bumptech/glide/RequestManagerTest.java
@@ -25,8 +25,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.invocation.InvocationOnMock;
 import org.mockito.stubbing.Answer;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 @RunWith(RobolectricTestRunner.class)
@@ -51,7 +51,7 @@ public ConnectivityMonitor answer(InvocationOnMock invocation) throws Throwable
                     }
                 });
         requestTracker = mock(RequestTracker.class);
-        manager = new RequestManager(Robolectric.application, lifecycle, requestTracker, factory);
+        manager = new RequestManager(RuntimeEnvironment.application, lifecycle, requestTracker, factory);
     }
 
     @Test

diff --git a/library/src/androidTest/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java b/library/src/androidTest/java/com/bumptech/glide/load/data/LocalUriFetcherTest.java
@@ -14,8 +14,8 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.io.Closeable;
@@ -29,7 +29,7 @@ public class LocalUriFetcherTest {
 
     @Before
     public void setUp() {
-        fetcher = new TestLocalUriFetcher(Robolectric.application, Uri.parse("content://empty"));
+        fetcher = new TestLocalUriFetcher(RuntimeEnvironment.application, Uri.parse("content://empty"));
     }
 
     @Test

diff --git a/library/src/androidTest/java/com/bumptech/glide/load/data/mediastore/ThumbFetcherTest.java b/library/src/androidTest/java/com/bumptech/glide/load/data/mediastore/ThumbFetcherTest.java
@@ -17,8 +17,8 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.annotation.Config;
 
 import java.io.ByteArrayInputStream;
@@ -37,14 +37,14 @@ public void setUp() {
         MockitoAnnotations.initMocks(this);
 
         uri = Uri.withAppendedPath(MediaStore.Video.Media.EXTERNAL_CONTENT_URI, "123");
-        fetcher = new ThumbFetcher(Robolectric.application, uri, opener);
+        fetcher = new ThumbFetcher(RuntimeEnvironment.application, uri, opener);
     }
 
     @Test
     public void testReturnsInputStreamFromThumbnailOpener() throws Exception {
         InputStream expected = new ByteArrayInputStream(new byte[0]);
 
-        when(opener.open(eq(Robolectric.application), eq(uri))).thenReturn(expected);
+        when(opener.open(eq(RuntimeEnvironment.application), eq(uri))).thenReturn(expected);
 
         InputStream result = fetcher.loadData(Priority.LOW);
         assertEquals(expected, result);
@@ -54,7 +54,7 @@ public void testReturnsInputStreamFromThumbnailOpener() throws Exception {
     public void testClosesInputStreamFromThumbnailOpenerOnCleanup() throws Exception {
         InputStream expected = mock(InputStream.class);
 
-        when(opener.open(eq(Robolectric.application), eq(uri))).thenReturn(expected);
+        when(opener.open(eq(RuntimeEnvironment.application), eq(uri))).thenReturn(expected);
 
         fetcher.loadData(Priority.HIGH);