Merge pull request nostra13#997 from vivekkiran/master

Upgraded Robolectric And AssertJ

Author: nostra13

library/build.gradle

@@ -33,8 +33,8 @@ android {
 }
 
 dependencies {
-    testCompile 'com.squareup:fest-android:1.0.7'
-    testCompile 'org.robolectric:robolectric:2.1.1'
+    testCompile 'com.squareup.assertj:assertj-android:1.0.0'
+    testCompile 'org.robolectric:robolectric:2.4'
     testCompile 'junit:junit:4.12'
     compile 'com.android.support:support-v4:22.1.1'
 }

library/test/com/nostra13/universalimageloader/core/assist/ImageSizeTest.java

@@ -9,7 +9,7 @@
 import com.nostra13.universalimageloader.core.imageaware.ImageAware;
 import com.nostra13.universalimageloader.core.imageaware.ImageViewAware;
 import com.nostra13.universalimageloader.utils.ImageSizeUtils;
-import org.fest.assertions.api.Assertions;
+import static org.assertj.android.api.Assertions.assertThat;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;

library/test/com/nostra13/universalimageloader/core/download/BaseImageDownloaderTest.java

@@ -1,6 +1,6 @@
 package com.nostra13.universalimageloader.core.download;
 
-import org.fest.assertions.api.Assertions;
+import static org.assertj.android.api.Assertions.assertThat;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;