commit 77eebb43aedd2441e555474949de6ecaa838bc54
author Ficus Kirkpatrick <ficus@android.com> Thu Aug 27 10:52:09 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 27 10:52:09 2015 +0000
tree 8a4bda10916ab95210c6938d4b69f9bd4038b000
parent 37855cb25a086d7ed4a28e5a46371538e73dbc69
parent 90aeba65f03978448cd3e7615b4dae96ac6dcddc

am 90aeba65: (-s ours) am 8097dda9: Merge "Specify test dependecies in rules.gradle."

* commit '90aeba65f03978448cd3e7615b4dae96ac6dcddc':

build.gradle

diff --git a/build.gradle b/build.gradle
index 92c86eb..83acd6d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -25,10 +25,6 @@
 
 apply plugin: 'com.android.library'
 
-repositories {
-    jcenter()
-}
-
 android {
     compileSdkVersion 22
     buildToolsVersion = '22.0.1'

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>

rules.gradle

diff --git a/rules.gradle b/rules.gradle
index c8a95a9..40508d0 100644
--- a/rules.gradle
+++ b/rules.gradle
@@ -1,12 +1,3 @@
 // See build.gradle for an explanation of what this file is.
 
 apply plugin: 'com.android.library'
-
-// Check if the android plugin version supports unit testing.
-if (configurations.findByName("testCompile")) {
-  dependencies {
-    testCompile "junit:junit:4.10"
-    testCompile "org.mockito:mockito-core:1.9.5"
-    testCompile "org.robolectric:robolectric:2.2"
-  }
-}

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() {