Revert "Upgraded Robolectric And AssertJ"

Author: nostra13

library/pom.xml

@@ -17,15 +17,15 @@
 		<!-- Robolectric -->
 		<!-- These must be above Android so the dependency order is correct -->
 		<dependency>
-			<groupId>com.squareup.assertj</groupId>
-			<artifactId>assertj-android</artifactId>
-			<version>1.0.0</version>
+			<groupId>com.squareup</groupId>
+			<artifactId>fest-android</artifactId>
+			<version>1.0.7</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
 			<groupId>org.robolectric</groupId>
 			<artifactId>robolectric</artifactId>
-			<version>2.4</version>
+			<version>2.1.1</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

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 static org.assertj.android.api.Assertions.assertThat;
+import org.fest.assertions.api.Assertions;
 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 static org.assertj.android.api.Assertions.assertThat;
+import org.fest.assertions.api.Assertions;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.robolectric.RobolectricTestRunner;

pom.xml

@@ -30,7 +30,7 @@
 		<developerConnection>scm:git:[email protected]:nostra13/Android-Universal-Image-Loader.git</developerConnection>
 		<url>https://github.com/nostra13/Android-Universal-Image-Loader</url>
 	    <tag>v1.9.1</tag>
-  </scm>
+	</scm>
 
 	<developers>
 		<developer>