diff options
| author | bengt <bengt@google.com> | 2015-08-24 23:39:02 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-08-24 23:39:02 +0000 |
| commit | 524fa40b24d91abfe56b099d1cf11e8de49acfac (patch) | |
| tree | 8126c598d92ebaee50ab16351c56997e0b483bbe | |
| parent | 346f4c1cf440c635cf1d4df02ae57e4f12b58492 (diff) | |
| parent | acf866f5b3b92fec5ce40f09b7d2417d1bc150eb (diff) | |
| download | volley-524fa40b24d91abfe56b099d1cf11e8de49acfac.tar.gz | |
am acf866f5: am 2f9a77c9: Merge "Migrated from Robolectric 2.2 to 3.0"
* commit 'acf866f5b3b92fec5ce40f09b7d2417d1bc150eb':
Migrated from Robolectric 2.2 to 3.0
| -rw-r--r-- | pom.xml | 2 | ||||
| -rw-r--r-- | src/test/java/com/android/volley/toolbox/NetworkImageViewTest.java | 4 |
2 files changed, 3 insertions, 3 deletions
@@ -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> 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 android.widget.ImageView.ScaleType; 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 @@ public class NetworkImageViewTest { @Before public void setUp() throws Exception { mMockImageLoader = new MockImageLoader(); - mNIV = new NetworkImageView(Robolectric.application); + mNIV = new NetworkImageView(RuntimeEnvironment.application); } @Test public void setImageUrl_requestsImage() { |