commit 524fa40b24d91abfe56b099d1cf11e8de49acfac
author bengt <bengt@google.com> Mon Aug 24 23:39:02 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Mon Aug 24 23:39:02 2015 +0000
tree 8126c598d92ebaee50ab16351c56997e0b483bbe
parent 346f4c1cf440c635cf1d4df02ae57e4f12b58492
parent acf866f5b3b92fec5ce40f09b7d2417d1bc150eb

am acf866f5: am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0"

* commit 'acf866f5b3b92fec5ce40f09b7d2417d1bc150eb':
  Migrated from Robolectric 2.2 to 3.0

pom.xml

diff --git a/pom.xml b/pom.xml
index 6b8072e..7c37e0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -31,7 +31,7 @@
     <dependency>
       <groupId>org.robolectric</groupId>
       <artifactId>robolectric</artifactId>
-      <version>2.2</version>
+      <version>3.0</version>
       <scope>test</scope>
     </dependency>
     <dependency>

src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java

diff --git a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
index 8bd98aa..917ddb4 100644
--- a/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
+++ b/src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java
@@ -8,7 +8,7 @@
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.robolectric.Robolectric;
+import org.robolectric.RuntimeEnvironment;
 import org.robolectric.RobolectricTestRunner;
 
 import static org.junit.Assert.*;
@@ -20,7 +20,7 @@
 
     @Before public void setUp() throws Exception {
         mMockImageLoader = new MockImageLoader();
-        mNIV = new NetworkImageView(Robolectric.application);
+        mNIV = new NetworkImageView(RuntimeEnvironment.application);
     }
 
     @Test public void setImageUrl_requestsImage() {